From ce92e0752fe6d159cbcc0f32812791f8ebf37025 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 27 May 2014 22:23:14 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:ruler/mainline

---
diff --git a/po/it.po b/po/it.po
index 6a7753c..d6f46cf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-05-25 00:33-0400\n"
-"PO-Revision-Date: 2011-07-04 15:26+0200\n"
-"Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
+"PO-Revision-Date: 2013-11-06 23:44+0200\n"
+"Last-Translator: arosella <arosella@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. TRANS: "name" option from activity.info file
 #: RulerActivity.py:151
@@ -46,7 +46,7 @@ msgstr ""
 #. TRANS: mm is for Milli Meters
 #: RulerActivity.py:180
 msgid " mm."
-msgstr ""
+msgstr " mm."
 
 #: show_rulers.py:58
 msgid "Use this ruler from the outside edge of the computer."
diff --git a/po/pbs.po b/po/pbs.po
index 31f4871..f1ce385 100644
--- a/po/pbs.po
+++ b/po/pbs.po
@@ -2,52 +2,52 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-05-25 00:33-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-14 04:26+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: pbs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. TRANS: "name" option from activity.info file
 #: RulerActivity.py:151
 msgid "Ruler"
-msgstr ""
+msgstr "ndasau'"
 
 #. TRANS: "summary" option from activity.info file
 #. TRANS: "description" option from activity.info file
 msgid "scaled images of a ruler, protractor, and a checker board"
-msgstr ""
+msgstr "Kutau lujaich' nda ndasau', nda'ujuñ maiñ nda nde'ets namjeng"
 
 #: RulerActivity.py:157
 msgid "Grid"
-msgstr ""
+msgstr "kiñuimú nde'et kily'e"
 
 #: RulerActivity.py:163
 msgid "Angles"
-msgstr ""
+msgstr "Lyi lyi't 'imú"
 
 #: RulerActivity.py:169
 msgid "Checker"
-msgstr ""
+msgstr "nde'ets namjeng"
 
 #: RulerActivity.py:177
 msgid "1 custom unit equals "
-msgstr ""
+msgstr "nda masau' makeje' skad-a vakjá ne "
 
 #. TRANS: mm is for Milli Meters
 #: RulerActivity.py:180
 msgid " mm."
-msgstr ""
+msgstr " mm."
 
 #: show_rulers.py:58
 msgid "Use this ruler from the outside edge of the computer."
-msgstr ""
+msgstr "Ki't nanji ndasau vipiup pu nangau ne kutau nak'ujuly'"
diff --git a/po/pt.po b/po/pt.po
index ea366d3..013e1c4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,10 +7,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-05-25 00:33-0400\n"
-"PO-Revision-Date: 2012-04-03 00:35+0200\n"
+"PO-Revision-Date: 2013-12-14 17:44+0200\n"
 "Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
 "Language-Team: Portuguese\n"
-"Language: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr "Régua"
 #. TRANS: "summary" option from activity.info file
 #. TRANS: "description" option from activity.info file
 msgid "scaled images of a ruler, protractor, and a checker board"
-msgstr ""
+msgstr "imagens à escala de uma régua, transferidor, e um tabuleiro xadrezado"
 
 #: RulerActivity.py:157
 msgid "Grid"
@@ -41,12 +41,12 @@ msgstr "Axadrezado"
 
 #: RulerActivity.py:177
 msgid "1 custom unit equals "
-msgstr ""
+msgstr "1 unidade de medida igual a "
 
 #. TRANS: mm is for Milli Meters
 #: RulerActivity.py:180
 msgid " mm."
-msgstr ""
+msgstr " mm."
 
 #: show_rulers.py:58
 msgid "Use this ruler from the outside edge of the computer."
--
cgit v0.9.1