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

5 files changed, 170 insertions, 200 deletions

diff --git a/po/da.po b/po/da.po
index 1ab55b9..6370334 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-28 00:31-0400\n"
-"PO-Revision-Date: 2012-05-05 23:32+0200\n"
+"POT-Creation-Date: 2012-10-29 00:31-0400\n"
+"PO-Revision-Date: 2012-11-13 01:32+0200\n"
 "Last-Translator: Aputsiaq Niels <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: da\n"
@@ -17,115 +17,109 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2 abacus.py:48
+#. TRANS: "name" option from activity.info file
+#: abacus.py:48
 msgid "Abacus"
 msgstr "Abacus"
 
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "a tool for simple arithmetic calculations"
+msgstr "et værktøj til simple, aritmetiske beregninger"
+
 # http://www.datamuseum.dk/site_dk/historie/karvestok/
 # simplecap checked
-#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
-#: AbacusActivity.py:48 abacus.py:52
+#: AbacusActivity.py:38 abacus.py:52
 msgid "Suanpan"
 msgstr "Suan-Pan"
 
-#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53
+#: AbacusActivity.py:39 AbacusActivity.py:123 abacus.py:53
 msgid "Soroban"
 msgstr "Soroban"
 
-#: AbacusActivity.py:51 abacus.py:59
+#: AbacusActivity.py:40 abacus.py:59
 msgid "Decimal"
 msgstr "Decimal"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci)
-#: AbacusActivity.py:53 abacus.py:55
+#: AbacusActivity.py:41 abacus.py:55
 msgid "Nepohualtzintzin"
 msgstr "Nepohualtzintzin"
 
-#: AbacusActivity.py:54 abacus.py:57
+#: AbacusActivity.py:42 abacus.py:57
 msgid "Hexadecimal"
 msgstr "Heksadecimal"
 
-#: AbacusActivity.py:55 abacus.py:56
+#: AbacusActivity.py:43 abacus.py:56
 msgid "Binary"
 msgstr "Binær"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
-#: AbacusActivity.py:57 abacus.py:54
+#: AbacusActivity.py:44 abacus.py:54
 msgid "Schety"
 msgstr "Schety"
 
-#: AbacusActivity.py:58 abacus.py:58
+#: AbacusActivity.py:45 abacus.py:58
 msgid "Fraction"
 msgstr "Brøk"
 
-#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay
-#: AbacusActivity.py:60 abacus.py:60
+#: AbacusActivity.py:46 abacus.py:60
 msgid "Caacupé"
 msgstr "Caacupé"
 
-#: AbacusActivity.py:61 abacus.py:61
+#: AbacusActivity.py:47 abacus.py:61
 msgid "Rods"
 msgstr "Stænger"
 
-#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215
-#: AbacusActivity.py:240
+#: AbacusActivity.py:48 AbacusActivity.py:190 AbacusActivity.py:217
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: AbacusActivity.py:89 AbacusActivity.py:136
+#: AbacusActivity.py:74
 msgid "Edit"
 msgstr "Redigér"
 
-#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69
+#: AbacusActivity.py:98 abacus.py:69
 msgid "Reset"
 msgstr "Nulstil"
 
-#: AbacusActivity.py:122
+#: AbacusActivity.py:107
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: AbacusActivity.py:134
-msgid "Project"
-msgstr "Projekt"
-
-#. TRANS: Number of rods on the abacus
-#: AbacusActivity.py:218
+#: AbacusActivity.py:196
 msgid "Rods:"
 msgstr "Stænger:"
 
-#. TRANS: Number of beads in the top section of the abacus
-#: AbacusActivity.py:222
+#: AbacusActivity.py:199
 msgid "Top:"
 msgstr "Top:"
 
-#. TRANS: Number of beads in the bottom section of the abacus
-#: AbacusActivity.py:226
+#: AbacusActivity.py:202
 msgid "Bottom:"
 msgstr "Bund:"
 
-#. TRANS: Scale factor between bottom and top beads
-#: AbacusActivity.py:230
+#: AbacusActivity.py:205
 msgid "Factor:"
 msgstr "Faktor:"
 
-#. TRANS: Scale factor between rods
-#: AbacusActivity.py:234
+#: AbacusActivity.py:208
 msgid "Base:"
 msgstr "Base:"
 
-#: AbacusActivity.py:243
+#: AbacusActivity.py:220
 msgid "Copy"
 msgstr "Kopiér"
 
-#: AbacusActivity.py:245
+#: AbacusActivity.py:222
 msgid "Paste"
 msgstr "Indsæt"
 
-#: AbacusActivity.py:327
+#: AbacusActivity.py:311
 msgid "A new abacus is loading."
 msgstr "En ny abacus indlæses."
 
 #: abacus.py:72
 msgid "Quit"
 msgstr "Afslut"
+
+#~ msgid "Project"
+#~ msgstr "Projekt"
diff --git a/po/en.po b/po/en.po
index 6bda80c..1fc44ed 100644
--- a/po/en.po
+++ b/po/en.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-28 00:31-0400\n"
-"PO-Revision-Date: 2012-04-28 08:04+0200\n"
+"POT-Creation-Date: 2012-10-29 00:31-0400\n"
+"PO-Revision-Date: 2012-11-10 15:34+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en\n"
@@ -37,113 +37,107 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2 abacus.py:48
+#. TRANS: "name" option from activity.info file
+#: abacus.py:48
 msgid "Abacus"
 msgstr "Abacus"
 
-#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
-#: AbacusActivity.py:48 abacus.py:52
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "a tool for simple arithmetic calculations"
+msgstr "a tool for simple arithmetic calculations"
+
+#: AbacusActivity.py:38 abacus.py:52
 msgid "Suanpan"
 msgstr "Suanpan"
 
-#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53
+#: AbacusActivity.py:39 AbacusActivity.py:123 abacus.py:53
 msgid "Soroban"
 msgstr "Soroban"
 
-#: AbacusActivity.py:51 abacus.py:59
+#: AbacusActivity.py:40 abacus.py:59
 msgid "Decimal"
 msgstr "Decimal"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci)
-#: AbacusActivity.py:53 abacus.py:55
+#: AbacusActivity.py:41 abacus.py:55
 msgid "Nepohualtzintzin"
 msgstr "Nepohualtzintzin"
 
-#: AbacusActivity.py:54 abacus.py:57
+#: AbacusActivity.py:42 abacus.py:57
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: AbacusActivity.py:55 abacus.py:56
+#: AbacusActivity.py:43 abacus.py:56
 msgid "Binary"
 msgstr "Binary"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
-#: AbacusActivity.py:57 abacus.py:54
+#: AbacusActivity.py:44 abacus.py:54
 msgid "Schety"
 msgstr "Schety"
 
-#: AbacusActivity.py:58 abacus.py:58
+#: AbacusActivity.py:45 abacus.py:58
 msgid "Fraction"
 msgstr "Fraction"
 
-#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay
-#: AbacusActivity.py:60 abacus.py:60
+#: AbacusActivity.py:46 abacus.py:60
 msgid "Caacupé"
 msgstr "Caacupé"
 
-#: AbacusActivity.py:61 abacus.py:61
+#: AbacusActivity.py:47 abacus.py:61
 msgid "Rods"
 msgstr "Rods"
 
-#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215
-#: AbacusActivity.py:240
+#: AbacusActivity.py:48 AbacusActivity.py:190 AbacusActivity.py:217
 msgid "Custom"
 msgstr "Custom"
 
-#: AbacusActivity.py:89 AbacusActivity.py:136
+#: AbacusActivity.py:74
 msgid "Edit"
 msgstr "Edit"
 
-#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69
+#: AbacusActivity.py:98 abacus.py:69
 msgid "Reset"
 msgstr "Reset"
 
-#: AbacusActivity.py:122
+#: AbacusActivity.py:107
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: AbacusActivity.py:134
-msgid "Project"
-msgstr "Project"
-
-#. TRANS: Number of rods on the abacus
-#: AbacusActivity.py:218
+#: AbacusActivity.py:196
 msgid "Rods:"
 msgstr "Rods:"
 
-#. TRANS: Number of beads in the top section of the abacus
-#: AbacusActivity.py:222
+#: AbacusActivity.py:199
 msgid "Top:"
 msgstr "Top:"
 
-#. TRANS: Number of beads in the bottom section of the abacus
-#: AbacusActivity.py:226
+#: AbacusActivity.py:202
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#. TRANS: Scale factor between bottom and top beads
-#: AbacusActivity.py:230
+#: AbacusActivity.py:205
 msgid "Factor:"
 msgstr "Factor:"
 
-#. TRANS: Scale factor between rods
-#: AbacusActivity.py:234
+#: AbacusActivity.py:208
 msgid "Base:"
 msgstr "Base:"
 
-#: AbacusActivity.py:243
+#: AbacusActivity.py:220
 msgid "Copy"
 msgstr "Copy"
 
-#: AbacusActivity.py:245
+#: AbacusActivity.py:222
 msgid "Paste"
 msgstr "Paste"
 
-#: AbacusActivity.py:327
+#: AbacusActivity.py:311
 msgid "A new abacus is loading."
 msgstr "A new abacus is loading."
 
 #: abacus.py:72
 msgid "Quit"
 msgstr "Quit"
+
+#~ msgid "Project"
+#~ msgstr "Project"
diff --git a/po/en_GB.po b/po/en_GB.po
index 58eba1f..389f1f0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-28 00:31-0400\n"
-"PO-Revision-Date: 2012-04-28 09:42+0200\n"
+"POT-Creation-Date: 2012-10-29 00:31-0400\n"
+"PO-Revision-Date: 2012-11-10 17:51+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -37,110 +37,101 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2 abacus.py:48
+#. TRANS: "name" option from activity.info file
+#: abacus.py:48
 msgid "Abacus"
 msgstr "Abacus"
 
-#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
-#: AbacusActivity.py:48 abacus.py:52
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "a tool for simple arithmetic calculations"
+msgstr "a tool for simple arithmetic calculations"
+
+#: AbacusActivity.py:38 abacus.py:52
 msgid "Suanpan"
 msgstr "Suanpan"
 
-#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53
+#: AbacusActivity.py:39 AbacusActivity.py:123 abacus.py:53
 msgid "Soroban"
 msgstr "Soroban"
 
-#: AbacusActivity.py:51 abacus.py:59
+#: AbacusActivity.py:40 abacus.py:59
 msgid "Decimal"
 msgstr "Decimal"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci)
-#: AbacusActivity.py:53 abacus.py:55
+#: AbacusActivity.py:41 abacus.py:55
 msgid "Nepohualtzintzin"
 msgstr "Nepohualtzintzin"
 
-#: AbacusActivity.py:54 abacus.py:57
+#: AbacusActivity.py:42 abacus.py:57
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: AbacusActivity.py:55 abacus.py:56
+#: AbacusActivity.py:43 abacus.py:56
 msgid "Binary"
 msgstr "Binary"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
-#: AbacusActivity.py:57 abacus.py:54
+#: AbacusActivity.py:44 abacus.py:54
 msgid "Schety"
 msgstr "Schety"
 
-#: AbacusActivity.py:58 abacus.py:58
+#: AbacusActivity.py:45 abacus.py:58
 msgid "Fraction"
 msgstr "Fraction"
 
-#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay
-#: AbacusActivity.py:60 abacus.py:60
+#: AbacusActivity.py:46 abacus.py:60
 msgid "Caacupé"
 msgstr "Caacupé"
 
-#: AbacusActivity.py:61 abacus.py:61
+#: AbacusActivity.py:47 abacus.py:61
 msgid "Rods"
 msgstr "Rods"
 
-#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215
-#: AbacusActivity.py:240
+#: AbacusActivity.py:48 AbacusActivity.py:190 AbacusActivity.py:217
 msgid "Custom"
 msgstr "Custom"
 
-#: AbacusActivity.py:89 AbacusActivity.py:136
+#: AbacusActivity.py:74
 msgid "Edit"
 msgstr "Edit"
 
-#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69
+#: AbacusActivity.py:98 abacus.py:69
 msgid "Reset"
 msgstr "Reset"
 
-#: AbacusActivity.py:122
+#: AbacusActivity.py:107
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: AbacusActivity.py:134
-msgid "Project"
-msgstr "Project"
-
-#. TRANS: Number of rods on the abacus
-#: AbacusActivity.py:218
+#: AbacusActivity.py:196
 msgid "Rods:"
 msgstr "Rods:"
 
-#. TRANS: Number of beads in the top section of the abacus
-#: AbacusActivity.py:222
+#: AbacusActivity.py:199
 msgid "Top:"
 msgstr "Top:"
 
-#. TRANS: Number of beads in the bottom section of the abacus
-#: AbacusActivity.py:226
+#: AbacusActivity.py:202
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#. TRANS: Scale factor between bottom and top beads
-#: AbacusActivity.py:230
+#: AbacusActivity.py:205
 msgid "Factor:"
 msgstr "Factor:"
 
-#. TRANS: Scale factor between rods
-#: AbacusActivity.py:234
+#: AbacusActivity.py:208
 msgid "Base:"
 msgstr "Base:"
 
-#: AbacusActivity.py:243
+#: AbacusActivity.py:220
 msgid "Copy"
 msgstr "Copy"
 
-#: AbacusActivity.py:245
+#: AbacusActivity.py:222
 msgid "Paste"
 msgstr "Paste"
 
-#: AbacusActivity.py:327
+#: AbacusActivity.py:311
 msgid "A new abacus is loading."
 msgstr "A new abacus is loading."
 
@@ -148,6 +139,9 @@ msgstr "A new abacus is loading."
 msgid "Quit"
 msgstr "Quit"
 
+#~ msgid "Project"
+#~ msgstr "Project"
+
 #~ msgid "Caacupe"
 #~ msgstr "Caacupe"
 
diff --git a/po/en_US.po b/po/en_US.po
index f54c9ee..ca4cc03 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-28 00:31-0400\n"
-"PO-Revision-Date: 2012-04-28 17:15+0200\n"
+"POT-Creation-Date: 2012-10-29 00:31-0400\n"
+"PO-Revision-Date: 2012-11-10 17:42+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_US\n"
@@ -41,110 +41,101 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2 abacus.py:48
+#. TRANS: "name" option from activity.info file
+#: abacus.py:48
 msgid "Abacus"
 msgstr "Abacus"
 
-#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
-#: AbacusActivity.py:48 abacus.py:52
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "a tool for simple arithmetic calculations"
+msgstr "a tool for simple arithmetic calculations"
+
+#: AbacusActivity.py:38 abacus.py:52
 msgid "Suanpan"
 msgstr "Suanpan"
 
-#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53
+#: AbacusActivity.py:39 AbacusActivity.py:123 abacus.py:53
 msgid "Soroban"
 msgstr "Soroban"
 
-#: AbacusActivity.py:51 abacus.py:59
+#: AbacusActivity.py:40 abacus.py:59
 msgid "Decimal"
 msgstr "Decimal"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci)
-#: AbacusActivity.py:53 abacus.py:55
+#: AbacusActivity.py:41 abacus.py:55
 msgid "Nepohualtzintzin"
 msgstr "Nepohualtzintzin"
 
-#: AbacusActivity.py:54 abacus.py:57
+#: AbacusActivity.py:42 abacus.py:57
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: AbacusActivity.py:55 abacus.py:56
+#: AbacusActivity.py:43 abacus.py:56
 msgid "Binary"
 msgstr "Binary"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
-#: AbacusActivity.py:57 abacus.py:54
+#: AbacusActivity.py:44 abacus.py:54
 msgid "Schety"
 msgstr "Schety"
 
-#: AbacusActivity.py:58 abacus.py:58
+#: AbacusActivity.py:45 abacus.py:58
 msgid "Fraction"
 msgstr "Fraction"
 
-#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay
-#: AbacusActivity.py:60 abacus.py:60
+#: AbacusActivity.py:46 abacus.py:60
 msgid "Caacupé"
 msgstr "Caacupé"
 
-#: AbacusActivity.py:61 abacus.py:61
+#: AbacusActivity.py:47 abacus.py:61
 msgid "Rods"
 msgstr "Rods"
 
-#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215
-#: AbacusActivity.py:240
+#: AbacusActivity.py:48 AbacusActivity.py:190 AbacusActivity.py:217
 msgid "Custom"
 msgstr "Custom"
 
-#: AbacusActivity.py:89 AbacusActivity.py:136
+#: AbacusActivity.py:74
 msgid "Edit"
 msgstr "Edit"
 
-#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69
+#: AbacusActivity.py:98 abacus.py:69
 msgid "Reset"
 msgstr "Reset"
 
-#: AbacusActivity.py:122
+#: AbacusActivity.py:107
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: AbacusActivity.py:134
-msgid "Project"
-msgstr "Project"
-
-#. TRANS: Number of rods on the abacus
-#: AbacusActivity.py:218
+#: AbacusActivity.py:196
 msgid "Rods:"
 msgstr "Rods:"
 
-#. TRANS: Number of beads in the top section of the abacus
-#: AbacusActivity.py:222
+#: AbacusActivity.py:199
 msgid "Top:"
 msgstr "Top:"
 
-#. TRANS: Number of beads in the bottom section of the abacus
-#: AbacusActivity.py:226
+#: AbacusActivity.py:202
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#. TRANS: Scale factor between bottom and top beads
-#: AbacusActivity.py:230
+#: AbacusActivity.py:205
 msgid "Factor:"
 msgstr "Factor:"
 
-#. TRANS: Scale factor between rods
-#: AbacusActivity.py:234
+#: AbacusActivity.py:208
 msgid "Base:"
 msgstr "Base:"
 
-#: AbacusActivity.py:243
+#: AbacusActivity.py:220
 msgid "Copy"
 msgstr "Copy"
 
-#: AbacusActivity.py:245
+#: AbacusActivity.py:222
 msgid "Paste"
 msgstr "Paste"
 
-#: AbacusActivity.py:327
+#: AbacusActivity.py:311
 msgid "A new abacus is loading."
 msgstr "A new abacus is loading."
 
@@ -152,6 +143,9 @@ msgstr "A new abacus is loading."
 msgid "Quit"
 msgstr "Quit"
 
+#~ msgid "Project"
+#~ msgstr "Project"
+
 #~ msgid "Caacupe"
 #~ msgstr "Caacupe"
 
diff --git a/po/es.po b/po/es.po
index a3f15ae..818b92d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -130,8 +130,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-28 00:31-0400\n"
-"PO-Revision-Date: 2012-08-06 22:16+0200\n"
+"POT-Creation-Date: 2012-10-29 00:31-0400\n"
+"PO-Revision-Date: 2012-11-10 17:57+0200\n"
 "Last-Translator: AlanJAS <alanjas@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"
@@ -141,111 +141,102 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2 abacus.py:48
+#. TRANS: "name" option from activity.info file
+#: abacus.py:48
 msgid "Abacus"
 msgstr "Ábaco"
 
-#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
-#: AbacusActivity.py:48 abacus.py:52
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "a tool for simple arithmetic calculations"
+msgstr "una herramienta para cálculos aritméticos simples"
+
+#: AbacusActivity.py:38 abacus.py:52
 msgid "Suanpan"
 msgstr "Suanpan"
 
-#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53
+#: AbacusActivity.py:39 AbacusActivity.py:123 abacus.py:53
 msgid "Soroban"
 msgstr "Soroban"
 
-#: AbacusActivity.py:51 abacus.py:59
+#: AbacusActivity.py:40 abacus.py:59
 msgid "Decimal"
 msgstr "Decimal"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci)
-#: AbacusActivity.py:53 abacus.py:55
+#: AbacusActivity.py:41 abacus.py:55
 msgid "Nepohualtzintzin"
 msgstr "Nepohualtzitzin"
 
-#: AbacusActivity.py:54 abacus.py:57
+#: AbacusActivity.py:42 abacus.py:57
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: AbacusActivity.py:55 abacus.py:56
+#: AbacusActivity.py:43 abacus.py:56
 msgid "Binary"
 msgstr "Binario"
 
-#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
-#: AbacusActivity.py:57 abacus.py:54
+#: AbacusActivity.py:44 abacus.py:54
 msgid "Schety"
 msgstr "Schety"
 
-#: AbacusActivity.py:58 abacus.py:58
+#: AbacusActivity.py:45 abacus.py:58
 msgid "Fraction"
 msgstr "Fracción"
 
-#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay
-#: AbacusActivity.py:60 abacus.py:60
+#: AbacusActivity.py:46 abacus.py:60
 msgid "Caacupé"
 msgstr "Caacupé"
 
-#: AbacusActivity.py:61 abacus.py:61
+#: AbacusActivity.py:47 abacus.py:61
 msgid "Rods"
 msgstr "Barras"
 
 # The button creates a custom abacus so the word "create" is more appropriately named.
-#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215
-#: AbacusActivity.py:240
+#: AbacusActivity.py:48 AbacusActivity.py:190 AbacusActivity.py:217
 msgid "Custom"
 msgstr "Crear"
 
-#: AbacusActivity.py:89 AbacusActivity.py:136
+#: AbacusActivity.py:74
 msgid "Edit"
 msgstr "Editar"
 
-#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69
+#: AbacusActivity.py:98 abacus.py:69
 msgid "Reset"
 msgstr "Limpiar"
 
-#: AbacusActivity.py:122
+#: AbacusActivity.py:107
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: AbacusActivity.py:134
-msgid "Project"
-msgstr "Proyecto"
-
-#. TRANS: Number of rods on the abacus
-#: AbacusActivity.py:218
+#: AbacusActivity.py:196
 msgid "Rods:"
 msgstr "Barras:"
 
-#. TRANS: Number of beads in the top section of the abacus
-#: AbacusActivity.py:222
+#: AbacusActivity.py:199
 msgid "Top:"
 msgstr "Arriba:"
 
-#. TRANS: Number of beads in the bottom section of the abacus
-#: AbacusActivity.py:226
+#: AbacusActivity.py:202
 msgid "Bottom:"
 msgstr "Abajo:"
 
-#. TRANS: Scale factor between bottom and top beads
-#: AbacusActivity.py:230
+#: AbacusActivity.py:205
 msgid "Factor:"
 msgstr "Factor:"
 
-#. TRANS: Scale factor between rods
-#: AbacusActivity.py:234
+#: AbacusActivity.py:208
 msgid "Base:"
 msgstr "Base:"
 
-#: AbacusActivity.py:243
+#: AbacusActivity.py:220
 msgid "Copy"
 msgstr "Copiar"
 
-#: AbacusActivity.py:245
+#: AbacusActivity.py:222
 msgid "Paste"
 msgstr "Pegar"
 
-#: AbacusActivity.py:327
+#: AbacusActivity.py:311
 msgid "A new abacus is loading."
 msgstr "Un nuevo ábaco está cargándose."
 
@@ -253,6 +244,9 @@ msgstr "Un nuevo ábaco está cargándose."
 msgid "Quit"
 msgstr "Salir"
 
+#~ msgid "Project"
+#~ msgstr "Proyecto"
+
 #~ msgid "Caacupe"
 #~ msgstr "Caacupé"