From cf2f631c1c3324bebc766e0a01bc82c64cc93d07 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Mon, 07 May 2012 14:27:53 +0000 Subject: Merge branch 'master' of git.sugarlabs.org:abacus/mainline --- diff --git a/po/da.po b/po/da.po index 6dd4105..1ab55b9 100644 --- a/po/da.po +++ b/po/da.po @@ -6,138 +6,126 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-02 09:50-0400\n" -"PO-Revision-Date: 2011-04-08 03:40+0200\n" -"Last-Translator: Aputsiaq \n" +"POT-Creation-Date: 2012-04-28 00:31-0400\n" +"PO-Revision-Date: 2012-05-05 23:32+0200\n" +"Last-Translator: Aputsiaq Niels \n" "Language-Team: LANGUAGE \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.1\n" +"X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 abacus.py:48 dist/Abacus-19/abacus.py:49 +#: activity/activity.info:2 abacus.py:48 msgid "Abacus" msgstr "Abacus" # http://www.datamuseum.dk/site_dk/historie/karvestok/ # simplecap checked -#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus) -#: abacus.py:52 AbacusActivity.py:293 dist/Abacus-19/abacus.py:53 -#: dist/Abacus-19/AbacusActivity.py:255 +#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus) +#: AbacusActivity.py:48 abacus.py:52 msgid "Suanpan" msgstr "Suan-Pan" -#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus) -#: abacus.py:53 AbacusActivity.py:174 dist/Abacus-19/abacus.py:54 -#: dist/Abacus-19/AbacusActivity.py:160 +#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus) +#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53 msgid "Soroban" msgstr "Soroban" -#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus -#: abacus.py:54 AbacusActivity.py:187 dist/Abacus-19/abacus.py:55 -#: dist/Abacus-19/AbacusActivity.py:169 -msgid "Schety" -msgstr "Schety" +#: AbacusActivity.py:51 abacus.py:59 +msgid "Decimal" +msgstr "Decimal" -#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci -#: abacus.py:55 AbacusActivity.py:178 dist/Abacus-19/abacus.py:56 -#: dist/Abacus-19/AbacusActivity.py:163 +#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci) +#: AbacusActivity.py:53 abacus.py:55 msgid "Nepohualtzintzin" msgstr "Nepohualtzintzin" -#. TRANS: binary abacus -#: abacus.py:56 AbacusActivity.py:184 dist/Abacus-19/abacus.py:57 -#: dist/Abacus-19/AbacusActivity.py:167 +#: AbacusActivity.py:54 abacus.py:57 +msgid "Hexadecimal" +msgstr "Heksadecimal" + +#: AbacusActivity.py:55 abacus.py:56 msgid "Binary" msgstr "Binær" -#. TRANS: hexidecimal abacus -#: abacus.py:57 AbacusActivity.py:181 dist/Abacus-19/abacus.py:58 -#: dist/Abacus-19/AbacusActivity.py:165 -msgid "Hexadecimal" -msgstr "Heksadecimal" +#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus +#: AbacusActivity.py:57 abacus.py:54 +msgid "Schety" +msgstr "Schety" -#. TRANS: abacus for adding fractions -#: abacus.py:58 AbacusActivity.py:190 dist/Abacus-19/abacus.py:59 -#: dist/Abacus-19/AbacusActivity.py:171 +#: AbacusActivity.py:58 abacus.py:58 msgid "Fraction" msgstr "Brøk" -#. TRANS: simple decimal abacus -#: abacus.py:59 AbacusActivity.py:296 dist/Abacus-19/abacus.py:60 -#: dist/Abacus-19/AbacusActivity.py:257 -msgid "Decimal" -msgstr "Decimal" - -#. TRANS: Abacus invented by teachers in Caacupé, Paraguay -#: abacus.py:60 AbacusActivity.py:193 dist/Abacus-19/abacus.py:61 -#: dist/Abacus-19/AbacusActivity.py:173 +#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay +#: AbacusActivity.py:60 abacus.py:60 msgid "Caacupé" msgstr "Caacupé" -#. TRANS: Cuisenaire Rods -#: abacus.py:61 AbacusActivity.py:196 dist/Abacus-19/abacus.py:62 -#: dist/Abacus-19/AbacusActivity.py:175 +#: AbacusActivity.py:61 abacus.py:61 msgid "Rods" msgstr "Stænger" -#: abacus.py:69 abacus_window.py:573 dist/Abacus-19/abacus.py:70 -#: dist/Abacus-19/abacus_window.py:548 -msgid "Reset" -msgstr "Nulstil" - -#: abacus.py:72 dist/Abacus-19/abacus.py:73 -msgid "Quit" -msgstr "Afslut" +#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215 +#: AbacusActivity.py:240 +msgid "Custom" +msgstr "Tilpasset" -#: AbacusActivity.py:136 AbacusActivity.py:160 +#: AbacusActivity.py:89 AbacusActivity.py:136 msgid "Edit" msgstr "Redigér" -#: AbacusActivity.py:146 dist/Abacus-19/AbacusActivity.py:133 +#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69 +msgid "Reset" +msgstr "Nulstil" + +#: AbacusActivity.py:122 msgid "Q" msgstr "Q" -#: AbacusActivity.py:158 dist/Abacus-19/AbacusActivity.py:146 +#: AbacusActivity.py:134 msgid "Project" msgstr "Projekt" -#: AbacusActivity.py:159 AbacusActivity.py:221 -#: dist/Abacus-19/AbacusActivity.py:147 dist/Abacus-19/AbacusActivity.py:195 -msgid "Custom" -msgstr "Tilpasset" - #. TRANS: Number of rods on the abacus -#: AbacusActivity.py:200 dist/Abacus-19/AbacusActivity.py:178 +#: AbacusActivity.py:218 msgid "Rods:" msgstr "Stænger:" #. TRANS: Number of beads in the top section of the abacus -#: AbacusActivity.py:204 dist/Abacus-19/AbacusActivity.py:181 +#: AbacusActivity.py:222 msgid "Top:" msgstr "Top:" #. TRANS: Number of beads in the bottom section of the abacus -#: AbacusActivity.py:208 dist/Abacus-19/AbacusActivity.py:184 +#: AbacusActivity.py:226 msgid "Bottom:" msgstr "Bund:" #. TRANS: Scale factor between bottom and top beads -#: AbacusActivity.py:213 dist/Abacus-19/AbacusActivity.py:188 +#: AbacusActivity.py:230 msgid "Factor:" msgstr "Faktor:" #. TRANS: Scale factor between rods -#: AbacusActivity.py:217 dist/Abacus-19/AbacusActivity.py:191 +#: AbacusActivity.py:234 msgid "Base:" msgstr "Base:" -#: AbacusActivity.py:224 +#: AbacusActivity.py:243 msgid "Copy" msgstr "Kopiér" -#: AbacusActivity.py:226 +#: AbacusActivity.py:245 msgid "Paste" msgstr "Indsæt" + +#: AbacusActivity.py:327 +msgid "A new abacus is loading." +msgstr "En ny abacus indlæses." + +#: abacus.py:72 +msgid "Quit" +msgstr "Afslut" diff --git a/po/zh_CN.po b/po/zh_CN.po index ad5e194..1ce9dbc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -26,136 +26,124 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-02 09:50-0400\n" -"PO-Revision-Date: 2011-12-22 16:06+0200\n" +"POT-Creation-Date: 2012-04-28 00:31-0400\n" +"PO-Revision-Date: 2012-04-29 04:52+0200\n" "Last-Translator: lite \n" "Language-Team: LANGUAGE \n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 abacus.py:48 dist/Abacus-19/abacus.py:49 +#: activity/activity.info:2 abacus.py:48 msgid "Abacus" msgstr "算盘" -#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus) -#: abacus.py:52 AbacusActivity.py:293 dist/Abacus-19/abacus.py:53 -#: dist/Abacus-19/AbacusActivity.py:255 +#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus) +#: AbacusActivity.py:48 abacus.py:52 msgid "Suanpan" msgstr "中国算盘" -#. TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus) -#: abacus.py:53 AbacusActivity.py:174 dist/Abacus-19/abacus.py:54 -#: dist/Abacus-19/AbacusActivity.py:160 +#. TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus) +#: AbacusActivity.py:50 AbacusActivity.py:160 abacus.py:53 msgid "Soroban" msgstr "日本算盘" -#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus -#: abacus.py:54 AbacusActivity.py:187 dist/Abacus-19/abacus.py:55 -#: dist/Abacus-19/AbacusActivity.py:169 -msgid "Schety" -msgstr "俄罗斯算盘" +#: AbacusActivity.py:51 abacus.py:59 +msgid "Decimal" +msgstr "十进制" -#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci -#: abacus.py:55 AbacusActivity.py:178 dist/Abacus-19/abacus.py:56 -#: dist/Abacus-19/AbacusActivity.py:163 +#. TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci) +#: AbacusActivity.py:53 abacus.py:55 msgid "Nepohualtzintzin" msgstr "玛雅算盘" -#. TRANS: binary abacus -#: abacus.py:56 AbacusActivity.py:184 dist/Abacus-19/abacus.py:57 -#: dist/Abacus-19/AbacusActivity.py:167 +#: AbacusActivity.py:54 abacus.py:57 +msgid "Hexadecimal" +msgstr "十六进制" + +#: AbacusActivity.py:55 abacus.py:56 msgid "Binary" msgstr "二进制" -#. TRANS: hexidecimal abacus -#: abacus.py:57 AbacusActivity.py:181 dist/Abacus-19/abacus.py:58 -#: dist/Abacus-19/AbacusActivity.py:165 -msgid "Hexadecimal" -msgstr "十六进制" +#. TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus +#: AbacusActivity.py:57 abacus.py:54 +msgid "Schety" +msgstr "俄罗斯算盘" -#. TRANS: abacus for adding fractions -#: abacus.py:58 AbacusActivity.py:190 dist/Abacus-19/abacus.py:59 -#: dist/Abacus-19/AbacusActivity.py:171 +#: AbacusActivity.py:58 abacus.py:58 msgid "Fraction" msgstr "分数" -#. TRANS: simple decimal abacus -#: abacus.py:59 AbacusActivity.py:296 dist/Abacus-19/abacus.py:60 -#: dist/Abacus-19/AbacusActivity.py:257 -msgid "Decimal" -msgstr "十进制" - -#. TRANS: Abacus invented by teachers in Caacupé, Paraguay -#: abacus.py:60 AbacusActivity.py:193 dist/Abacus-19/abacus.py:61 -#: dist/Abacus-19/AbacusActivity.py:173 +#. TRANS: Caacupé is an abacus invented by teachers in Caacupé, Paraguay +#: AbacusActivity.py:60 abacus.py:60 msgid "Caacupé" msgstr "巴拉圭算盘" -#. TRANS: Cuisenaire Rods -#: abacus.py:61 AbacusActivity.py:196 dist/Abacus-19/abacus.py:62 -#: dist/Abacus-19/AbacusActivity.py:175 +#: AbacusActivity.py:61 abacus.py:61 msgid "Rods" msgstr "古氏积木" -#: abacus.py:69 abacus_window.py:573 dist/Abacus-19/abacus.py:70 -#: dist/Abacus-19/abacus_window.py:548 -msgid "Reset" -msgstr "清零" - -#: abacus.py:72 dist/Abacus-19/abacus.py:73 -msgid "Quit" -msgstr "退出" +#: AbacusActivity.py:62 AbacusActivity.py:135 AbacusActivity.py:215 +#: AbacusActivity.py:240 +msgid "Custom" +msgstr "定制" -#: AbacusActivity.py:136 AbacusActivity.py:160 +#: AbacusActivity.py:89 AbacusActivity.py:136 msgid "Edit" msgstr "编辑" -#: AbacusActivity.py:146 dist/Abacus-19/AbacusActivity.py:133 +#: AbacusActivity.py:113 AbacusActivity.py:139 abacus.py:69 +msgid "Reset" +msgstr "清零" + +#: AbacusActivity.py:122 msgid "Q" msgstr "Q" -#: AbacusActivity.py:158 dist/Abacus-19/AbacusActivity.py:146 +#: AbacusActivity.py:134 msgid "Project" msgstr "項目" -#: AbacusActivity.py:159 AbacusActivity.py:221 -#: dist/Abacus-19/AbacusActivity.py:147 dist/Abacus-19/AbacusActivity.py:195 -msgid "Custom" -msgstr "定制" - #. TRANS: Number of rods on the abacus -#: AbacusActivity.py:200 dist/Abacus-19/AbacusActivity.py:178 +#: AbacusActivity.py:218 msgid "Rods:" msgstr "积木数量：" #. TRANS: Number of beads in the top section of the abacus -#: AbacusActivity.py:204 dist/Abacus-19/AbacusActivity.py:181 +#: AbacusActivity.py:222 msgid "Top:" msgstr "上半部算珠：" #. TRANS: Number of beads in the bottom section of the abacus -#: AbacusActivity.py:208 dist/Abacus-19/AbacusActivity.py:184 +#: AbacusActivity.py:226 msgid "Bottom:" msgstr "下半部算珠：" #. TRANS: Scale factor between bottom and top beads -#: AbacusActivity.py:213 dist/Abacus-19/AbacusActivity.py:188 +#: AbacusActivity.py:230 msgid "Factor:" msgstr "因子：" #. TRANS: Scale factor between rods -#: AbacusActivity.py:217 dist/Abacus-19/AbacusActivity.py:191 +#: AbacusActivity.py:234 msgid "Base:" msgstr "进制：" -#: AbacusActivity.py:224 +#: AbacusActivity.py:243 msgid "Copy" msgstr "复制" -#: AbacusActivity.py:226 +#: AbacusActivity.py:245 msgid "Paste" msgstr "贴上" + +#: AbacusActivity.py:327 +msgid "A new abacus is loading." +msgstr "正在加载新的算盘。" + +#: abacus.py:72 +msgid "Quit" +msgstr "退出" -- cgit v0.9.1