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

5 files changed, 90 insertions, 65 deletions

diff --git a/po/da.po b/po/da.po
index abe10c7..28cac57 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,37 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-23 16:56-0400\n"
-"PO-Revision-Date: 2011-09-28 17:21+0200\n"
+"POT-Creation-Date: 2012-10-28 00:33-0400\n"
+"PO-Revision-Date: 2012-10-28 19:03+0200\n"
 "Last-Translator: Aputsiaq Niels <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: da\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 RulerActivity.py:162 RulerActivity.py:298
+#. TRANS: "name" option from activity.info file
+#: RulerActivity.py:149
 msgid "Ruler"
 msgstr "Lineal"
 
-#: show_rulers.py:50
-msgid "Use this ruler from the outside edge of the computer."
-msgstr "Brug denne lineal fra den yderste kant af computeren."
+#. 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 "skalerede billeder af en lineal, en vinkelmåler og et skakbræt"
 
-#: RulerActivity.py:170 RulerActivity.py:306
+#: RulerActivity.py:155
 msgid "Grid"
 msgstr "Gitter"
 
-#: RulerActivity.py:178 RulerActivity.py:314
+#: RulerActivity.py:161
 msgid "Angles"
 msgstr "Vinkler"
 
-#: RulerActivity.py:186 RulerActivity.py:322
+#: RulerActivity.py:167
 msgid "Checker"
 msgstr "Kontrollør"
 
-#: RulerActivity.py:230
-msgid "Rulers"
-msgstr "Linealer"
+#: show_rulers.py:51
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Brug denne lineal fra den yderste kant af computeren."
+
+#~ msgid "Rulers"
+#~ msgstr "Linealer"
diff --git a/po/en.po b/po/en.po
index 3f83e42..b5dc2fb 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,37 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-23 16:56-0400\n"
-"PO-Revision-Date: 2011-09-28 03:33+0200\n"
+"POT-Creation-Date: 2012-10-28 00:33-0400\n"
+"PO-Revision-Date: 2012-10-28 09:49+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: English\n"
-"Language: \n"
+"Language: en\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 RulerActivity.py:162 RulerActivity.py:298
+#. TRANS: "name" option from activity.info file
+#: RulerActivity.py:149
 msgid "Ruler"
 msgstr "Ruler"
 
-#: 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."
+#. 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 "scaled images of a ruler, protractor, and a checker board"
 
-#: RulerActivity.py:170 RulerActivity.py:306
+#: RulerActivity.py:155
 msgid "Grid"
 msgstr "Grid"
 
-#: RulerActivity.py:178 RulerActivity.py:314
+#: RulerActivity.py:161
 msgid "Angles"
 msgstr "Angles"
 
-#: RulerActivity.py:186 RulerActivity.py:322
+#: RulerActivity.py:167
 msgid "Checker"
 msgstr "Checker"
 
-#: RulerActivity.py:230
-msgid "Rulers"
-msgstr "Rulers"
+#: show_rulers.py:51
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Use this ruler from the outside edge of the computer."
+
+#~ msgid "Rulers"
+#~ msgstr "Rulers"
diff --git a/po/en_GB.po b/po/en_GB.po
index 71a2c48..3aba477 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,37 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-23 16:56-0400\n"
-"PO-Revision-Date: 2011-09-28 05:15+0200\n"
+"POT-Creation-Date: 2012-10-28 00:33-0400\n"
+"PO-Revision-Date: 2012-10-28 09:48+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: en_GB\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 RulerActivity.py:162 RulerActivity.py:298
+#. TRANS: "name" option from activity.info file
+#: RulerActivity.py:149
 msgid "Ruler"
 msgstr "Ruler"
 
-#: 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."
+#. 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 "scaled images of a ruler, protractor, and a chequer board"
 
-#: RulerActivity.py:170 RulerActivity.py:306
+#: RulerActivity.py:155
 msgid "Grid"
 msgstr "Grid"
 
-#: RulerActivity.py:178 RulerActivity.py:314
+#: RulerActivity.py:161
 msgid "Angles"
 msgstr "Angles"
 
-#: RulerActivity.py:186 RulerActivity.py:322
+#: RulerActivity.py:167
 msgid "Checker"
 msgstr "Checker"
 
-#: RulerActivity.py:230
-msgid "Rulers"
-msgstr "Rulers"
+#: show_rulers.py:51
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Use this ruler from the outside edge of the computer."
+
+#~ msgid "Rulers"
+#~ msgstr "Rulers"
diff --git a/po/en_US.po b/po/en_US.po
index 60b2aea..00b28f2 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,37 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-23 16:56-0400\n"
-"PO-Revision-Date: 2011-09-28 05:11+0200\n"
+"POT-Creation-Date: 2012-10-28 00:33-0400\n"
+"PO-Revision-Date: 2012-10-28 09:47+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: en_US\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 RulerActivity.py:162 RulerActivity.py:298
+#. TRANS: "name" option from activity.info file
+#: RulerActivity.py:149
 msgid "Ruler"
 msgstr "Ruler"
 
-#: 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."
+#. 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 "scaled images of a ruler, protractor, and a checker board"
 
-#: RulerActivity.py:170 RulerActivity.py:306
+#: RulerActivity.py:155
 msgid "Grid"
 msgstr "Grid"
 
-#: RulerActivity.py:178 RulerActivity.py:314
+#: RulerActivity.py:161
 msgid "Angles"
 msgstr "Angles"
 
-#: RulerActivity.py:186 RulerActivity.py:322
+#: RulerActivity.py:167
 msgid "Checker"
 msgstr "Checker"
 
-#: RulerActivity.py:230
-msgid "Rulers"
-msgstr "Rulers"
+#: show_rulers.py:51
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Use this ruler from the outside edge of the computer."
+
+#~ msgid "Rulers"
+#~ msgstr "Rulers"
diff --git a/po/es.po b/po/es.po
index b69f087..20e889b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,37 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-23 16:56-0400\n"
-"PO-Revision-Date: 2012-08-06 22:19+0200\n"
+"POT-Creation-Date: 2012-10-28 00:33-0400\n"
+"PO-Revision-Date: 2012-10-28 14:37+0200\n"
 "Last-Translator: AlanJAS <alanjas@hotmail.com>\n"
 "Language-Team: Spanish\n"
-"Language: \n"
+"Language: es\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 RulerActivity.py:162 RulerActivity.py:298
+#. TRANS: "name" option from activity.info file
+#: RulerActivity.py:149
 msgid "Ruler"
 msgstr "Regla"
 
-#: show_rulers.py:50
-msgid "Use this ruler from the outside edge of the computer."
-msgstr "Usa esta regla desde el borde de la computadora."
+#. 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 "imágenes a escala de una regla, transportador, y un tablero de ajedrez"
 
-#: RulerActivity.py:170 RulerActivity.py:306
+#: RulerActivity.py:155
 msgid "Grid"
 msgstr "Cuadrícula"
 
-#: RulerActivity.py:178 RulerActivity.py:314
+#: RulerActivity.py:161
 msgid "Angles"
 msgstr "Ángulos"
 
-#: RulerActivity.py:186 RulerActivity.py:322
+#: RulerActivity.py:167
 msgid "Checker"
 msgstr "Tablero"
 
-#: RulerActivity.py:230
-msgid "Rulers"
-msgstr "Reglas"
+#: show_rulers.py:51
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "Usa esta regla desde el borde de la computadora."
+
+#~ msgid "Rulers"
+#~ msgstr "Reglas"