Merge branch 'master' of git.sugarlabs.org:ruler/mainline

4 files changed, 65 insertions, 47 deletions

diff --git a/po/en.po b/po/en.po
index a3ab452..3f83e42 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,38 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 20:32+0000\n"
-"PO-Revision-Date: 2011-06-03 07:42+0200\n"
+"POT-Creation-Date: 2011-05-23 16:56-0400\n"
+"PO-Revision-Date: 2011-09-28 03:33+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: English\n"
-"Language: en\n"
+"Language: \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"
 
-#: activity/activity.info:2
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:157
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:292
+#: activity/activity.info:2 RulerActivity.py:162 RulerActivity.py:298
 msgid "Ruler"
 msgstr "Ruler"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:165
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:300
+#: show_rulers.py:50
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Use this ruler from the outside edge of the computer."
+
+#: RulerActivity.py:170 RulerActivity.py:306
 msgid "Grid"
 msgstr "Grid"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:173
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:308
+#: RulerActivity.py:178 RulerActivity.py:314
 msgid "Angles"
 msgstr "Angles"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:181
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:316
+#: RulerActivity.py:186 RulerActivity.py:322
 msgid "Checker"
 msgstr "Checker"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:224
+#: RulerActivity.py:230
 msgid "Rulers"
 msgstr "Rulers"
diff --git a/po/en_GB.po b/po/en_GB.po
index a8b9d98..71a2c48 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,38 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 20:32+0000\n"
-"PO-Revision-Date: 2011-06-03 08:20+0200\n"
+"POT-Creation-Date: 2011-05-23 16:56-0400\n"
+"PO-Revision-Date: 2011-09-28 05:15+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_GB\n"
+"Language: \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"
 
-#: activity/activity.info:2
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:157
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:292
+#: activity/activity.info:2 RulerActivity.py:162 RulerActivity.py:298
 msgid "Ruler"
 msgstr "Ruler"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:165
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:300
+#: show_rulers.py:50
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Use this ruler from the outside edge of the computer."
+
+#: RulerActivity.py:170 RulerActivity.py:306
 msgid "Grid"
 msgstr "Grid"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:173
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:308
+#: RulerActivity.py:178 RulerActivity.py:314
 msgid "Angles"
 msgstr "Angles"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:181
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:316
+#: RulerActivity.py:186 RulerActivity.py:322
 msgid "Checker"
 msgstr "Checker"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:224
+#: RulerActivity.py:230
 msgid "Rulers"
 msgstr "Rulers"
diff --git a/po/en_US.po b/po/en_US.po
index 627251c..60b2aea 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,38 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 20:32+0000\n"
-"PO-Revision-Date: 2011-06-03 07:35+0200\n"
+"POT-Creation-Date: 2011-05-23 16:56-0400\n"
+"PO-Revision-Date: 2011-09-28 05:11+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_US\n"
+"Language: \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"
 
-#: activity/activity.info:2
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:157
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:292
+#: activity/activity.info:2 RulerActivity.py:162 RulerActivity.py:298
 msgid "Ruler"
 msgstr "Ruler"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:165
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:300
+#: show_rulers.py:50
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Use this ruler from the outside edge of the computer."
+
+#: RulerActivity.py:170 RulerActivity.py:306
 msgid "Grid"
 msgstr "Grid"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:173
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:308
+#: RulerActivity.py:178 RulerActivity.py:314
 msgid "Angles"
 msgstr "Angles"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:181
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:316
+#: RulerActivity.py:186 RulerActivity.py:322
 msgid "Checker"
 msgstr "Checker"
 
-#: /home/walter/Activities/Ruler.activity/RulerActivity.py:224
+#: RulerActivity.py:230
 msgid "Rulers"
 msgstr "Rulers"
diff --git a/po/pt.po b/po/pt.po
index 58d88a5..413f549 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,20 +2,41 @@
 # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-29 16:45-0500\n"
-"PO-Revision-Date: 2007-11-29 17:37-0500\n"
-"Last-Translator:  <olpc@xo-12-34-56.localdomain>\n"
+"POT-Creation-Date: 2011-05-23 16:56-0400\n"
+"PO-Revision-Date: 2012-01-15 07:41+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Portuguese\n"
+"Language: \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.5\n"
 
-#: activity/activity.info:2
+#: activity/activity.info:2 RulerActivity.py:162 RulerActivity.py:298
 msgid "Ruler"
 msgstr "Régua"
+
+#: show_rulers.py:50
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Utiliza esta régua a partir do lado externo do computador."
+
+#: RulerActivity.py:170 RulerActivity.py:306
+msgid "Grid"
+msgstr "Grelha"
+
+#: RulerActivity.py:178 RulerActivity.py:314
+msgid "Angles"
+msgstr "Ângulos"
+
+#: RulerActivity.py:186 RulerActivity.py:322
+msgid "Checker"
+msgstr "Axadrezado"
+
+#: RulerActivity.py:230
+msgid "Rulers"
+msgstr "Réguas"