[Tux4kids-commits] r1553 - in tuxmath: branches/lan/po trunk trunk/server trunk/src
David Bruce
dbruce-guest at alioth.debian.org
Fri Sep 25 03:10:15 UTC 2009
Author: dbruce-guest
Date: 2009-09-25 03:10:14 +0000 (Fri, 25 Sep 2009)
New Revision: 1553
Added:
tuxmath/trunk/src/testclient.c
tuxmath/trunk/src/testclient.h
Removed:
tuxmath/trunk/server/Makefile.am
tuxmath/trunk/server/testclient.c
tuxmath/trunk/server/testclient.h
Modified:
tuxmath/branches/lan/po/ar.gmo
tuxmath/branches/lan/po/ar.po
tuxmath/branches/lan/po/cs.gmo
tuxmath/branches/lan/po/cs.po
tuxmath/branches/lan/po/de.gmo
tuxmath/branches/lan/po/de.po
tuxmath/branches/lan/po/en at boldquot.gmo
tuxmath/branches/lan/po/en at boldquot.po
tuxmath/branches/lan/po/en at quot.gmo
tuxmath/branches/lan/po/en at quot.po
tuxmath/branches/lan/po/en_GB.gmo
tuxmath/branches/lan/po/en_GB.po
tuxmath/branches/lan/po/es.gmo
tuxmath/branches/lan/po/es.po
tuxmath/branches/lan/po/fi.gmo
tuxmath/branches/lan/po/fi.po
tuxmath/branches/lan/po/fr.gmo
tuxmath/branches/lan/po/fr.po
tuxmath/branches/lan/po/ga.gmo
tuxmath/branches/lan/po/ga.po
tuxmath/branches/lan/po/he.gmo
tuxmath/branches/lan/po/he.po
tuxmath/branches/lan/po/hu.gmo
tuxmath/branches/lan/po/hu.po
tuxmath/branches/lan/po/it.gmo
tuxmath/branches/lan/po/it.po
tuxmath/branches/lan/po/ja.gmo
tuxmath/branches/lan/po/ja.po
tuxmath/branches/lan/po/nb.gmo
tuxmath/branches/lan/po/nb.po
tuxmath/branches/lan/po/nl.gmo
tuxmath/branches/lan/po/nl.po
tuxmath/branches/lan/po/nn.gmo
tuxmath/branches/lan/po/nn.po
tuxmath/branches/lan/po/oc.gmo
tuxmath/branches/lan/po/oc.po
tuxmath/branches/lan/po/pl.gmo
tuxmath/branches/lan/po/pl.po
tuxmath/branches/lan/po/pt.gmo
tuxmath/branches/lan/po/pt.po
tuxmath/branches/lan/po/pt_BR.gmo
tuxmath/branches/lan/po/pt_BR.po
tuxmath/branches/lan/po/ru.gmo
tuxmath/branches/lan/po/ru.po
tuxmath/branches/lan/po/sk.gmo
tuxmath/branches/lan/po/sk.po
tuxmath/branches/lan/po/sv.gmo
tuxmath/branches/lan/po/sv.po
tuxmath/branches/lan/po/tr.gmo
tuxmath/branches/lan/po/tr.po
tuxmath/branches/lan/po/tuxmath.pot
tuxmath/branches/lan/po/zh_CN.gmo
tuxmath/branches/lan/po/zh_CN.po
tuxmath/trunk/Makefile.am
tuxmath/trunk/configure.ac
tuxmath/trunk/src/Makefile.am
tuxmath/trunk/src/network.c
tuxmath/trunk/src/network.h
Log:
moved remaining files out of /server directory
Modified: tuxmath/branches/lan/po/ar.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/ar.po
===================================================================
--- tuxmath/branches/lan/po/ar.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/ar.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-02-15 03:00+0100\n"
"Last-Translator: Caroline Ford <caroline.ford.work at googlemail.com>\n"
"Language-Team: \n"
@@ -199,334 +199,229 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "مرحبا بكم في tuxmath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "مهمتكم هو انقاذ"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "اكواخ البطاريق من"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "المذنبات المتساقطة."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "أوقف المذنب بكتابة"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "الجواب على مشكلة الرياضيات"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "والضغط على زر اﻷدخال او المساقة"
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "جربها الآن!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "رميه جيده!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "اذا اصيب كوخ اﻷسكيمو"
-#: src/game.c:777
+#: src/game.c:1036
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "فسيذاب ولكن لا تقلق"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "البطريق بخير!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "اﻷن شاهد ما يحدث :"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(الصحافة مفتاح البدأ)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "اشعار الاجابه"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "اما اذا صدم مرة أخرى"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "فأن البطريق سيغادر."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(اضغط اى مفتاح عندما تستعد)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "يمكنك اصلاح اكواخ الاسكيمو"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "بوقف مكافاه المذنبات."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "انطلق الآن!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "رائع!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "يمكنك الخروج اى وقت بالضغط على"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "'ESC' أو 'X'"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "في الركن الايمن العلوي."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "افعلها اﻷن, ثم ابدأ اللعب !"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "قاعة الشهره"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "مبتدئ"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "الكشفيه"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "حارس"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "اس"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "! العمل يتقدم"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "هذه الخاصية ليست جاهزة حتى الآن"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "ناقش مستقبل اللعبة فى"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "Tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "مساعدة"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "مزيد من الخيارات"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "خروج"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "اكاديميه التدريب"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "لعبه تقليدية"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "لعبة مخصصة"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "القائمة الرئيسية"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "حرر ملف 'الخيارات' فى مجلدك الافتراضى"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "لإنشاء لعبة مخصصة"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "اضغط فوق مفتاح أو انقر الماوس لبدء اللعبة."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Readme.txt انظر لمزيد من المعلومات"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "ديمو"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "معلومات المشروع"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "فريق العمل"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "القائمة الرئيسية"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath برنامج حر مفتوح المصدر"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "يمكنك المساعدة بجعلها افضل بإرسال اى مشاكل تواجها,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "أو اى مقترحات أو كتابة أكواد"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "tuxmath-devel at lists.sourceforge.net ناقش المستقبل على "
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "عدد الطباعه"
@@ -761,6 +656,63 @@
msgid "Division of Positives and Negatives"
msgstr "قسمة الأرقام الموجية والسالبة"
+#~ msgid "Help"
+#~ msgstr "مساعدة"
+
+#~ msgid "More Options"
+#~ msgstr "مزيد من الخيارات"
+
+#~ msgid "Quit"
+#~ msgstr "خروج"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "اكاديميه التدريب"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "لعبه تقليدية"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "لعبة مخصصة"
+
+#~ msgid "Main menu"
+#~ msgstr "القائمة الرئيسية"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "حرر ملف 'الخيارات' فى مجلدك الافتراضى"
+
+#~ msgid "to create customized game!"
+#~ msgstr "لإنشاء لعبة مخصصة"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "اضغط فوق مفتاح أو انقر الماوس لبدء اللعبة."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Readme.txt انظر لمزيد من المعلومات"
+
+#~ msgid "Demo"
+#~ msgstr "ديمو"
+
+#~ msgid "Project Info"
+#~ msgstr "معلومات المشروع"
+
+#~ msgid "Credits"
+#~ msgstr "فريق العمل"
+
+#~ msgid "Main Menu"
+#~ msgstr "القائمة الرئيسية"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath برنامج حر مفتوح المصدر"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "يمكنك المساعدة بجعلها افضل بإرسال اى مشاكل تواجها,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "أو اى مقترحات أو كتابة أكواد"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "tuxmath-devel at lists.sourceforge.net ناقش المستقبل على "
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "اكواخ البطاريق من"
Modified: tuxmath/branches/lan/po/cs.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/cs.po
===================================================================
--- tuxmath/branches/lan/po/cs.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/cs.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2007-11-12 20:54+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -204,333 +204,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Síň slávy"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Nováček"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Průzkumník"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Střelec"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Borec"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Ve výstavbě!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Tato vlastnost ještě nefunguje"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Diskutuj o budoucnosti TuxMath na"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Nápověda"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Více možností"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Ukončit"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Akademie vesmírné matematiky"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Hra"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Vlastní hra"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Hlavní menu"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Uprav soubor «options » ve své domovské složce,"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "abys mohl vytvořit vlastní hru!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Zmáčkni klávesu nebo klikni tlačítkem myši, abys začal hru"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Pokud chceš více informací, podívej se na README.txt"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Info o projektu"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Poděkování"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Hlavní menu"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath je svobodný software!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "I ty ho můžeš vylepšit, když oznámíš chyby, "
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "navrhneš vylepšení nebo přidáš svůj kód"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Psaní číslic"
@@ -764,3 +659,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Dělení kladných a záporných čísel"
+
+#~ msgid "Help"
+#~ msgstr "Nápověda"
+
+#~ msgid "More Options"
+#~ msgstr "Více možností"
+
+#~ msgid "Quit"
+#~ msgstr "Ukončit"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademie vesmírné matematiky"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Hra"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Vlastní hra"
+
+#~ msgid "Main menu"
+#~ msgstr "Hlavní menu"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Uprav soubor «options » ve své domovské složce,"
+
+#~ msgid "to create customized game!"
+#~ msgstr "abys mohl vytvořit vlastní hru!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Zmáčkni klávesu nebo klikni tlačítkem myši, abys začal hru"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Pokud chceš více informací, podívej se na README.txt"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "Info o projektu"
+
+#~ msgid "Credits"
+#~ msgstr "Poděkování"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hlavní menu"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath je svobodný software!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "I ty ho můžeš vylepšit, když oznámíš chyby, "
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "navrhneš vylepšení nebo přidáš svůj kód"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/de.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/de.po
===================================================================
--- tuxmath/branches/lan/po/de.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/de.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-05-02 16:08+0200\n"
"Last-Translator: Lars Vogdt <lars at linux-schulserver.de>\n"
"MIME-Version: 1.0\n"
@@ -201,335 +201,229 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Willkommen bei TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Deine Mission besteht darin, "
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "die Iglus der Pinguine vor den "
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "herabfallenden Kometen zu schützen."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Stoppe einen Kometen, indem du "
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "die Antwort auf das mathematische Problem"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "eingibst und die \"Leertaste\" oder \"Enter\" drückst. "
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Versuch es jetzt!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Guter Schuß!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Wenn ein Iglu von einem Kometen getroffen wird, "
-#: src/game.c:777
+#: src/game.c:1036
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "schmilzt es. Aber keine Angst, dem "
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "Pingiun geht es gut!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Sie einfach zu was passiert "
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Eine Taste zum starten drücken)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Beachte die Antwort"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "wenn es noch einmal getroffen wird, "
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "wird der Pinguin verschwinden."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Wenn fertig, bitte Taste drücken)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "Du kannst die kaputten Iglus reparieren"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "wenn du Bonus-Kometen aufhälst."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Knall ihn jetzt ab!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Super Arbeit!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Beende das Spiel zu jeder Zeit durch Drücken von "
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "'Esc' oder durch klicken auf das 'X'"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "in der oberen rechten Ecke."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Tu es jetzt - und dann spiele!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Ruhmeshalle"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Raumkadett"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Aufklärer"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Jäger"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ass"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "In Arbeit!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Dieser Bereich ist noch nicht fertig."
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Diskutiere über die Zukunft von TuxMath auf "
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Weitere Optionen"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Ende"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Math Command Trainings-Akademie"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Spiele Arcade Spiel"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Spiele angepasstes Spiel"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Hauptmenü"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Editiere die 'options' Datei in deinem Benutzerverzeichnis"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "um ein angepasstes Spiel zu erzeugen."
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Drücke eine Taste oder klicke mit der Maus um ein Spiel zu starten"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Lies die README.txt Datei für weitere Infrormationen"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstration"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Projekt Information"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Abspann"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Hauptmenü"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath ist frei und OpenSource!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Du kannst bei der Verbesserung helfen, wenn du Probleme "
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "meldest, Wünsche außerst oder Programmcode beisteuerst."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr ""
-"Diskutiere die Zukunft von TuxMath auf tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Zahlen eingeben"
@@ -764,6 +658,64 @@
msgid "Division of Positives and Negatives"
msgstr "Division von positiven und negativen Zahlen"
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgid "More Options"
+#~ msgstr "Weitere Optionen"
+
+#~ msgid "Quit"
+#~ msgstr "Ende"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Math Command Trainings-Akademie"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Spiele Arcade Spiel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Spiele angepasstes Spiel"
+
+#~ msgid "Main menu"
+#~ msgstr "Hauptmenü"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Editiere die 'options' Datei in deinem Benutzerverzeichnis"
+
+#~ msgid "to create customized game!"
+#~ msgstr "um ein angepasstes Spiel zu erzeugen."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Drücke eine Taste oder klicke mit der Maus um ein Spiel zu starten"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lies die README.txt Datei für weitere Infrormationen"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstration"
+
+#~ msgid "Project Info"
+#~ msgstr "Projekt Information"
+
+#~ msgid "Credits"
+#~ msgstr "Abspann"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hauptmenü"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath ist frei und OpenSource!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Du kannst bei der Verbesserung helfen, wenn du Probleme "
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "meldest, Wünsche außerst oder Programmcode beisteuerst."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr ""
+#~ "Diskutiere die Zukunft von TuxMath auf tuxmath-devel at lists.sourceforge.net"
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "die Iglus der Pinguine vor den "
Modified: tuxmath/branches/lan/po/en at boldquot.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/en at boldquot.po
===================================================================
--- tuxmath/branches/lan/po/en at boldquot.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/en at boldquot.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxmath 1.7.2\n"
+"Project-Id-Version: tuxmath 1.7.3\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
-"PO-Revision-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
+"PO-Revision-Date: 2009-09-21 19:35-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -252,40 +252,40 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr "For more information about Free Software and the GNU GPL, visit:"
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr "Use the arrow keys to turn or go forward. Aim at an asteroid,"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "type one of its factors, and press space or return"
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr "to split it into its factors. Rocks with prime numbers are destroyed!"
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "FRACTIONS: to win, you need destroy all the asteroids"
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
"type a number that can simplify the fraction, and press space or return"
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
@@ -293,296 +293,191 @@
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Welcome to TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Your mission is to save your"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "penguins' igloos from the"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "falling comets."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Stop a comet by typing"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "the answer to the math problem"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "and hitting ‘[1mspace[0m’ or 'enter'."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Try it now!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Good shot!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "If an igloo gets hit by a comet,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "it melts. But don't worry: the"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "penguin is OK!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Just watch what happens:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Press a key to start)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Notice the answer"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "If it gets hit again, the"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "penguin leaves."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Press a key when ready)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "You can fix the igloos"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "by stopping bonus comets."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Zap it now!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Great job!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Quit at any time by pressing"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "‘[1mEsc[0m’ or clicking the ‘[1mX[0m’"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "in the upper right corner."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Hall Of Fame"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Commando"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Factors"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Fractions"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr "You Are In The Hall of Fame!"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr "Enter Your Name:"
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr "Then %s\n"
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr "Who is playing first?"
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr "Enter your name:"
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr "Who is playing next?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr "How many rounds will you play?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr "Enter a number"
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Discuss the future of TuxMath at"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Play Alone"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Play With Friends"
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr "Factoroids!"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Help"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "More Options"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Quit"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Math Command Training Academy"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Math Command Fleet Missions"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Play Arcade Game"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Play Custom Game"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Main menu"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr "Score Sweep"
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr "Elimination"
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr "How many kids are playing?"
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr "(Between 2 and 4 players)"
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Edit ‘[1moptions[0m’ file in your home directory"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "to create customized game!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Press a key or click your mouse to start game."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "See README.txt for more information"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Project Info"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Credits"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Main Menu"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath is free and open-source!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "You can help make it better by reporting problems,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "suggesting improvements, or adding code."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Number Typing"
Modified: tuxmath/branches/lan/po/en at quot.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/en at quot.po
===================================================================
--- tuxmath/branches/lan/po/en at quot.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/en at quot.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxmath 1.7.2\n"
+"Project-Id-Version: tuxmath 1.7.3\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
-"PO-Revision-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
+"PO-Revision-Date: 2009-09-21 19:35-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -249,40 +249,40 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr "For more information about Free Software and the GNU GPL, visit:"
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr "Use the arrow keys to turn or go forward. Aim at an asteroid,"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "type one of its factors, and press space or return"
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr "to split it into its factors. Rocks with prime numbers are destroyed!"
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "FRACTIONS: to win, you need destroy all the asteroids"
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
"type a number that can simplify the fraction, and press space or return"
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
@@ -290,296 +290,191 @@
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Welcome to TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Your mission is to save your"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "penguins' igloos from the"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "falling comets."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Stop a comet by typing"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "the answer to the math problem"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "and hitting ‘space’ or 'enter'."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Try it now!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Good shot!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "If an igloo gets hit by a comet,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "it melts. But don't worry: the"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "penguin is OK!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Just watch what happens:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Press a key to start)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Notice the answer"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "If it gets hit again, the"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "penguin leaves."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Press a key when ready)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "You can fix the igloos"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "by stopping bonus comets."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Zap it now!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Great job!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Quit at any time by pressing"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "‘Esc’ or clicking the ‘X’"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "in the upper right corner."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Hall Of Fame"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Commando"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Factors"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Fractions"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr "You Are In The Hall of Fame!"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr "Enter Your Name:"
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr "Then %s\n"
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr "Who is playing first?"
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr "Enter your name:"
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr "Who is playing next?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr "How many rounds will you play?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr "Enter a number"
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Discuss the future of TuxMath at"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Play Alone"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Play With Friends"
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr "Factoroids!"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Help"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "More Options"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Quit"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Math Command Training Academy"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Math Command Fleet Missions"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Play Arcade Game"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Play Custom Game"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Main menu"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr "Score Sweep"
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr "Elimination"
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr "How many kids are playing?"
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr "(Between 2 and 4 players)"
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Edit ‘options’ file in your home directory"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "to create customized game!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Press a key or click your mouse to start game."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "See README.txt for more information"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Project Info"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Credits"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Main Menu"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath is free and open-source!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "You can help make it better by reporting problems,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "suggesting improvements, or adding code."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Number Typing"
Modified: tuxmath/branches/lan/po/en_GB.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/en_GB.po
===================================================================
--- tuxmath/branches/lan/po/en_GB.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/en_GB.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2009-06-24 20:33+0100\n"
"Last-Translator: Caroline Ford <caroline.ford.work at googlemail.com>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -24,10 +24,7 @@
msgid "Round"
msgstr "Round"
-#: src/campaign.c:115
-#: src/campaign.c:127
-#: src/campaign.c:148
-#: src/campaign.c:159
+#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
msgid "-[Esc] to skip"
msgstr "-[Esc] to skip"
@@ -40,8 +37,14 @@
msgstr "I'm so glad you've come!"
#: src/campaign.c:120
-msgid "The penguins need your help! Comets are falling from the sky, and are melting the penguins' igloos. To save their homes, we need you to find the secret code that will zap each comet."
-msgstr "The penguins need your help! Comets are falling from the sky, and are melting the penguins' igloos. To save their homes, we need you to find the secret code that will zap each comet."
+msgid ""
+"The penguins need your help! Comets are falling from the sky, and are "
+"melting the penguins' igloos. To save their homes, we need you to find the "
+"secret code that will zap each comet."
+msgstr ""
+"The penguins need your help! Comets are falling from the sky, and are "
+"melting the penguins' igloos. To save their homes, we need you to find the "
+"secret code that will zap each comet."
#: src/campaign.c:122
msgid "Do your best!"
@@ -52,12 +55,20 @@
msgstr "Mission Two: Smart Scout"
#: src/campaign.c:130
-msgid "Great job! Since you saved the penguins' homes, we are promoting you to Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr "Great job! Since you saved the penguins' homes, we are promoting you to Scout. Scouts are good for keeping an eye out for trouble..."
+msgid ""
+"Great job! Since you saved the penguins' homes, we are promoting you to "
+"Scout. Scouts are good for keeping an eye out for trouble..."
+msgstr ""
+"Great job! Since you saved the penguins' homes, we are promoting you to "
+"Scout. Scouts are good for keeping an eye out for trouble..."
#: src/campaign.c:132
-msgid "...like what's happening right now! The TakeAways have come, and they're sending new, trickier comets against the penguins!"
-msgstr "...like what's happening right now! The TakeAways have come, and they're sending new, trickier comets against the penguins!"
+msgid ""
+"...like what's happening right now! The TakeAways have come, and they're "
+"sending new, trickier comets against the penguins!"
+msgstr ""
+"...like what's happening right now! The TakeAways have come, and they're "
+"sending new, trickier comets against the penguins!"
#: src/campaign.c:133
msgid "But you can save them!"
@@ -68,24 +79,42 @@
msgstr "Mission Three: Royal Ranger"
#: src/campaign.c:141
-msgid "You've done it again! The Penguin Emperor has chosen you to join his team of Rangers that help protect the city. We're sending you there now..."
-msgstr "You've done it again! The Penguin Emperor has chosen you to join his team of Rangers that help protect the city. We're sending you there now..."
+msgid ""
+"You've done it again! The Penguin Emperor has chosen you to join his team of "
+"Rangers that help protect the city. We're sending you there now..."
+msgstr ""
+"You've done it again! The Penguin Emperor has chosen you to join his team of "
+"Rangers that help protect the city. We're sending you there now..."
#: src/campaign.c:143
-msgid "...oh no! Now the Emperor himself is under attack, from new types of comets: these problems are multiplying! To fight these, you need great skill. We think you can do it. Join the Rangers and help save the city!"
-msgstr "...oh no! Now the Emperor himself is under attack, from new types of comets: these problems are multiplying! To fight these, you need great skill. We think you can do it. Join the Rangers and help save the city!"
+msgid ""
+"...oh no! Now the Emperor himself is under attack, from new types of comets: "
+"these problems are multiplying! To fight these, you need great skill. We "
+"think you can do it. Join the Rangers and help save the city!"
+msgstr ""
+"...oh no! Now the Emperor himself is under attack, from new types of comets: "
+"these problems are multiplying! To fight these, you need great skill. We "
+"think you can do it. Join the Rangers and help save the city!"
#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "Mission Four: Imperial Ace"
#: src/campaign.c:151
-msgid "You did it! The Emperor wants to thank you in person. We are taking you to his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr "You did it! The Emperor wants to thank you in person. We are taking you to his ice palace for a great honor: you will become the Imperial Ace!"
+msgid ""
+"You did it! The Emperor wants to thank you in person. We are taking you to "
+"his ice palace for a great honor: you will become the Imperial Ace!"
+msgstr ""
+"You did it! The Emperor wants to thank you in person. We are taking you to "
+"his ice palace for a great honor: you will become the Imperial Ace!"
#: src/campaign.c:153
-msgid "But right in the middle of the ceremony, a new attack from the land of Division starts!"
-msgstr "But right in the middle of the ceremony, a new attack from the land of Division starts!"
+msgid ""
+"But right in the middle of the ceremony, a new attack from the land of "
+"Division starts!"
+msgstr ""
+"But right in the middle of the ceremony, a new attack from the land of "
+"Division starts!"
#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
@@ -96,8 +125,16 @@
msgstr "Final Mission: Computing Commando"
#: src/campaign.c:162
-msgid "Penguin scientists have learned that all these attacks are coming from a secret base, and they need you to go fight the final battle. They also give you this clue: first do multiplication and division, and then do addition and subtraction."
-msgstr "Penguin scientists have learned that all these attacks are coming from a secret base, and they need you to go fight the final battle. They also give you this clue: first do multiplication and division, and then do addition and subtraction."
+msgid ""
+"Penguin scientists have learned that all these attacks are coming from a "
+"secret base, and they need you to go fight the final battle. They also give "
+"you this clue: first do multiplication and division, and then do addition "
+"and subtraction."
+msgstr ""
+"Penguin scientists have learned that all these attacks are coming from a "
+"secret base, and they need you to go fight the final battle. They also give "
+"you this clue: first do multiplication and division, and then do addition "
+"and subtraction."
#: src/campaign.c:163
msgid "I hope that hint helps!"
@@ -172,357 +209,252 @@
msgstr "WEBSITE"
#: src/credits.c:104
-msgid "TuxMath is Free Software licensed under the GNU General Public License (GPL). As such, you are specifically granted the rights that are usually denied to users of proprietary software."
-msgstr "TuxMath is Free Software licensed under the GNU General Public License (GPL). As such, you are specifically granted the rights that are usually denied to users of proprietary software."
+msgid ""
+"TuxMath is Free Software licensed under the GNU General Public License "
+"(GPL). As such, you are specifically granted the rights that are usually "
+"denied to users of proprietary software."
+msgstr ""
+"TuxMath is Free Software licensed under the GNU General Public License "
+"(GPL). As such, you are specifically granted the rights that are usually "
+"denied to users of proprietary software."
#: src/credits.c:106
-msgid "These rights include the freedom to study, copy, modify, and redistribute the program."
-msgstr "These rights include the freedom to study, copy, modify, and redistribute the program."
+msgid ""
+"These rights include the freedom to study, copy, modify, and redistribute "
+"the program."
+msgstr ""
+"These rights include the freedom to study, copy, modify, and redistribute "
+"the program."
#: src/credits.c:108
-msgid "A full copy of the GPL is included with the documenation for this program."
-msgstr "A full copy of the GPL is included with the documenation for this program."
+#, fuzzy
+msgid ""
+"A full copy of the GPL is included with the documentation for this program."
+msgstr ""
+"A full copy of the GPL is included with the documenation for this program."
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr "For more information about Free Software and the GNU GPL, visit:"
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
-#: src/factoroids.c:559
-#: src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr "Use the arrow keys to turn or go forward. Aim at an asteroid,"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "type one of its factors, and press space or return"
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr "to split it into its factors. Rocks with prime numbers are destroyed!"
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "FRACTIONS: to win, you need destroy all the asteroids"
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
-msgstr "type a number that can simplify the fraction, and press space or return"
+msgstr ""
+"type a number that can simplify the fraction, and press space or return"
-#: src/factoroids.c:572
-msgid "to split it. Destroy fractions that can not be further simplified in a single shot!"
-msgstr "to split it. Destroy fractions that can not be further simplified in a single shot!"
+#: src/factoroids.c:566
+msgid ""
+"to split it. Destroy fractions that can not be further simplified in a "
+"single shot!"
+msgstr ""
+"to split it. Destroy fractions that can not be further simplified in a "
+"single shot!"
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Welcome to TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Your mission is to save your"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "penguins’ igloos from the"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "falling comets."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Stop a comet by typing"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "the answer to the maths problem"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "and hitting ‘space’ or ‘enter’."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Try it now!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Good shot!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "If an igloo gets hit by a comet,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "it melts. But don’t worry: the"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "penguin is OK!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Just watch what happens:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Press a key to start)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Notice the answer"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "If it gets hit again, the"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "penguin leaves."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Press a key when ready)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "You can fix the igloos"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "by stopping bonus comets."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Zap it now!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Great job!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Quit at any time by pressing"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "‘Esc’ or clicking the ‘X’"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "in the upper right corner."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
-#: src/highscore.c:212
-#: src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Hall Of Fame"
-#: src/highscore.c:232
-#: src/highscore.c:253
-#: src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/highscore.c:235
-#: src/titlescreen.c:786
-#: src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238
-#: src/titlescreen.c:787
-#: src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:241
-#: src/titlescreen.c:788
-#: src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:244
-#: src/titlescreen.c:789
-#: src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Commando"
-#: src/highscore.c:247
-#: src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Factors"
-#: src/highscore.c:250
-#: src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Fractions"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr "You Are In The Hall of Fame!"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr "Enter Your Name:"
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr "Who is playing first?"
-#: src/multiplayer.c:244
-#: src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr "Enter your name:"
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr "Who is playing next?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr "How many rounds will you play?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr "Enter a number"
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Discuss the future of TuxMath at"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Play Alone"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Play With Friends"
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr "Factoroids!"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Help"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "More Options"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Quit"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Math Command Training Academy"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Math Command Fleet Missions"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Play Arcade Game"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Play Custom Game"
-
-#: src/titlescreen.c:730
-#: src/titlescreen.c:781
-#: src/titlescreen.c:790
-#: src/titlescreen.c:850
-#: src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Main menu"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr "Score Sweep"
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr "Elimination"
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr "How many kids are playing?"
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr "(Between 2 and 4 players)"
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Edit ‘options’ file in your home directory"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "to create customised game!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Press a key or click your mouse to start game."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "See README.txt for more information"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Project Info"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Credits"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Main Menu"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath is free and open-source!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "You can help make it better by reporting problems,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "suggesting improvements, or adding code."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Number Typing"
@@ -755,6 +687,87 @@
msgid "Division of Positives and Negatives"
msgstr "Division of Positives and Negatives"
+#~ msgid "Play Alone"
+#~ msgstr "Play Alone"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Play With Friends"
+
+#~ msgid "Factoroids!"
+#~ msgstr "Factoroids!"
+
+#~ msgid "Help"
+#~ msgstr "Help"
+
+#~ msgid "More Options"
+#~ msgstr "More Options"
+
+#~ msgid "Quit"
+#~ msgstr "Quit"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Math Command Training Academy"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Math Command Fleet Missions"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Play Arcade Game"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Play Custom Game"
+
+#~ msgid "Main menu"
+#~ msgstr "Main menu"
+
+#~ msgid "Score Sweep"
+#~ msgstr "Score Sweep"
+
+#~ msgid "Elimination"
+#~ msgstr "Elimination"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "How many kids are playing?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(Between 2 and 4 players)"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edit ‘options’ file in your home directory"
+
+#~ msgid "to create customized game!"
+#~ msgstr "to create customised game!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Press a key or click your mouse to start game."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "See README.txt for more information"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "Project Info"
+
+#~ msgid "Credits"
+#~ msgstr "Credits"
+
+#~ msgid "Main Menu"
+#~ msgstr "Main Menu"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath is free and open-source!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "You can help make it better by reporting problems,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "suggesting improvements, or adding code."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "penguins’ igloos from the"
Modified: tuxmath/branches/lan/po/es.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/es.po
===================================================================
--- tuxmath/branches/lan/po/es.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/es.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 1.6.2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-04-26\n"
"Last-Translator: Angela Ruiz <angieruiz211 at hotmail.com>\n"
"Language-Team: espanol <LL at li.org>\n"
@@ -202,336 +202,229 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "bien benido a tuxmath"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "tu mision es salvar"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "los igloos de tus pinguinos"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "de los cometas que caen"
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "para parar el cometa"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "debes teclar la respuesta correcta al problema matematico"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "y oprimir la decla de espacio"
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "tratalo ahora"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "buen tiro"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "si uno de los igloos es derramado por el cometa"
-#: src/game.c:777
+#: src/game.c:1036
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "se derritira, pero no te preocupes"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "que el pinguino estara asalvo"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "observa lo que sucede"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "aprieta una tecla para empezar"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "nota la respuesta"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "si el igloo es pegado por el cometa de nuevo "
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "el pinguino se va"
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "aprieta una tecla cuando estes listo "
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr " tu puedes areglar los igloos"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr " si logras parrar a los cometas de bono"
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "disparale ahora"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "bien hecho"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "si quieres parrarel juego en cualquier momento"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "lo puedes hacer oprimiendo la tecla de ESC or la x en la pantalla"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "en la equinq derecha"
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "haclo ahora y luego juega"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "sala de fama"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "cadete espacial"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "escout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "guardador"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "ace"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr " trabajo bajo progresso"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "esta opcion no funciona todavia"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "para discutir el futuro de TuxMath puedes ir a"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "ayda"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "mas opciones"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "terminar"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Academia de entrenamiento de matematicas"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Juega el juego de arcade"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "juega el juego hecho especialmente"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "menu principal"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "editar opciones del archivo del directorio principal"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "para crear un juego especialmente"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "aprieta un tecla y con tu mouse oprime la opcion de empesar el juego"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "ver README.txt para mas informacion"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "demostracion"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "informacion del projecto"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "creditos"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "menu principal"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath es gratis y es una opcion abierta"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr ""
-"puedes hacer que el programa funcione mejor si reportas problems con el "
-"programa"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "sugestiones para mejorar el programa o para anadir un codigo"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "discute el futuro en tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "tegldo del numero"
@@ -766,6 +659,66 @@
msgid "Division of Positives and Negatives"
msgstr "division de numeros positivos y negativos"
+#~ msgid "Help"
+#~ msgstr "ayda"
+
+#~ msgid "More Options"
+#~ msgstr "mas opciones"
+
+#~ msgid "Quit"
+#~ msgstr "terminar"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Academia de entrenamiento de matematicas"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Juega el juego de arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "juega el juego hecho especialmente"
+
+#~ msgid "Main menu"
+#~ msgstr "menu principal"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "editar opciones del archivo del directorio principal"
+
+#~ msgid "to create customized game!"
+#~ msgstr "para crear un juego especialmente"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr ""
+#~ "aprieta un tecla y con tu mouse oprime la opcion de empesar el juego"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "ver README.txt para mas informacion"
+
+#~ msgid "Demo"
+#~ msgstr "demostracion"
+
+#~ msgid "Project Info"
+#~ msgstr "informacion del projecto"
+
+#~ msgid "Credits"
+#~ msgstr "creditos"
+
+#~ msgid "Main Menu"
+#~ msgstr "menu principal"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath es gratis y es una opcion abierta"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr ""
+#~ "puedes hacer que el programa funcione mejor si reportas problems con el "
+#~ "programa"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "sugestiones para mejorar el programa o para anadir un codigo"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "discute el futuro en tuxmath-devel at lists.sourceforge.net"
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "los igloos de tus pinguinos"
Modified: tuxmath/branches/lan/po/fi.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/fi.po
===================================================================
--- tuxmath/branches/lan/po/fi.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/fi.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-03-22 06:59+0000\n"
"Last-Translator: Miika Metsälä <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -206,336 +206,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Parhaat tulokset"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Astronautti"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Tiedustelija"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Jousimies"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr ""
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Työn alla!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Tämä ominaisuus ei ole vielä valmis"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "O_hje"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Lisää asetuksia"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Lopeta"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Pelaa arcade-peliä"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr ""
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Päävalikko"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Muokkaa 'options' tiedostoa kotikansiossasi"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "tehdäksesi kustomoidun pelin!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-"Paina mitä tahansa näppäintä tai napsauta hiirellä aloittaaksesi pelin."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Katso README.txt saadaksesi lisätietoja"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr ""
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Tietoa projektista"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Tekijät"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Päävalikko"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath on vapaa ja avointa koodia!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Voit auttaa meitä tekemään sen paremmaksi ilmoittamalla ongelmista,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "ehdottamalla parannuksista, tai lisäämällä koodia."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr ""
-"Keskustele tuxmathin tulevaisuudesta osoitteesta tuxmath-devel at lists."
-"sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Numeroiden kirjoitus"
@@ -769,3 +661,54 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Positiivisten ja negatiivisten lukujen jakolasku"
+
+#~ msgid "Help"
+#~ msgstr "O_hje"
+
+#~ msgid "More Options"
+#~ msgstr "Lisää asetuksia"
+
+#~ msgid "Quit"
+#~ msgstr "Lopeta"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Pelaa arcade-peliä"
+
+#~ msgid "Main menu"
+#~ msgstr "Päävalikko"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Muokkaa 'options' tiedostoa kotikansiossasi"
+
+#~ msgid "to create customized game!"
+#~ msgstr "tehdäksesi kustomoidun pelin!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr ""
+#~ "Paina mitä tahansa näppäintä tai napsauta hiirellä aloittaaksesi pelin."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Katso README.txt saadaksesi lisätietoja"
+
+#~ msgid "Project Info"
+#~ msgstr "Tietoa projektista"
+
+#~ msgid "Credits"
+#~ msgstr "Tekijät"
+
+#~ msgid "Main Menu"
+#~ msgstr "Päävalikko"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath on vapaa ja avointa koodia!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Voit auttaa meitä tekemään sen paremmaksi ilmoittamalla ongelmista,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "ehdottamalla parannuksista, tai lisäämällä koodia."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr ""
+#~ "Keskustele tuxmathin tulevaisuudesta osoitteesta tuxmath-devel at lists."
+#~ "sourceforge.net"
Modified: tuxmath/branches/lan/po/fr.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/fr.po
===================================================================
--- tuxmath/branches/lan/po/fr.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/fr.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 1.5.8\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Grumeau Rémi <remi at beosfrance.com>\n"
"Language-Team: Dutch <LL at li.org>\n"
@@ -202,333 +202,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Tableau des scores"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Cadet de l'espace"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "As"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Chargement"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Cette option n'est pas encore disponible"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Participer au futur de TuxMath au"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Aide"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Plus d'options"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Quitter"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Ecole d'entrainement au Math"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Jouer en mode arcade"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Jouer en mode personnalisé"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Menu principal"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Editer le fichier 'option' dans le dossier home"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "pour créer une partie personnalisée !"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Appuyez sur une touche ou cliquez pour commencer"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Lisez README.txt pour plus d'informations"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "A propos"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Crédits"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Menu principal"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath est gratuit et open-source!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Participez à l'amélioration du jeu en nous signalant des problemes,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "vos suggestions, ou en développement."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Parlons-en sur tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Taper un nombre"
@@ -762,3 +657,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Division de positifs et négatifs"
+
+#~ msgid "Help"
+#~ msgstr "Aide"
+
+#~ msgid "More Options"
+#~ msgstr "Plus d'options"
+
+#~ msgid "Quit"
+#~ msgstr "Quitter"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Ecole d'entrainement au Math"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Jouer en mode arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Jouer en mode personnalisé"
+
+#~ msgid "Main menu"
+#~ msgstr "Menu principal"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Editer le fichier 'option' dans le dossier home"
+
+#~ msgid "to create customized game!"
+#~ msgstr "pour créer une partie personnalisée !"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Appuyez sur une touche ou cliquez pour commencer"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lisez README.txt pour plus d'informations"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "A propos"
+
+#~ msgid "Credits"
+#~ msgstr "Crédits"
+
+#~ msgid "Main Menu"
+#~ msgstr "Menu principal"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath est gratuit et open-source!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Participez à l'amélioration du jeu en nous signalant des problemes,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "vos suggestions, ou en développement."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Parlons-en sur tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/ga.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/ga.po
===================================================================
--- tuxmath/branches/lan/po/ga.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/ga.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-07-13 23:16-0000\n"
"Last-Translator: Seanán à CoistÃn <seananoc at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -201,333 +201,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Fáilte go TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "An cúram atá agat ná"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "Ãoglúanna do phiongain a chosaint"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "ó na réalta mhongach atá ag titim anuas."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Stad réalt mhongach trà an"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "freagra don ceist mata a chlóscrÃobh"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "agus brúigh 'bearna' nó 'isteach'."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Imir anois é!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Amas iontach!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Má bhuaileann réalt mhongach Ãoglú,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "leáitear é. Ach ná bà buartha:"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "tá an phiogain togha!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Féach cad a tharlaÃonn:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Brúigh cnaipe chun tosú)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Tabhair faoi deara an freagra"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "Má bhuailfà arÃs é,"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "fágann an piongain."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Brúigh cnaipe ar bith nuair atá tú réidh)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "Is fédir na hioglúanna a dheisiú"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "trà réalta mhongach breise a stadadh."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Buail anois é!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Maith thú!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Scoir ag am ar bith trà brúigh"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "'Esc' nó brúigh an 'X'"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "sa chúinne uachtarach ar dheis."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Déan anois é, agus ansin imir!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Réim na gCuradh"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Glasearcach"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Gasóg"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "RánaÃ"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Curadh"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Obair Idir Lámha!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "NÃl an ghné seo réidh fós"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Plé todhchaà TuzMath ag"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Cabhair"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Tuilleadh Roghanna"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Scoir"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Lárionad Oiliúna an Cheannais Mata"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Imir an Gnáthchluiche"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Imir Cluiche Saincheaptha"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "An PrÃomh Roghchlár"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Cuir in eagar an comhad 'roghanna' i do chomhadlann baile"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "chun cluiche saincheaptha a chruthú!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Brúigh cnaipe nó brúigh do luchóg chun an cluiche a thosú."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Féach ar README.txt le haghaidh breis eolas"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Taispeántas"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Faisnéis an Tionscadail"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "BuÃochas le"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "An PrÃomh Roghchlár"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "Tá TuxMath ar fáil saor in aisce agus le foinse oscailte!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Is féidir leat cuidiú é a fheabhsú trà fadhbanna a fhógrú,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "feabhsaithe a mholadh, nó trà cód a chur leis."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Plé an todhchaà ag tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "ClóscrÃobh Uimhreacha"
@@ -762,6 +657,63 @@
msgid "Division of Positives and Negatives"
msgstr "Roinnt Deimhneacha agus Diúltacha"
+#~ msgid "Help"
+#~ msgstr "Cabhair"
+
+#~ msgid "More Options"
+#~ msgstr "Tuilleadh Roghanna"
+
+#~ msgid "Quit"
+#~ msgstr "Scoir"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Lárionad Oiliúna an Cheannais Mata"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Imir an Gnáthchluiche"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Imir Cluiche Saincheaptha"
+
+#~ msgid "Main menu"
+#~ msgstr "An PrÃomh Roghchlár"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Cuir in eagar an comhad 'roghanna' i do chomhadlann baile"
+
+#~ msgid "to create customized game!"
+#~ msgstr "chun cluiche saincheaptha a chruthú!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Brúigh cnaipe nó brúigh do luchóg chun an cluiche a thosú."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Féach ar README.txt le haghaidh breis eolas"
+
+#~ msgid "Demo"
+#~ msgstr "Taispeántas"
+
+#~ msgid "Project Info"
+#~ msgstr "Faisnéis an Tionscadail"
+
+#~ msgid "Credits"
+#~ msgstr "BuÃochas le"
+
+#~ msgid "Main Menu"
+#~ msgstr "An PrÃomh Roghchlár"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "Tá TuxMath ar fáil saor in aisce agus le foinse oscailte!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Is féidir leat cuidiú é a fheabhsú trà fadhbanna a fhógrú,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "feabhsaithe a mholadh, nó trà cód a chur leis."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Plé an todhchaà ag tuxmath-devel at lists.sourceforge.net"
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "Ãoglúanna do phiongain a chosaint"
Modified: tuxmath/branches/lan/po/he.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/he.po
===================================================================
--- tuxmath/branches/lan/po/he.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/he.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2009-01-17 10:32+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew <sh.yaron at gmail.com>\n"
@@ -210,333 +210,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "ברוכים הבאים לטאקסמטיקה!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "מטרתך היא להציל את"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "הפינגווינים שלך מפני"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "הכוכבים הנופלים."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "תוכל להדוף כוכב על ידי"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "הקלדת התשובה לבעיה המתמטית"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "ולחיצה על 'רווח' או 'Enter'."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "נסה זאת כעת!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "פגיעה יפה!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "אם פוגע כוכב באיגלו,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "האיגלו נמס. אך אל דאגה:"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "הפינגווינים בסדר גמור!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "פשוט שים לב מה קורה:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(לחץ על מקש להתחלה)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "שים לב לתשובה"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "אם האיגלו נפגע שוב,"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "הפינגווין עוזב."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(לחץ על מקש כשאתה מוכן)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "תוכלו לתקן את האיגלואים"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "על ידי הדיפת כוכבי בונוס."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "תירה בו כעת!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "עבודה יפה!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "תוכל לצאת בכל על על ידי"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "לחיצה על 'Esc' או על ה־'X'"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "בפינה השמאלית העליונה."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "עשה זאת כעת, שחק לאחר מכן!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "היכל התהילה"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "טירון"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "תלמיד"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "מתמצא"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "תותח"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "עבודה בתהליכים!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "תכונה זו אינה מוכנה עדיין"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "דון בעתידה של טאקסמתיקה בקבוצת הדיון"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "עזרה"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "אפשרויות נוספות"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "יציאה"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "האקדמיה לאימון פעולות מתמטיות"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "שחק משחק ארקייד"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "שחק משחק מותאם"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "תפריט ראשי"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "ערוך את קובץ האפשרויות ('options') בתיקיית הבית שלך"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "כדי ליצור משחק מותאם אישית!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "לחץ על מקש במקלדת או בעכבר כדי להתחיל במשחק."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "עיין בקובץ README.TXT למידע נוסף"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "הדגמה"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "מידע על המיזם"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "תודות"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "תפריט ראשי"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "טאקסמטיקה הינה חופשית ובעלת קוד פתוח!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "תוכל לעזור לנו לשפר אותו על ידי דיווח תקלות,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "הצעת שיפורים או הוספת קוד."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "דון בעתיד טאקסמטיקה ברשימת הדיוור tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "הקלדת מספרים"
@@ -771,6 +666,64 @@
msgid "Division of Positives and Negatives"
msgstr "חלוקת מספרים חיוביים בשליליים"
+#~ msgid "Help"
+#~ msgstr "עזרה"
+
+#~ msgid "More Options"
+#~ msgstr "אפשרויות נוספות"
+
+#~ msgid "Quit"
+#~ msgstr "יציאה"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "האקדמיה לאימון פעולות מתמטיות"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "שחק משחק ארקייד"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "שחק משחק מותאם"
+
+#~ msgid "Main menu"
+#~ msgstr "תפריט ראשי"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "ערוך את קובץ האפשרויות ('options') בתיקיית הבית שלך"
+
+#~ msgid "to create customized game!"
+#~ msgstr "כדי ליצור משחק מותאם אישית!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "לחץ על מקש במקלדת או בעכבר כדי להתחיל במשחק."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "עיין בקובץ README.TXT למידע נוסף"
+
+#~ msgid "Demo"
+#~ msgstr "הדגמה"
+
+#~ msgid "Project Info"
+#~ msgstr "מידע על המיזם"
+
+#~ msgid "Credits"
+#~ msgstr "תודות"
+
+#~ msgid "Main Menu"
+#~ msgstr "תפריט ראשי"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "טאקסמטיקה הינה חופשית ובעלת קוד פתוח!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "תוכל לעזור לנו לשפר אותו על ידי דיווח תקלות,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "הצעת שיפורים או הוספת קוד."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr ""
+#~ "דון בעתיד טאקסמטיקה ברשימת הדיוור tuxmath-devel at lists.sourceforge.net"
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "הפינגווינים שלך מפני"
Modified: tuxmath/branches/lan/po/hu.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/hu.po
===================================================================
--- tuxmath/branches/lan/po/hu.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/hu.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-02-11 21:56+0100\n"
"Last-Translator: Miklos Merenyi <mermik at freemail.hu>\n"
"Language-Team: LANGUAGE <HU at li.org>\n"
@@ -201,334 +201,229 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Üdvözöllek a TuxMath-ban!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Küldetésed a pingvinek"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "jégkunyhóinak megvédése"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "az aláhulló meteoritoktól."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Gépeld be a matematikai feladat "
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "eredményét, és üss Enter-t"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "a meteor megállításához!"
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Próbáld meg most!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Szép lövés!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Ha egy jégkunyhót eltalál"
-#: src/game.c:777
+#: src/game.c:1036
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "egy meteor, megolvad, de a"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "pingvinnek még nem lesz baja!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Nézd, mi történik:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Nyomj meg egy gombot!)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Látod a választ?"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "A második találat után"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "a pingvin elmenekül."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Nyomj meg egy gombot!)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "A jégkunyhókat a bónusz meteorok"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "szétlövésével javíthatod meg."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Adj neki!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Szép munka!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Akármikor kiléphetsz az 'ESC'"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "gomb megnyomásával, vagy "
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "az 'X'-re való kattintással."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Lépj ki, és kezdd a játékot!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Dicsőséglista"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Újonc"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Felderítő"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Járőrparancsnok"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Mesterpilóta"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Fejlesztés alatt."
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Ez a funkció még nem működik"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "A TuxMath jövőjét itt vitathatod meg:"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Segítség"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Egyebek"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Kilépés"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Matek-Parancsnok Képző Akadémia"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Beépített játékok"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Testreszabott játékok"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Főmenü"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "A home-könyvtáradban levő 'options' fájl "
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "szerkesztésével készíthetsz testreszabott játékot."
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Nyomj le egy billentyűt vagy egy egérgombot a kezdéshez!"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "További részletek a README.txt fájlban."
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Projekt információ"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Köszönetnyilvánítás"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Főmenü"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "A TuxMath ingyenes és nyílt forráskódú!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Te is segíthetsz még jobbá tenni az észlelt hibák bejelentésével,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "továbbfejlesztési ötletekkel, vagy programkóddal."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Levelezőlista (angol nyelvű): tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Számok gépelése"
@@ -763,6 +658,63 @@
msgid "Division of Positives and Negatives"
msgstr "Pozitív és negatív számok osztása"
+#~ msgid "Help"
+#~ msgstr "Segítség"
+
+#~ msgid "More Options"
+#~ msgstr "Egyebek"
+
+#~ msgid "Quit"
+#~ msgstr "Kilépés"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Matek-Parancsnok Képző Akadémia"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Beépített játékok"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Testreszabott játékok"
+
+#~ msgid "Main menu"
+#~ msgstr "Főmenü"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "A home-könyvtáradban levő 'options' fájl "
+
+#~ msgid "to create customized game!"
+#~ msgstr "szerkesztésével készíthetsz testreszabott játékot."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Nyomj le egy billentyűt vagy egy egérgombot a kezdéshez!"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "További részletek a README.txt fájlban."
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "Projekt információ"
+
+#~ msgid "Credits"
+#~ msgstr "Köszönetnyilvánítás"
+
+#~ msgid "Main Menu"
+#~ msgstr "Főmenü"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "A TuxMath ingyenes és nyílt forráskódú!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Te is segíthetsz még jobbá tenni az észlelt hibák bejelentésével,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "továbbfejlesztési ötletekkel, vagy programkóddal."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Levelezőlista (angol nyelvű): tuxmath-devel at lists.sourceforge.net"
+
#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "jégkunyhóinak megvédése"
Modified: tuxmath/branches/lan/po/it.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/it.po
===================================================================
--- tuxmath/branches/lan/po/it.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/it.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-03-01 11:49+0000\n"
"Last-Translator: Giovanni Condello <condellog at gmail.com>\n"
"Language-Team: Italian <it at li.org>\n"
@@ -209,334 +209,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Galleria dei campioni"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Cadetto spaziale"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Asso"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Lavori in corso!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Questa caratteristica non è ancora pronta."
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Discuti del futuro di TuxMatch su"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Aiuto"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Altre opzioni"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Esci"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr ""
-
-#: src/titlescreen.c:729
-#, fuzzy
-msgid "Play Custom Game"
-msgstr "Gioca una partita personalizzata"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Menu principale"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Modifica il file 'options' nella tua cartella home"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "per creare una partita personalizzata!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Premi un tasto o fai click con il mouse per iniziare il gioco."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Vedi il file README.txt per maggiori informazioni"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Informazioni sul progetto"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Ringraziamenti"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Menu principale"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath è gratuito ed open-source!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Puoi aiutare a migliorarlo riportando i problemi,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "proponendo miglioramenti o con l'aggiunta di codice."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Discuti del futuro su tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr ""
@@ -772,3 +666,55 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Divisione di numeri positivi e negativi"
+
+#~ msgid "Help"
+#~ msgstr "Aiuto"
+
+#~ msgid "More Options"
+#~ msgstr "Altre opzioni"
+
+#~ msgid "Quit"
+#~ msgstr "Esci"
+
+#, fuzzy
+#~ msgid "Play Custom Game"
+#~ msgstr "Gioca una partita personalizzata"
+
+#~ msgid "Main menu"
+#~ msgstr "Menu principale"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Modifica il file 'options' nella tua cartella home"
+
+#~ msgid "to create customized game!"
+#~ msgstr "per creare una partita personalizzata!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Premi un tasto o fai click con il mouse per iniziare il gioco."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Vedi il file README.txt per maggiori informazioni"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "Informazioni sul progetto"
+
+#~ msgid "Credits"
+#~ msgstr "Ringraziamenti"
+
+#~ msgid "Main Menu"
+#~ msgstr "Menu principale"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath è gratuito ed open-source!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Puoi aiutare a migliorarlo riportando i problemi,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "proponendo miglioramenti o con l'aggiunta di codice."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Discuti del futuro su tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/ja.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/ja.po
===================================================================
--- tuxmath/branches/lan/po/ja.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/ja.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-03-05 15:29+0000\n"
"Last-Translator: CMasami <Unknown>\n"
"Language-Team: Japanese <ja at li.org>\n"
@@ -207,333 +207,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "殿堂入り"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "訓練生"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "上等兵"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "特殊部隊"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "超能力者"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "作業中!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "この機能はまだありません"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "TuxMathについての要望は"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "ヘルプ"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "他のオプション"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "終了"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "計算戦隊訓練学校"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "一般訓練開始"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "特殊訓練開始"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "メインメニュー"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "ホーム・ディレクトリの'optoins'ファイルを編集して"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "オリジナルのゲームを作ろう!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "キーを押すかクリックしてゲーム開始"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "詳しい説明はREADME.txtを見てください"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "デモ"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "プロジェクト情報"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "クレジット"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "メインメニュー"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath は自由でオープンソースです!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "問題点を報告してゲームを改善することができます。"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "新機能の提案や、コードの追加も歓迎します。"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "連絡先はこちら tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "数字を入力する"
@@ -767,3 +662,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "正の数と負の数の割り算"
+
+#~ msgid "Help"
+#~ msgstr "ヘルプ"
+
+#~ msgid "More Options"
+#~ msgstr "他のオプション"
+
+#~ msgid "Quit"
+#~ msgstr "終了"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "計算戦隊訓練学校"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "一般訓練開始"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "特殊訓練開始"
+
+#~ msgid "Main menu"
+#~ msgstr "メインメニュー"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "ホーム・ディレクトリの'optoins'ファイルを編集して"
+
+#~ msgid "to create customized game!"
+#~ msgstr "オリジナルのゲームを作ろう!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "キーを押すかクリックしてゲーム開始"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "詳しい説明はREADME.txtを見てください"
+
+#~ msgid "Demo"
+#~ msgstr "デモ"
+
+#~ msgid "Project Info"
+#~ msgstr "プロジェクト情報"
+
+#~ msgid "Credits"
+#~ msgstr "クレジット"
+
+#~ msgid "Main Menu"
+#~ msgstr "メインメニュー"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath は自由でオープンソースです!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "問題点を報告してゲームを改善することができます。"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "新機能の提案や、コードの追加も歓迎します。"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "連絡先はこちら tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/nb.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/nb.po
===================================================================
--- tuxmath/branches/lan/po/nb.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/nb.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-09-21 19:08+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -204,334 +204,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Velkommen til TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Oppdraget ditt er å redde"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "igloene til pingvinene fra"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "kometer fra verdensrommet."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Du kan stoppe en komet ved"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "å skrive inn svaret, og så"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "«Mellomrom» eller «Enter»."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Prøv det nå!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Bra skudd!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Hvis en iglo blir truffet av en"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "komet, smelter den. Men ta det"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "med ro: pingvinen klarer seg!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Berre se hva som skjer."
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Trykk en tast for å se.)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Legg merke til rett svar."
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "Hvis igloen blir truffet på nytt,"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "vandrer pingvinen bort."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Trykk en tast når du er klar.)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "Du kan bygge opp igjen igloene"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "ved å stoppe bonuskometer."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Skyt kometen nå!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Kjempebra!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Du kan når som helst gi deg,"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "ved å trykke «Escape» eller"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "klikke på X-en oppe til høyre."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Prøv det nå, og start spillet!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Rekordar"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Romlærling"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Romvokter"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Romsjef"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Romkommandør"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Faktorer"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Brøker"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar ennå."
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter fremtiden til TuxMath på"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Spill alene"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Spill med venner"
-
-#: src/titlescreen.c:649
-#, fuzzy
-msgid "Factoroids!"
-msgstr "Faktorer"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Hjelp"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Flere valg"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Avslutt"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Kadettskole"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Oppdrag"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Arkadespill"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Selvlaget spill"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Hovedmeny"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Rediger «options»-fila i hjemmemappa di"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "for å lage ditt eget spill."
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Trykk en tast eller med musen for å starte spillet."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Se «README.txt» for mer informasjon."
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstrasjon"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Prosjektinfo"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Bidragsytere"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Hovedmeny"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath er fri programvare!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Du kan være med på å gjøre spillet bedre, ved å melde fra"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "om feil, foreslå forbedringer eller bidra med programkode."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Tallskriving"
@@ -766,7 +660,77 @@
msgid "Division of Positives and Negatives"
msgstr "Divisjon av positive og negative tall"
+#~ msgid "Play Alone"
+#~ msgstr "Spill alene"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Spill med venner"
+
#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Faktorer"
+
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "More Options"
+#~ msgstr "Flere valg"
+
+#~ msgid "Quit"
+#~ msgstr "Avslutt"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Kadettskole"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Oppdrag"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Arkadespill"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Selvlaget spill"
+
+#~ msgid "Main menu"
+#~ msgstr "Hovedmeny"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Rediger «options»-fila i hjemmemappa di"
+
+#~ msgid "to create customized game!"
+#~ msgstr "for å lage ditt eget spill."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Trykk en tast eller med musen for å starte spillet."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Se «README.txt» for mer informasjon."
+
+#~ msgid "Demo"
+#~ msgstr "Demonstrasjon"
+
+#~ msgid "Project Info"
+#~ msgstr "Prosjektinfo"
+
+#~ msgid "Credits"
+#~ msgstr "Bidragsytere"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hovedmeny"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath er fri programvare!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Du kan være med på å gjøre spillet bedre, ved å melde fra"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "om feil, foreslå forbedringer eller bidra med programkode."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
+
+#, fuzzy
#~ msgid "the penguins' igloos. To save their homes,"
#~ msgstr "igloene til pingvinene fra"
Modified: tuxmath/branches/lan/po/nl.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/nl.po
===================================================================
--- tuxmath/branches/lan/po/nl.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/nl.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Schrijvers Luc <Begasus at skynet.be>\n"
"Language-Team: Dutch <LL at li.org>\n"
@@ -202,333 +202,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Hoogste scores"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Ruimte kadet"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Werk in uitvoering"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Deze functie is nog niet beschikbaar"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Praat over de toekomst van TuxMath op"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Help"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Meer opties"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Reken commando training academie"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Speel Arcade spel"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Speel je eigen spel"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Hoofdmenu"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Bewerk 'options' bestand in je home folder"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "voor een eigen spel!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Druk op een toets of de muis om het spel te starten."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Lees README.txt voor meer informatie"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Projekt info"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Kredieten"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Hoofdmenu"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath is gratis en open-source!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Je kan helpen met het verbeteren door problemen te melden,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "suggesties verbeteringen, of code toevoegen."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Nummers typen"
@@ -762,3 +657,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Delen van positieven en negatieven"
+
+#~ msgid "Help"
+#~ msgstr "Help"
+
+#~ msgid "More Options"
+#~ msgstr "Meer opties"
+
+#~ msgid "Quit"
+#~ msgstr "Afsluiten"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Reken commando training academie"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Speel Arcade spel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Speel je eigen spel"
+
+#~ msgid "Main menu"
+#~ msgstr "Hoofdmenu"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Bewerk 'options' bestand in je home folder"
+
+#~ msgid "to create customized game!"
+#~ msgstr "voor een eigen spel!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Druk op een toets of de muis om het spel te starten."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lees README.txt voor meer informatie"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "Projekt info"
+
+#~ msgid "Credits"
+#~ msgstr "Kredieten"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hoofdmenu"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath is gratis en open-source!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Je kan helpen met het verbeteren door problemen te melden,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "suggesties verbeteringen, of code toevoegen."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/nn.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/nn.po
===================================================================
--- tuxmath/branches/lan/po/nn.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/nn.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2009-04-16 18:58+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -226,8 +226,9 @@
"programmet."
#: src/credits.c:108
+#, fuzzy
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
"Heile GNU GPL-lisensen er tilgjengeleg i hjelpetekstane som følgjer med "
"programmet."
@@ -237,32 +238,32 @@
msgstr ""
"For meir informasjon om fri programvare og GNU GPL, kan du vitja nettstaden"
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr "FAKTOROIDAR: For å vinna må du øydeleggja elle asteroidane."
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr "Bruk piltastane til å dreia rundt eller fly framover. Sikt på ein"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "asteroide, skriv inn éin av faktorane og trykk «Enter»"
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
"eller «Mellomrom» for å dela han opp. Primtalsasteroidar vert øydelagde."
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "BRØKAR: For å vinna må du øydeleggja elle asteroidane."
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr "Skriv inn eit tal som kan forenkla brøken, og trykk «Enter»"
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
@@ -270,296 +271,191 @@
"eller «Mellomrom» for å dela han. Øydelegg brøkar som ikkje kan forenklast "
"med eit enkeltskot."
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Velkommen til TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Oppdraget ditt er å redda"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "igloane til pingvinane frå"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "kometar frå verdsrommet."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Du kan stoppa ein komet ved"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "å skriva inn svaret, og så"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "«Mellomrom» eller «Enter»."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Prøv det no!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Bra skot!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Viss ein iglo vert treft av ein"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "komet, smeltar han. Men ta det"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "med ro: pingvinen klarer seg!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Berre sjå kva som skjer."
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Trykk ein tast for å sjå.)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Legg merke til rett svar."
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "Viss igloen vert treft på nytt,"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "vandrar pingvinen vekk."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Trykk ein tast når du er klar.)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "Du kan byggja opp att igloane"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "ved å stoppa bonuskometar."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Skyt kometen no!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Kjempebra!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Du kan når som helst gje deg,"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "ved å trykkja «Escape» eller"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "klikka på X-en oppe til høgre."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Prøv det no, og start spelet!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Rekordar"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Romlærling"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Romvaktar"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Romsjef"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Romkommandør"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Faktorar"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Brøkar"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr "Du fekk ein ny rekord!"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr "Skriv inn namnet ditt:"
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr "Kven spelar først?"
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr "Skriv inn namnet ditt:"
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr "Kven sin tur er det så?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr "Kor mange rundar vil du spela?"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr "Skriv inn eit tal"
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikkje klar enno."
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter framtida til TuxMath på"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Spel åleine"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Spel med venner"
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr "Faktoroidar!"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Hjelp"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Fleire val"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Avslutt"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Kadettskule"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Oppdrag"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Arkadespel"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Sjølvlaga spel"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Hovudmeny"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr "Poengsamling"
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr "Eliminering"
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr "Kor mange spelar?"
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr "(2 til 4 spelarar)"
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Rediger «options»-fila i heimemappa di"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "for å laga ditt eige spel."
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Trykk ein tast eller med musa for å starta spelet."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Sjå «README.txt» for meir informasjon."
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstrasjon"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Prosjektinfo"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Bidragsytarar"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Hovudmeny"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath er fri programvare!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Du kan vera med på å gjera spelet betre, ved å melda frå"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "om feil, foreslå forbetringar eller bidra med programkode."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Talskriving"
@@ -792,6 +688,87 @@
msgid "Division of Positives and Negatives"
msgstr "Divisjon av positive og negative tal"
+#~ msgid "Play Alone"
+#~ msgstr "Spel åleine"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Spel med venner"
+
+#~ msgid "Factoroids!"
+#~ msgstr "Faktoroidar!"
+
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "More Options"
+#~ msgstr "Fleire val"
+
+#~ msgid "Quit"
+#~ msgstr "Avslutt"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Kadettskule"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Oppdrag"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Arkadespel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Sjølvlaga spel"
+
+#~ msgid "Main menu"
+#~ msgstr "Hovudmeny"
+
+#~ msgid "Score Sweep"
+#~ msgstr "Poengsamling"
+
+#~ msgid "Elimination"
+#~ msgstr "Eliminering"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "Kor mange spelar?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(2 til 4 spelarar)"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Rediger «options»-fila i heimemappa di"
+
+#~ msgid "to create customized game!"
+#~ msgstr "for å laga ditt eige spel."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Trykk ein tast eller med musa for å starta spelet."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Sjå «README.txt» for meir informasjon."
+
+#~ msgid "Demo"
+#~ msgstr "Demonstrasjon"
+
+#~ msgid "Project Info"
+#~ msgstr "Prosjektinfo"
+
+#~ msgid "Credits"
+#~ msgstr "Bidragsytarar"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hovudmeny"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath er fri programvare!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Du kan vera med på å gjera spelet betre, ved å melda frå"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "om feil, foreslå forbetringar eller bidra med programkode."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
+
#~ msgid "The penguins need your help! Comets"
#~ msgstr "Pingvinane treng hjelp frå deg! Det fell"
Modified: tuxmath/branches/lan/po/oc.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/oc.po
===================================================================
--- tuxmath/branches/lan/po/oc.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/oc.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-02-25 16:55+0000\n"
"Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannig at marchegay.org>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -206,333 +206,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr ""
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr ""
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr ""
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr ""
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr ""
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Mai d'opcions"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Sortir"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr ""
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr ""
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Menut principal"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr ""
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr ""
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr ""
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr ""
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr ""
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Mercejaments"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Menut principal"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr ""
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr ""
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr ""
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr ""
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr ""
@@ -764,3 +659,21 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr ""
+
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "More Options"
+#~ msgstr "Mai d'opcions"
+
+#~ msgid "Quit"
+#~ msgstr "Sortir"
+
+#~ msgid "Main menu"
+#~ msgstr "Menut principal"
+
+#~ msgid "Credits"
+#~ msgstr "Mercejaments"
+
+#~ msgid "Main Menu"
+#~ msgstr "Menut principal"
Modified: tuxmath/branches/lan/po/pl.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/pl.po
===================================================================
--- tuxmath/branches/lan/po/pl.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/pl.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-02-25 18:43+0000\n"
"Last-Translator: Mateusz Tybura <wujciol at gmail.com>\n"
"Language-Team: Polish <pl at li.org>\n"
@@ -209,334 +209,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Lista najlepszych"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Kosmiczny Kadet"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Strzelec"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Strażnik"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "As"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Prace trwają!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Ta cecha jeszcze nie jest gotowa"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Dyskusje na temat przyszłości Tuxmath na"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Pomoc"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Więcej opcji"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Wyjdź"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Akademia Treningowa Poleceń Math"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Zagraj w grę zręcznościową"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Zagraj w wybraną grę"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Menu główne"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Edytuj pik 'options' w swoim katalogu domowym"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr ""
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Naciśnij klawisz albo kliknij myszką aby uruchomić grę."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Przeczytaj README.txt, żeby uzyskać więcej informacji"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstracja"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Informacja o projekcie"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Twórcy"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Menu główne"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath jest wolny i ma otwarte źródła"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Możesz pomóc uczynić go lepszym zgłaszając błędy."
-
-#: src/titlescreen.c:1115
-#, fuzzy
-msgid "suggesting improvements, or adding code."
-msgstr "Zasugeruj ulepszenia lub dodaj kod"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Dyskutuj na temat przyszłości na tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
#, fuzzy
msgid "Number Typing"
@@ -775,3 +669,59 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Dzielenie liczb dodatnich i ujemnych"
+
+#~ msgid "Help"
+#~ msgstr "Pomoc"
+
+#~ msgid "More Options"
+#~ msgstr "Więcej opcji"
+
+#~ msgid "Quit"
+#~ msgstr "Wyjdź"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademia Treningowa Poleceń Math"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Zagraj w grę zręcznościową"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Zagraj w wybraną grę"
+
+#~ msgid "Main menu"
+#~ msgstr "Menu główne"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edytuj pik 'options' w swoim katalogu domowym"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Naciśnij klawisz albo kliknij myszką aby uruchomić grę."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Przeczytaj README.txt, żeby uzyskać więcej informacji"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstracja"
+
+#~ msgid "Project Info"
+#~ msgstr "Informacja o projekcie"
+
+#~ msgid "Credits"
+#~ msgstr "Twórcy"
+
+#~ msgid "Main Menu"
+#~ msgstr "Menu główne"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath jest wolny i ma otwarte źródła"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Możesz pomóc uczynić go lepszym zgłaszając błędy."
+
+#, fuzzy
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "Zasugeruj ulepszenia lub dodaj kod"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr ""
+#~ "Dyskutuj na temat przyszłości na tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/pt.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/pt.po
===================================================================
--- tuxmath/branches/lan/po/pt.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/pt.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-04-12 04:12+0000\n"
"Last-Translator: Mykas0 <Mykas0 at gmail.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
@@ -208,333 +208,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Corredor da Fama"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Cadete Espacial"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Batedor"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr ""
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ás"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Trabalho em Progresso!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Discuta o futuro do TuxMath em"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Mais Opções"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Sair"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr ""
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr ""
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Menu principal"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr ""
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr ""
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Pressione uma tecla ou clique o rato para começar o jogo."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Veja o README.txt para mais informações!"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstração"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Informação do Projecto"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Créditos"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Menu Principal"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath é livre e com código aberto!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Você pode ajudar o TuxMath ao reportar problemas,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "sugerindo melhorias, ou adicionando código."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Discuta o futuro em tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr ""
@@ -768,3 +663,45 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Divisão de Positivos e Negativos"
+
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "More Options"
+#~ msgstr "Mais Opções"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Main menu"
+#~ msgstr "Menu principal"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Pressione uma tecla ou clique o rato para começar o jogo."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Veja o README.txt para mais informações!"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstração"
+
+#~ msgid "Project Info"
+#~ msgstr "Informação do Projecto"
+
+#~ msgid "Credits"
+#~ msgstr "Créditos"
+
+#~ msgid "Main Menu"
+#~ msgstr "Menu Principal"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath é livre e com código aberto!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Você pode ajudar o TuxMath ao reportar problemas,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "sugerindo melhorias, ou adicionando código."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Discuta o futuro em tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/pt_BR.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/pt_BR.po
===================================================================
--- tuxmath/branches/lan/po/pt_BR.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/pt_BR.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-03-03 21:35+0000\n"
"Last-Translator: Laudeci Oliveira <laudeci at gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR at li.org>\n"
@@ -210,333 +210,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Hall da Fama"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Cadete Espacial"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Sentinela"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Defensor"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Especialista"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Trabalho em curso"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Esta função ainda não está disponível"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Discutir o futuro do TuxMath em"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Mais Opções"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Sair"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Comando de Treinamento Matemático Acadêmico"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Jogar jogo de Arcade"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Jogar um Jogo Personalizado"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Menu Principal"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Edite o arquivo 'options\" no seu diretório home"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "criar jogo personalizado!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Pressione uma tecla ou clique com seu mouse para iniciar o jogo."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Leia o README.txt para mais informações"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstração"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Informação do Projeto"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Créditos"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Menu Principal"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath é gratuíto e software livre!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Você pode ajudar a torná-lo melhor reportando problemas."
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "sugerindo melhorias, ou programando."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Discutir o futuro em tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Digitar Número"
@@ -770,3 +665,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Divisão de Positivos e Negativos"
+
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "More Options"
+#~ msgstr "Mais Opções"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Comando de Treinamento Matemático Acadêmico"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Jogar jogo de Arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Jogar um Jogo Personalizado"
+
+#~ msgid "Main menu"
+#~ msgstr "Menu Principal"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edite o arquivo 'options\" no seu diretório home"
+
+#~ msgid "to create customized game!"
+#~ msgstr "criar jogo personalizado!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Pressione uma tecla ou clique com seu mouse para iniciar o jogo."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Leia o README.txt para mais informações"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstração"
+
+#~ msgid "Project Info"
+#~ msgstr "Informação do Projeto"
+
+#~ msgid "Credits"
+#~ msgstr "Créditos"
+
+#~ msgid "Main Menu"
+#~ msgstr "Menu Principal"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath é gratuíto e software livre!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Você pode ajudar a torná-lo melhor reportando problemas."
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "sugerindo melhorias, ou programando."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Discutir o futuro em tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/ru.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/ru.po
===================================================================
--- tuxmath/branches/lan/po/ru.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/ru.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-03-01 06:56+0000\n"
"Last-Translator: Александр AldeX Крылов <Unknown>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -207,333 +207,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Зал славы"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Космический курсант"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Разведчик"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Рейнджер"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Ас"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Работа продолжается!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Эта функция пока не готова"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Обсудить будущее TuxMath на"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Помощь"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Дополнительные настройки"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Выход"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Учебная академия по арифметике"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Играть в аркадную игру"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Играть в пользовательскую игру"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Главное меню"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Редактировать файл параметров в вашей домашней директории"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "для создания пользовательской игры!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Нажмите клавишу или кликните мышью для запуска игры."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Смотрите README.txt для дополнительной информации"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Демонстрация"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Информация о проекте"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Разработчики"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Главное меню"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath свободный и открытый!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Вы можете улучшить этот продукт, сообщив о проблеме,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "предложив улучшение или добавив код."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Обсудите будущее программы на tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Числовой ввод"
@@ -767,3 +662,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Деление положительных и отрицательных"
+
+#~ msgid "Help"
+#~ msgstr "Помощь"
+
+#~ msgid "More Options"
+#~ msgstr "Дополнительные настройки"
+
+#~ msgid "Quit"
+#~ msgstr "Выход"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Учебная академия по арифметике"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Играть в аркадную игру"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Играть в пользовательскую игру"
+
+#~ msgid "Main menu"
+#~ msgstr "Главное меню"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Редактировать файл параметров в вашей домашней директории"
+
+#~ msgid "to create customized game!"
+#~ msgstr "для создания пользовательской игры!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Нажмите клавишу или кликните мышью для запуска игры."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Смотрите README.txt для дополнительной информации"
+
+#~ msgid "Demo"
+#~ msgstr "Демонстрация"
+
+#~ msgid "Project Info"
+#~ msgstr "Информация о проекте"
+
+#~ msgid "Credits"
+#~ msgstr "Разработчики"
+
+#~ msgid "Main Menu"
+#~ msgstr "Главное меню"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath свободный и открытый!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Вы можете улучшить этот продукт, сообщив о проблеме,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "предложив улучшение или добавив код."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Обсудите будущее программы на tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/sk.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/sk.po
===================================================================
--- tuxmath/branches/lan/po/sk.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/sk.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-03-16 09:41+0000\n"
"Last-Translator: Štefan Lučivjanský <lucorp at azet.sk>\n"
"Language-Team: Slovak <sk at li.org>\n"
@@ -207,333 +207,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Sieň slávy"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Vesmírny kadet"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Skaut"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Poručík"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Eso"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Spracováva sa!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Táto vlastnosť ešte nie je pripravená"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Diskutuj o budúcnosti TuxMath na"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Pomocník"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Viac možností"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Koniec"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Cvičná akadémia matematického ovládania"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Hrať arkádovú hru"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Hrať vlastnú hru"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Hlavná ponuka"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Uprav súbor «options » vo svojom domovskom priečinku,"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "aby si mohol vytvoriť svoju vlastnú hru!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Pre spustenie hry stlačte ľubovoľnú klávesu, alebo kliknite myšou."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Pre viac informácií pozrite README.txt"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demo"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Informácie o projekte"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Tvorcovia"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Hlavná ponuka"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath je slobodný software!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Môžeš ho vylepšiť aj ty oznamovaním problémov,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "navrhovaním vylepšení, alebo pridaním kódu"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Diskutuj o budúcnosti na tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Písanie čísiel"
@@ -767,3 +662,60 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "Delenie kladných a záporných čísiel"
+
+#~ msgid "Help"
+#~ msgstr "Pomocník"
+
+#~ msgid "More Options"
+#~ msgstr "Viac možností"
+
+#~ msgid "Quit"
+#~ msgstr "Koniec"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Cvičná akadémia matematického ovládania"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Hrať arkádovú hru"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Hrať vlastnú hru"
+
+#~ msgid "Main menu"
+#~ msgstr "Hlavná ponuka"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Uprav súbor «options » vo svojom domovskom priečinku,"
+
+#~ msgid "to create customized game!"
+#~ msgstr "aby si mohol vytvoriť svoju vlastnú hru!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Pre spustenie hry stlačte ľubovoľnú klávesu, alebo kliknite myšou."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Pre viac informácií pozrite README.txt"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Project Info"
+#~ msgstr "Informácie o projekte"
+
+#~ msgid "Credits"
+#~ msgstr "Tvorcovia"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hlavná ponuka"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath je slobodný software!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Môžeš ho vylepšiť aj ty oznamovaním problémov,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "navrhovaním vylepšení, alebo pridaním kódu"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Diskutuj o budúcnosti na tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/branches/lan/po/sv.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/sv.po
===================================================================
--- tuxmath/branches/lan/po/sv.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/sv.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: \n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -206,339 +206,233 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr "NÄMNARE: för att vinna behöver du förstöra alla asteroider."
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
"Använd piltangenterna för att svänga eller gå framåt. Sikta på en asteroid,"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "skriv in en av dess nämnare och tryck på Blanksteg eller Return"
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr "för att dela den i sina nämnare. Stenar med primtal förstörs!"
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "BRÅK: för att vinna behöver du förstöra alla asteroider"
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
"skriv in ett tal som kan förenkla bråket och tryck på Blanksteg eller Return"
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
"för att dela det. Förstör bråken som inte kan förenklas mer i ett enda skott!"
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "Välkommen till TuxMath!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Ditt uppdrag är att rädda dina"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "pingviners igloos från"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "fallande kometer."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Stoppa en komet genom att"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "skriva in svaret på matteproblemet,"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "trycka på \"blanksteg\" eller \"Enter\"."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Prova det nu!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "Bra skjutet!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Om en igloo träffas av en komet,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "så smälter den. Men var lugn,"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "pingvinen är OK!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Se vad som händer:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Tryck på en tangent)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Observera svaret"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "Om den blir träffad igen,"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "kommer pingvinen att gå."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Tryck på en tangent)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "Du kan bygga nya igloos"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "genom att stoppa bonuskometer."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Skjut den nu!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "Bra jobbat!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Avsluta när du vill genom att"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "trycka \"Esc\" eller klicka på \"X\""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "i övre högra hörnet."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Gör det nu och spela sedan!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Poänglistan"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Rymdkadett"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Jägare"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "Mästare"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Kommandosoldat"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Nämnare"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Bråk"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr "Du kom med på poänglistan!"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr "Skriv ditt namn:"
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
#, fuzzy
msgid "Enter your name:"
msgstr "Skriv ditt namn:"
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
#, fuzzy
msgid "Enter a number"
msgstr "Skriv ditt namn:"
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Arbete pågår!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Denna funktion är inte färdig ännu"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Diskutera framtiden för TuxMath på"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Spela ensam"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Spela med vänner"
-
-#: src/titlescreen.c:649
-#, fuzzy
-msgid "Factoroids!"
-msgstr "Nämnare"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Hjälp"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Fler alternativ"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Avsluta"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Akademin för matematikträning"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Uppdrag för matematikflottan"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Spela arkadspel"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Spela anpassat spel"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Huvudmeny"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Redigera filen \"options\" i din hemkatalog"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "för att skapa anpassade spel!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Tryck på en tangent eller klicka med musen för att starta spelet."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Se README.txt för mer information"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Demonstration"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Projektinformation"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Tack till"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Huvudmeny"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath är gratis och öppen källkod!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Du kan hjälpa oss att göra det bättre genom att rapportera problem,"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "föreslå förbättringar eller bidra med programkod."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "Diskutera framtiden på tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Skriv in tal"
@@ -773,6 +667,76 @@
msgid "Division of Positives and Negatives"
msgstr "Division med positiva och negativa tal"
+#~ msgid "Play Alone"
+#~ msgstr "Spela ensam"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Spela med vänner"
+
+#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Nämnare"
+
+#~ msgid "Help"
+#~ msgstr "Hjälp"
+
+#~ msgid "More Options"
+#~ msgstr "Fler alternativ"
+
+#~ msgid "Quit"
+#~ msgstr "Avsluta"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademin för matematikträning"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Uppdrag för matematikflottan"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Spela arkadspel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Spela anpassat spel"
+
+#~ msgid "Main menu"
+#~ msgstr "Huvudmeny"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Redigera filen \"options\" i din hemkatalog"
+
+#~ msgid "to create customized game!"
+#~ msgstr "för att skapa anpassade spel!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Tryck på en tangent eller klicka med musen för att starta spelet."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Se README.txt för mer information"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstration"
+
+#~ msgid "Project Info"
+#~ msgstr "Projektinformation"
+
+#~ msgid "Credits"
+#~ msgstr "Tack till"
+
+#~ msgid "Main Menu"
+#~ msgstr "Huvudmeny"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath är gratis och öppen källkod!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Du kan hjälpa oss att göra det bättre genom att rapportera problem,"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "föreslå förbättringar eller bidra med programkod."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "Diskutera framtiden på tuxmath-devel at lists.sourceforge.net"
+
#~ msgid "The penguins need your help! Comets"
#~ msgstr "Pingvinerna behöver din hjälp! Kometer"
Modified: tuxmath/branches/lan/po/tr.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/tr.po
===================================================================
--- tuxmath/branches/lan/po/tr.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/tr.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tr2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2008-12-07 15:54+0200\n"
"Last-Translator: Doruk Fisek <dfisek at fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -205,338 +205,230 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr "Ok tuşlarını kullanarak dön ya da ileri git. Bir asteroidi hedef al,"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "çarpanlarından birini yaz ve boşluk ya da enter'e "
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr "basarak çarpanlarına ayır. Asal sayılar olan kayalar yok oluyor!"
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "KESİRLER: Kazanmak için tüm asteroitleri yok etmen gerekiyor."
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
"Kesiri basitleştirebilecek bir sayıyı yazıp boşluk ya da enter'e basarak onu"
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
"parçalayın. Daha fazla basitleştirilemeyen kesirleri tek bir atışta yok et!"
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "TuxMath'e Hoş Geldin!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "Görevin penguenlerin evlerini"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "düşen kuyruklu yıldızlardan"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "korumak."
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "Kuyruklu yıldızı durdurmak için"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "matematik probleminin yanıtını yaz"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "ve 'boşluk' ya da 'enter' tuşuna bas."
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "Şimdi dene!"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "İyi atış!"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "Eğer bir ev kuyruklu yıldız tarafından"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "vurulursa erir. Ama merak etme :"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "içindeki penguene zarar gelmez!"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "Yalnız ne olduğunu izle:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(Başlamak için bir tuşa bas)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "Yanıta dikkat et"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "Eğer ev tekrar vurulursa,"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "içindeki penguen evi terk eder."
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(Hazır olunca herhangi bir tuşa basın)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "Ek kuyruklu yıldızları durdurarak"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "evlerini tamir edebilirsin."
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "Hemen vur onu!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "İyi iş!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "Her an 'Esc'e basarak ya da"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "sağ üst köşedeki 'X'e"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "tıklayarak çıkabilirsin."
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "Hemen şimdi yap ve sonra oyna!"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "Gurur Tablosu"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "Uzay Tertibi"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "İzci"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "Korucu"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "As"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "Komando"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "Çarpanlar"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "Kesirler"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "Çalışmalar Sürüyor!"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "Bu özellik henüz hazır değil"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "Tuxmath'in geleceğini tartışıldığı liste :"
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "Yalnız Oyna"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "Arkadaşlarla Oyna"
-
-#: src/titlescreen.c:649
-#, fuzzy
-msgid "Factoroids!"
-msgstr "Çarpanlar"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "Yardım"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "Daha Çok Seçenek"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "Çıkış"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "Matematik Komutanlığı Eğitim Akademisi"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "Matematik Komutanlığı Donanması Görevleri"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "Eğlence Oyunu Oyna"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "Özel Oyun Oyna"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "Ana menü"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "Özelleştirilmiş oyun yaratmak için"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "ev dizinindeki 'options' dosyasını düzenle!"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "Oyuna başlamak için bir tuşa basın ya da fareye tıklayın."
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "Daha fazla bilgi için README.txt dosyasına bakın"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "Gösteri (Demo)"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "Proje Bilgisi"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "Hazırlayanlar"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "Ana Menü"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath özgür ve açık kaynak kodlu!"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "Sorunları bildirerek, iyileştirmeler önererek ya da kod yazarak"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "daha iyi olmasına yardımcı olabilirsin."
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr ""
-"tuxmath-devel at lists.sourceforge.net e-posta listesinde TuxMath'in geleceğini "
-"tartışabilirsin"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Sayı Yazmak"
@@ -771,6 +663,78 @@
msgid "Division of Positives and Negatives"
msgstr "Pozitif ve Negatiflerin Bölünmesi"
+#~ msgid "Play Alone"
+#~ msgstr "Yalnız Oyna"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Arkadaşlarla Oyna"
+
+#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Çarpanlar"
+
+#~ msgid "Help"
+#~ msgstr "Yardım"
+
+#~ msgid "More Options"
+#~ msgstr "Daha Çok Seçenek"
+
+#~ msgid "Quit"
+#~ msgstr "Çıkış"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Matematik Komutanlığı Eğitim Akademisi"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Matematik Komutanlığı Donanması Görevleri"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Eğlence Oyunu Oyna"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Özel Oyun Oyna"
+
+#~ msgid "Main menu"
+#~ msgstr "Ana menü"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Özelleştirilmiş oyun yaratmak için"
+
+#~ msgid "to create customized game!"
+#~ msgstr "ev dizinindeki 'options' dosyasını düzenle!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Oyuna başlamak için bir tuşa basın ya da fareye tıklayın."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Daha fazla bilgi için README.txt dosyasına bakın"
+
+#~ msgid "Demo"
+#~ msgstr "Gösteri (Demo)"
+
+#~ msgid "Project Info"
+#~ msgstr "Proje Bilgisi"
+
+#~ msgid "Credits"
+#~ msgstr "Hazırlayanlar"
+
+#~ msgid "Main Menu"
+#~ msgstr "Ana Menü"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath özgür ve açık kaynak kodlu!"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "Sorunları bildirerek, iyileştirmeler önererek ya da kod yazarak"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "daha iyi olmasına yardımcı olabilirsin."
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr ""
+#~ "tuxmath-devel at lists.sourceforge.net e-posta listesinde TuxMath'in "
+#~ "geleceğini tartışabilirsin"
+
#~ msgid "The penguins need your help! Comets"
#~ msgstr "Penguenlerin yardımına ihtiyacı var!"
Modified: tuxmath/branches/lan/po/tuxmath.pot
===================================================================
--- tuxmath/branches/lan/po/tuxmath.pot 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/tuxmath.pot 2009-09-25 03:10:14 UTC (rev 1553)
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: tuxmath 1.7.2\n"
+"Project-Id-Version: tuxmath 1.7.3\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -202,333 +202,228 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr ""
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr ""
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr ""
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr ""
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr ""
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr ""
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr ""
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr ""
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr ""
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr ""
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr ""
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr ""
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr ""
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr ""
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr ""
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr ""
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr ""
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr ""
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr ""
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr ""
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr ""
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "How many rounds will you play?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr ""
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr ""
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr ""
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr ""
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr ""
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr ""
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr ""
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr ""
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr ""
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr ""
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr ""
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr ""
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr ""
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr ""
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr ""
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr ""
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr ""
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr ""
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr ""
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr ""
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr ""
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr ""
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr ""
Modified: tuxmath/branches/lan/po/zh_CN.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/branches/lan/po/zh_CN.po
===================================================================
--- tuxmath/branches/lan/po/zh_CN.po 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/branches/lan/po/zh_CN.po 2009-09-25 03:10:14 UTC (rev 1553)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-03-06 06:12-0600\n"
+"POT-Creation-Date: 2009-09-21 19:35-0500\n"
"PO-Revision-Date: 2009-02-07 18:04+0800\n"
"Last-Translator: Xavier <XavierXavierye at gmail.com>\n"
"Language-Team: Simplified Chinese <zh_CN at li.org>\n"
@@ -216,334 +216,229 @@
#: src/credits.c:108
msgid ""
-"A full copy of the GPL is included with the documenation for this program."
+"A full copy of the GPL is included with the documentation for this program."
msgstr ""
#: src/credits.c:110
msgid "For more information about Free Software and the GNU GPL, visit:"
msgstr ""
-#: src/factoroids.c:558
+#: src/factoroids.c:552
msgid "FACTOROIDS: to win, you need destroy all the asteroids."
msgstr "因数分解游戏：要赢的话，你得击毁所有的小行星。"
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:553 src/factoroids.c:564
msgid "Use the arrow keys to turn or go forward. Aim at an asteroid,"
msgstr "用键盘上的方向键转动或前进。瞄准一个小行星，"
-#: src/factoroids.c:560
+#: src/factoroids.c:554
msgid "type one of its factors, and press space or return"
msgstr "输入其中一个的系数，然后按空格或回车"
-#: src/factoroids.c:561
+#: src/factoroids.c:555
msgid "to split it into its factors. Rocks with prime numbers are destroyed!"
msgstr "分解成系数。带有质数的岩石会被摧毁"
-#: src/factoroids.c:569
+#: src/factoroids.c:563
msgid "FRACTIONS: to win, you need destroy all the asteroids"
msgstr "分数:要赢的话，你得消灭所有的小行星"
-#: src/factoroids.c:571
+#: src/factoroids.c:565
msgid "type a number that can simplify the fraction, and press space or return"
msgstr "输入可以简化分数的数，然后按空格或回车键"
-#: src/factoroids.c:572
+#: src/factoroids.c:566
msgid ""
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
msgstr "分解它。"
-#: src/game.c:717
+#: src/game.c:976
msgid "Welcome to TuxMath!"
msgstr "欢迎来到TuxMax!"
-#: src/game.c:734
+#: src/game.c:993
msgid "Your mission is to save your"
msgstr "你的任务是保护你的"
-#: src/game.c:735
+#: src/game.c:994
msgid "penguins' igloos from the"
msgstr "企鹅的小屋"
-#: src/game.c:736
+#: src/game.c:995
msgid "falling comets."
msgstr "正在降落的彗星。"
-#: src/game.c:755
+#: src/game.c:1014
msgid "Stop a comet by typing"
msgstr "要制止彗星的话，按"
-#: src/game.c:756
+#: src/game.c:1015
msgid "the answer to the math problem"
msgstr "数学问题的答案"
-#: src/game.c:757
+#: src/game.c:1016
msgid "and hitting 'space' or 'enter'."
msgstr "按空格或回车键"
-#: src/game.c:758
+#: src/game.c:1017
msgid "Try it now!"
msgstr "现在就试一试吧！"
-#: src/game.c:766
+#: src/game.c:1025
msgid "Good shot!"
msgstr "打的好！"
-#: src/game.c:776
+#: src/game.c:1035
msgid "If an igloo gets hit by a comet,"
msgstr "如果一个小屋被彗星击中的话,"
-#: src/game.c:777
+#: src/game.c:1036
msgid "it melts. But don't worry: the"
msgstr "如果融化的话，别担心:"
-#: src/game.c:778
+#: src/game.c:1037
msgid "penguin is OK!"
msgstr "企鹅正常！"
-#: src/game.c:779
+#: src/game.c:1038
msgid "Just watch what happens:"
msgstr "只要观察发生了什么:"
-#: src/game.c:780
+#: src/game.c:1039
msgid "(Press a key to start)"
msgstr "(按任意键开始)"
-#: src/game.c:793
+#: src/game.c:1052
msgid "Notice the answer"
msgstr "注意答案"
-#: src/game.c:803
+#: src/game.c:1062
msgid "If it gets hit again, the"
msgstr "如果再次被击中的话，"
-#: src/game.c:804
+#: src/game.c:1063
msgid "penguin leaves."
msgstr "企鹅离开了。"
-#: src/game.c:805
+#: src/game.c:1064
msgid "(Press a key when ready)"
msgstr "(准备好后按任意键)"
-#: src/game.c:824
+#: src/game.c:1087
msgid "You can fix the igloos"
msgstr "你可以修复小屋"
-#: src/game.c:825
+#: src/game.c:1088
msgid "by stopping bonus comets."
msgstr "通过停止奖励的彗星"
-#: src/game.c:834
+#: src/game.c:1099
msgid "Zap it now!"
msgstr "现在攻击!"
-#: src/game.c:838
+#: src/game.c:1105
msgid "Great job!"
msgstr "干的好!"
-#: src/game.c:852
+#: src/game.c:1123
msgid "Quit at any time by pressing"
msgstr "任何时间退出，按"
-#: src/game.c:853
+#: src/game.c:1124
msgid "'Esc' or clicking the 'X'"
msgstr "按'Esc'键或点击'X'"
-#: src/game.c:854
+#: src/game.c:1125
msgid "in the upper right corner."
msgstr "在右上角"
-#: src/game.c:855
+#: src/game.c:1126
msgid "Do it now, and then play!"
msgstr "现在就做，开始吧！"
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:167
msgid "Hall Of Fame"
msgstr "排行榜"
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
-#: src/titlescreen.c:844
+#: src/highscore.c:187 src/highscore.c:208
msgid "Space Cadet"
msgstr "太空警"
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:190
msgid "Scout"
msgstr "童子军"
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:193
msgid "Ranger"
msgstr "巡逻兵"
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:196
msgid "Ace"
msgstr "王牌飞行员"
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:199
msgid "Commando"
msgstr "突击队"
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:202
msgid "Factors"
msgstr "系数"
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:205
msgid "Fractions"
msgstr "分数"
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:353
+#: src/highscore.c:286
msgid "Enter Your Name:"
msgstr ""
-#: src/multiplayer.c:244
+#: src/multiplayer.c:183
+#, c-format
+msgid "Then %s\n"
+msgstr ""
+
+#: src/multiplayer.c:258
msgid "Who is playing first?"
msgstr ""
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:258 src/multiplayer.c:260
msgid "Enter your name:"
msgstr ""
-#: src/multiplayer.c:246
+#: src/multiplayer.c:260
msgid "Who is playing next?"
msgstr ""
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
#, fuzzy
msgid "How many rounds will you play?"
msgstr "参加游戏的小朋友数量？"
-#: src/multiplayer.c:260
+#: src/multiplayer.c:274
msgid "Enter a number"
msgstr ""
-#: src/titlescreen.c:487
+#: src/titlescreen.c:476
msgid "Work In Progress!"
msgstr "运行中"
-#: src/titlescreen.c:488
+#: src/titlescreen.c:477
msgid "This feature is not ready yet"
msgstr "角色还没准备好"
-#: src/titlescreen.c:489
+#: src/titlescreen.c:478
msgid "Discuss the future of TuxMath at"
msgstr "讨论TuxMath："
-#: src/titlescreen.c:490
+#: src/titlescreen.c:479
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:647
-msgid "Play Alone"
-msgstr "自己玩"
-
-#: src/titlescreen.c:648
-msgid "Play With Friends"
-msgstr "和朋友一起玩"
-
-#: src/titlescreen.c:649
-msgid "Factoroids!"
-msgstr "因数分解！"
-
-#: src/titlescreen.c:650
-msgid "Help"
-msgstr "帮助"
-
-#: src/titlescreen.c:651
-msgid "More Options"
-msgstr "更多选项"
-
-#: src/titlescreen.c:652
-msgid "Quit"
-msgstr "退出"
-
-#: src/titlescreen.c:726
-msgid "Math Command Training Academy"
-msgstr "数学运算练习"
-
-#: src/titlescreen.c:727
-msgid "Math Command Fleet Missions"
-msgstr "数学命令舰队任务"
-
-#: src/titlescreen.c:728
-msgid "Play Arcade Game"
-msgstr "街机游戏"
-
-#: src/titlescreen.c:729
-msgid "Play Custom Game"
-msgstr "自定义游戏"
-
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
-msgid "Main menu"
-msgstr "主菜单"
-
-#: src/titlescreen.c:779
-msgid "Score Sweep"
-msgstr "消除得分"
-
-#: src/titlescreen.c:780
-msgid "Elimination"
-msgstr "消减"
-
-#: src/titlescreen.c:824
-msgid "How many kids are playing?"
-msgstr "参加游戏的小朋友数量？"
-
-#: src/titlescreen.c:825
-msgid "(Between 2 and 4 players)"
-msgstr "(２到４个玩家)"
-
-#: src/titlescreen.c:944
-msgid "Edit 'options' file in your home directory"
-msgstr "在你的主文件夹编辑'options' 选项文件"
-
-#: src/titlescreen.c:945
-msgid "to create customized game!"
-msgstr "创建自定义游戏！"
-
-#: src/titlescreen.c:946
-msgid "Press a key or click your mouse to start game."
-msgstr "按任意键或点击鼠标开始游戏。"
-
-#: src/titlescreen.c:947
-msgid "See README.txt for more information"
-msgstr "查看 README.txt 文件以获得更多信息"
-
-#: src/titlescreen.c:1062
-msgid "Demo"
-msgstr "演示"
-
-#: src/titlescreen.c:1063
-msgid "Project Info"
-msgstr "工程信息"
-
-#: src/titlescreen.c:1064
-msgid "Credits"
-msgstr "贡献者"
-
-#: src/titlescreen.c:1065
-msgid "Main Menu"
-msgstr "主菜单"
-
-#: src/titlescreen.c:1113
-msgid "TuxMath is free and open-source!"
-msgstr "TuxMath 是自由软件而且是开放源代码的！"
-
-#: src/titlescreen.c:1114
-msgid "You can help make it better by reporting problems,"
-msgstr "你可以改进它或报告程序错误，"
-
-#: src/titlescreen.c:1115
-msgid "suggesting improvements, or adding code."
-msgstr "提出改进建议或增加代码。"
-
-#: src/titlescreen.c:1116
-msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-msgstr "讨论TuxMath： tuxmath-devel at lists.sourceforge.net"
-
#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "输入数字"
@@ -777,3 +672,84 @@
#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr "正负数除法"
+
+#~ msgid "Play Alone"
+#~ msgstr "自己玩"
+
+#~ msgid "Play With Friends"
+#~ msgstr "和朋友一起玩"
+
+#~ msgid "Factoroids!"
+#~ msgstr "因数分解！"
+
+#~ msgid "Help"
+#~ msgstr "帮助"
+
+#~ msgid "More Options"
+#~ msgstr "更多选项"
+
+#~ msgid "Quit"
+#~ msgstr "退出"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "数学运算练习"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "数学命令舰队任务"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "街机游戏"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "自定义游戏"
+
+#~ msgid "Main menu"
+#~ msgstr "主菜单"
+
+#~ msgid "Score Sweep"
+#~ msgstr "消除得分"
+
+#~ msgid "Elimination"
+#~ msgstr "消减"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "参加游戏的小朋友数量？"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(２到４个玩家)"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "在你的主文件夹编辑'options' 选项文件"
+
+#~ msgid "to create customized game!"
+#~ msgstr "创建自定义游戏！"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "按任意键或点击鼠标开始游戏。"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "查看 README.txt 文件以获得更多信息"
+
+#~ msgid "Demo"
+#~ msgstr "演示"
+
+#~ msgid "Project Info"
+#~ msgstr "工程信息"
+
+#~ msgid "Credits"
+#~ msgstr "贡献者"
+
+#~ msgid "Main Menu"
+#~ msgstr "主菜单"
+
+#~ msgid "TuxMath is free and open-source!"
+#~ msgstr "TuxMath 是自由软件而且是开放源代码的！"
+
+#~ msgid "You can help make it better by reporting problems,"
+#~ msgstr "你可以改进它或报告程序错误，"
+
+#~ msgid "suggesting improvements, or adding code."
+#~ msgstr "提出改进建议或增加代码。"
+
+#~ msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+#~ msgstr "讨论TuxMath： tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/Makefile.am 2009-09-25 03:10:14 UTC (rev 1553)
@@ -12,7 +12,6 @@
intl \
linebreak \
po \
- server \
src
ACLOCAL_AMFLAGS = -I m4
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/configure.ac 2009-09-25 03:10:14 UTC (rev 1553)
@@ -308,7 +308,6 @@
doc/Makefile
nsis/tuxmath.nsi
nsis/tuxmath_with_conf.nsi
-server/Makefile
src/Makefile
intl/Makefile
linebreak/Makefile
Deleted: tuxmath/trunk/server/Makefile.am
===================================================================
--- tuxmath/trunk/server/Makefile.am 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/server/Makefile.am 2009-09-25 03:10:14 UTC (rev 1553)
@@ -1,13 +0,0 @@
-## Makefile.am for tuxmath test client:
-## Process with Automake to create Makefile.in
-
-bin_PROGRAMS = tuxmathtestclient
-
-
-tuxmathtestclient_SOURCES = testclient.c \
- ../src/throttle.c \
- ../src/network.c \
- ../src/options.c \
- ../src/mathcards.c
-
-EXTRA_DIST = testclient.h
Deleted: tuxmath/trunk/server/testclient.c
===================================================================
--- tuxmath/trunk/server/testclient.c 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/server/testclient.c 2009-09-25 03:10:14 UTC (rev 1553)
@@ -1,540 +0,0 @@
-/*
-* C Implementation: server.c
-*
-* Description: Test client program for LAN-based play in Tux,of Math Command.
-*
-*
-* Author: Akash Gangil, David Bruce, and the TuxMath team, (C) 2009
-* Developers list: <tuxmath-devel at lists.sourceforge.net>
-*
-* Copyright: See COPYING file that comes with this distribution. (Briefly, GNU GPL).
-*
-* NOTE: This file was initially based on example code from The Game Programming Wiki
-* (http://gpwiki.org), in a tutorial covered by the GNU Free Documentation License 1.2.
-* No invariant sections were indicated, and no separate license for the example code
-* was listed. The author was also not listed. AFAICT,this scenario allows incorporation of
-* derivative works into a GPLv2+ project like TuxMath - David Bruce
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-//#include "SDL_net.h"
-#include "../src/transtruct.h"
-#include "../src/mathcards.h"
-#include "testclient.h"
-#include "../src/throttle.h"
-#include "../src/network.h"
-
-/* Local (to testclient.c) "globals": */
-
-int quit = 0;
-int game_status = GAME_NOT_STARTED;
-
-MC_FlashCard comets[QUEST_QUEUE_SIZE]; //current questions
-int remaining_quests = 0;
-
-
-/* Local function prototypes: */
-int playgame(void);
-int erase_flashcard(MC_FlashCard* fc);
-MC_FlashCard* find_comet_by_id(int id);
-MC_FlashCard* check_answer(int ans);
-
-int read_stdin_nonblock(char* buf, size_t max_length);
-
-/* Functions to handle messages from server: */
-int game_check_msgs(void);
-int add_quest_recvd(char* buf);
-int remove_quest_recvd(char* buf);
-int player_msg_recvd(char* buf);
-int total_quests_recvd(char* buf);
-int mission_accompl_recvd(char* buf);
-
-/* Display to player: */
-void print_current_quests(void);
-
-/* Main function: ------------------------------------- */
-
-int main(int argc, char **argv)
-{
- char buf[NET_BUF_LEN]; // for network messages from server
- char buffer[NET_BUF_LEN]; // for command-line input
- int servers_found = 0;
- int server_number = -1;
- Uint32 server_ip = 0;
- Uint16 server_port = DEFAULT_PORT;
-
- //Scan local network to find running server:
- servers_found = LAN_DetectServers();
-
- if(servers_found < 1)
- {
- printf("No server could be found - exiting.\n");
- exit(EXIT_FAILURE);
- }
- else if(servers_found == 1) //One server - connect without player intervention
- {
- printf("Single server found - connecting automatically...");
-
- if(!LAN_AutoSetup(0)) //i.e.first (and only) entry in list
- {
- printf("setup_client() failed - exiting.\n");
- exit(EXIT_FAILURE);
- }
-
- printf("connected\n");
- }
-
-
- else // More than one server - will have to get player selection:
- {
- while(server_number < 0 || server_number >= servers_found)
- {
- printf("The following TuxMath servers were detected:\n");
- print_server_list();
- printf("Enter the SERVER NUMBER you would like to connect to:\n");
- scanf("%d", &server_number);
- if(server_number < 0 || server_number >= servers_found)
- printf("Illegal value - try again.\n");
- }
- if(!LAN_AutoSetup(server_number)) //i.e.first (and only) entry in list
- {
- printf("setup_client() failed - exiting.\n");
- exit(EXIT_FAILURE);
- }
-
- printf("connected\n");
- }
-
-
- /* Now we are connected - get nickname from player: */
- {
- char name[NAME_SIZE];
- char* p;
-
- printf("Please enter your name:\n>\n");
- fgets(buffer, NAME_SIZE, stdin);
- p = strchr(buffer, '\n'); //get rid of newline character
- if(p)
- *p = '\0';
- strncpy(name, buffer, NAME_SIZE);
- /* If no nickname received, use default: */
- if(strlen(name) == 1)
- strcpy(name, "Anonymous Coward");
-
- snprintf(buffer, NET_BUF_LEN, "%s", name);
- LAN_SetName(name);
- }
-
- printf("Welcome to the Tux Math Test Client!\n");
- printf("Type:\n"
- "'game' to start math game;\n"
- "'exit' to end client leaving server running;\n"
- "'quit' to end both client and server\n>\n");
-
-
- /* Set stdin to be non-blocking: */
- fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK);
-
-
- quit = 0;
- while(!quit)
- {
- // See if we have any messages from server:
- game_check_msgs();
-
- //Get user input from command line and send it to server:
- /*now display the options*/
- if(read_stdin_nonblock(buffer, NET_BUF_LEN))
- {
- //Figure out if we are trying to quit:
- if( (strncmp(buffer, "exit", 4) == 0)
- ||(strncmp(buffer, "quit", 4) == 0))
-
- {
- quit = 1;
- }
- else if (strncmp(buffer, "game", 4) == 0)
- {
- // Begin the actual math game
- playgame();
- printf("Math game finished.\n\n");
- printf("Type:\n"
- "'game' to start math game;\n"
- "'exit' to end client leaving server running;\n"
- "'quit' to end both client and server\n>\n");
- }
- else
- {
- printf("Command not recognized. Type:\n"
- "'game' to start math game;\n"
- "'exit' to end client leaving server running;\n"
- "'quit' to end both client and server\n\n>\n");
- }
- }
- //Limit loop to once per 10 msec so we don't eat all CPU
- Throttle(10);
- }
-
- LAN_Cleanup();
-
- return EXIT_SUCCESS;
-}
-
-
-
-
-
-int game_check_msgs(void)
-{
- char buf[NET_BUF_LEN];
- int status = 1;
- while(1)
- {
- buf[0] = '\0';
- status = LAN_NextMsg(buf);
- if (status == -1) //Fatal error
- {
- printf("Error - LAN_NextMsg() returned -1\n");
- return -1;
- }
-
- if (status == 0) //No more messages
- {
- break;
- }
-#ifdef LAN_DEBUG
- printf("Buffer from server is: %s\n", buf);
-#endif
-
- /* Now we process the buffer according to the command: */
- if(strncmp(buf, "SEND_QUESTION", strlen("SEND_QUESTION")) == 0)
- {
- if(!add_quest_recvd(buf))
- printf("SEND_QUESTION received but could not add question\n");
- else
- // If we successfully added question, show new questions to user:
- print_current_quests();
- }
- else if(strncmp(buf, "ADD_QUESTION", strlen("ADD_QUESTION")) == 0)
- {
- if(!add_quest_recvd(buf))
- printf("ADD_QUESTION received but could not add question\n");
- else
- print_current_quests();
- }
- else if(strncmp(buf, "REMOVE_QUESTION", strlen("REMOVE_QUESTION")) == 0)
- {
- if(!remove_quest_recvd(buf)) //remove the question with id in buf
- printf("REMOVE_QUESTION received but could not remove question\n");
- else
- print_current_quests();
- }
- else if(strncmp(buf, "SEND_MESSAGE", strlen("SEND_MESSAGE")) == 0)
- {
- printf("%s\n", buf);
- }
- else if(strncmp(buf, "PLAYER_MSG", strlen("PLAYER_MSG")) == 0)
- {
- player_msg_recvd(buf);
- }
- else if(strncmp(buf, "TOTAL_QUESTIONS", strlen("TOTAL_QUESTIONS")) == 0)
- {
- //update the "questions remaining" counter
- total_quests_recvd(buf);
- }
- else if(strncmp(buf, "MISSION_ACCOMPLISHED", strlen("MISSION_ACCOMPLISHED")) == 0)
- {
- game_status = GAME_OVER_WON;
- }
- else
- {
- printf("game_check_msgs() - unrecognized message: %s\n", buf);
- }
- }
-
- return 1;
-}
-
-
-
-int add_quest_recvd(char* buf)
-{
- MC_FlashCard* fc = find_comet_by_id(-1);
-
- if(!fc || !buf)
- {
- printf("NULL fc or buf\n");
- return 0;
- }
- /* function call to parse buffer and receive question */
- if(!Make_Flashcard(buf, fc))
- {
- printf("Unable to parse buffer into FlashCard\n");
- return 0;
- }
-
- return 1;
-}
-
-
-
-int remove_quest_recvd(char* buf)
-{
- int id = 0;
- char* p = NULL;
- MC_FlashCard* fc = NULL;
-
- if(!buf)
- return 0;
-
- p = strchr(buf, '\t');
- if(!p)
- return 0;
-
- id = atoi(p);
- fc = find_comet_by_id(id);
- if(!fc)
- return 0;
-
- erase_flashcard(fc);
- return 1;
-}
-
-
-
-/* This function prints the 'msg' part of the buffer (i.e. everything */
-/* after the first '\t') to stdout. */
-int player_msg_recvd(char* buf)
-{
- char* p;
- if(buf == NULL)
- return 0;
- p = strchr(buf, '\t');
- if(p)
- {
- p++;
- printf("%s\n", p);
- return 1;
- }
- else
- return 0;
-}
-
-
-int total_quests_recvd(char* buf)
-{
- char* p;
- if(buf == NULL)
- return 0;
- p = strchr(buf, '\t');
- if(p)
- {
- p++;
- remaining_quests = atoi(p);
- return 1;
- }
- else
- return 0;
-}
-
-
-
-
-
-
-int playgame(void)
-{
- int numready;
- int command_type;
- int ans = 0;
- MC_FlashCard* fc = NULL;
- int x=0, i = 0;
- char buf[NET_BUF_LEN];
- char buffer[NET_BUF_LEN];
- char ch;
-
- printf("\nStarting Tux, of the Math Command Line ;-)\n");
- printf("Waiting for other players to be ready...\n\n");
-
- //Tell server we're ready to start:
- LAN_StartGame();
- game_status = GAME_IN_PROGRESS;
-
- /* Start out with our "comets" empty: */
- {
- int i;
- for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
- erase_flashcard(&comets[i]);
- }
-
- //Begin game loop:
- while (game_status == GAME_IN_PROGRESS)
- {
-
- //Check our network messages, bailing out for fatal errors:
- if (game_check_msgs() == -1)
- return -1;
-
-
- //Now we check for any user responses
-
- //This function returns 1 and updates buf with input from
- //stdin if input is present.
- //If no input, it returns 0 without blocking or waiting
- if(read_stdin_nonblock(buf, NET_BUF_LEN))
- {
- //While in game, these just quit the current math game:
- if ((strncmp(buf, "quit", 4) == 0)
- ||(strncmp(buf, "exit", 4) == 0)
- ||(strncmp(buf, "q", 1) == 0))
- {
- game_status = GAME_OVER_ESCAPE;
-// end = 1; //Exit our loop in playgame()
- //Tell server we are quitting current game:
- LAN_LeaveGame();
- }
- else
- {
- /*NOTE atoi() will return zero for any string that is not
- a valid int, not just '0' - should not be a big deal for
- our test program - DSB */
- ans = atoi(buf);
- fc = check_answer(ans);
- if((fc != NULL))
- {
- printf("%s is correct!\nAwait next question...\n>\n", buf);
- //Tell server we answered it right:
- LAN_AnsweredCorrectly(fc->question_id);
- erase_flashcard(fc);
- print_current_quests();
- }
- else //we got input, but not the correct answer:
- {
- int i = rand()%QUEST_QUEUE_SIZE;
- printf("Sorry, %s is incorrect. Try again!\n", buf);
- // Can't tell which question was the 'wrong' one, so we
- // a non-empty one at random. Note that this is just for
- // purposes of testing LAN_NotAnsweredCorrectly()
- while(-1 == comets[i].question_id)
- i = rand()%QUEST_QUEUE_SIZE;
- LAN_NotAnsweredCorrectly(comets[i].question_id);
- print_current_quests();
- }
- } //input wasn't any of our keywords
- } // Input was received
-
- Throttle(10); //so don't eat all CPU
- } //End of game loop
-
- switch(game_status)
- {
- case GAME_OVER_ESCAPE:
- printf("You quit :(\n");
- break;
- case GAME_OVER_WON:
- printf("You won! :-)\n");
- }
-
-#ifdef LAN_DEBUG
- printf("Leaving playgame()\n");
-#endif
-}
-
-
-
-
-//Here we read up to max_length bytes from stdin into the buffer.
-//The first '\n' in the buffer, if present, is replaced with a
-//null terminator.
-//returns 0 if no data ready, 1 if at least one byte read.
-//NOTE for this to work we must first set stdin to O_NONBLOCK with:
-// fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK);
-
-int read_stdin_nonblock(char* buf, size_t max_length)
-{
- int bytes_read = 0;
- char* term = NULL;
- buf[0] = '\0';
-
- bytes_read = fread (buf, 1, max_length, stdin);
- term = strchr(buf, '\n');
- if (term)
- *term = '\0';
-
- if(bytes_read > 0)
- bytes_read = 1;
- else
- bytes_read = 0;
-
- return bytes_read;
-}
-
-/* Display the current questions and the number of remaining questions: */
-void print_current_quests(void)
-{
- int i;
- printf("\n------------ Current Questions: -----------\n");
- for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
- {
- if(comets[i].question_id != -1)
- printf("Comet %d - question %d:\t%s\n", i, comets[i].question_id, comets[i].formula_string);
- else
- printf("Comet %d:\tEmpty\n", i);
- }
- printf("-----------------------------------------------\n");
-}
-
-
-int erase_flashcard(MC_FlashCard* fc)
-{
- if(!fc)
- return 0;
- fc->formula_string[0] = '\0';
- fc->answer_string[0] = '\0';
- fc->question_id = -1;
- fc->answer = -9999;
- fc->difficulty = 0;
- return 1;
-}
-
-
-/* Return a pointer to an empty comet slot, */
-/* returning NULL if no vacancy found: */
-
-MC_FlashCard* find_comet_by_id(int id)
-{
- int i = 0;
- for(i = 0; i < QUEST_QUEUE_SIZE; i++)
- {
- if(comets[i].question_id == id)
- return &comets[i];
- }
- //if we don't find a match:
- return NULL;
-}
-
-/* Check the "comets" in order to see if the given */
-/* value matches the answer for any of the comets: */
-/* Returns a pointer to the matching comet, or */
-/* NULL if the answer doesn't match: */
-
-MC_FlashCard* check_answer(int ans)
-{
- int i = 0;
- for(i = 0; i < QUEST_QUEUE_SIZE; i++)
- {
- /* Make sure we don't "match" an empty question with a zero answer: */
- if( (comets[i].question_id != -1)
- && (comets[i].answer == ans))
-
- return &comets[i];
- }
- //if we don't find a matching question:
- return NULL;
-}
Deleted: tuxmath/trunk/server/testclient.h
===================================================================
--- tuxmath/trunk/server/testclient.h 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/server/testclient.h 2009-09-25 03:10:14 UTC (rev 1553)
@@ -1,35 +0,0 @@
-/*
-
- testclient.h
-
- Description: As of now it conatinsthe enum, which identifies
- the network commands , as they are added(WORK IN PROGRESS).
-
- Author: David Bruce ,Akash Gangil and the TuxMath team, (C) 2009
-
- Copyright: See COPYING file that comes with this distribution (briefly, GNU GPL version 2 or later)
-
-*/
-
-#ifndef TESTCLIENT_H
-#define TESTCLIENT_H
-
-
-enum {
- GAME_NOT_STARTED,
- GAME_IN_PROGRESS,
- GAME_OVER_WON,
- GAME_OVER_LOST,
- GAME_OVER_OTHER,
- GAME_OVER_ESCAPE,
- GAME_OVER_WINDOW_CLOSE,
- GAME_OVER_CHEATER,
- GAME_OVER_ERROR
-};
-
-
-enum {
- SEND_QUESTION
-};
-
-#endif
Modified: tuxmath/trunk/src/Makefile.am
===================================================================
--- tuxmath/trunk/src/Makefile.am 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/src/Makefile.am 2009-09-25 03:10:14 UTC (rev 1553)
@@ -9,7 +9,6 @@
AM_CFLAGS=-Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
-D$(SOUND)SOUND
-
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
-I../intl -I$(top_srcdir)/intl
@@ -27,7 +26,8 @@
bin_PROGRAMS = tuxmath \
tuxmathadmin \
generate_lesson \
- tuxmathserver
+ tuxmathserver \
+ tuxmathtestclient
DATA_PREFIX=${pkgdatadir}
endif
@@ -78,6 +78,12 @@
throttle.c \
. options.c
+tuxmathtestclient_SOURCES = testclient.c \
+ throttle.c \
+ network.c \
+ options.c \
+ mathcards.c
+
EXTRA_DIST = credits.h \
factoroids.h \
fileops.h \
@@ -105,6 +111,7 @@
pixels.h \
compiler.h \
server.h \
+ testclient.h \
transtruct.h \
throttle.h
Modified: tuxmath/trunk/src/network.c
===================================================================
--- tuxmath/trunk/src/network.c 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/src/network.c 2009-09-25 03:10:14 UTC (rev 1553)
@@ -35,7 +35,6 @@
int say_to_server(char *statement);
int evaluate(char *statement);
int add_to_server_list(UDPpacket* pkt);
-void print_server_list(void);
int LAN_DetectServers(void)
Modified: tuxmath/trunk/src/network.h
===================================================================
--- tuxmath/trunk/src/network.h 2009-09-24 03:02:10 UTC (rev 1552)
+++ tuxmath/trunk/src/network.h 2009-09-25 03:10:14 UTC (rev 1553)
@@ -31,6 +31,8 @@
int LAN_AutoSetup(int i);
char* LAN_ServerName(int i);
char* LAN_ConnectedServerName(void);
+void print_server_list(void);
+
//int LAN_Setup(char* host, int port);
void LAN_Cleanup(void);
int LAN_SetName(char* name);
Copied: tuxmath/trunk/src/testclient.c (from rev 1552, tuxmath/trunk/server/testclient.c)
===================================================================
--- tuxmath/trunk/src/testclient.c (rev 0)
+++ tuxmath/trunk/src/testclient.c 2009-09-25 03:10:14 UTC (rev 1553)
@@ -0,0 +1,534 @@
+/*
+* C Implementation: server.c
+*
+* Description: Test client program for LAN-based play in Tux,of Math Command.
+*
+*
+* Author: Akash Gangil, David Bruce, and the TuxMath team, (C) 2009
+* Developers list: <tuxmath-devel at lists.sourceforge.net>
+*
+* Copyright: See COPYING file that comes with this distribution. (Briefly, GNU GPL).
+*
+* NOTE: This file was initially based on example code from The Game Programming Wiki
+* (http://gpwiki.org), in a tutorial covered by the GNU Free Documentation License 1.2.
+* No invariant sections were indicated, and no separate license for the example code
+* was listed. The author was also not listed. AFAICT,this scenario allows incorporation of
+* derivative works into a GPLv2+ project like TuxMath - David Bruce
+*/
+
+#include "globals.h"
+#include "transtruct.h"
+#include "mathcards.h"
+#include "testclient.h"
+#include "throttle.h"
+#include "network.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+//#include "SDL_net.h"
+
+/* Local (to testclient.c) "globals": */
+
+int quit = 0;
+int game_status = GAME_NOT_STARTED;
+
+MC_FlashCard comets[QUEST_QUEUE_SIZE]; //current questions
+int remaining_quests = 0;
+
+
+/* Local function prototypes: */
+int playgame(void);
+int erase_flashcard(MC_FlashCard* fc);
+MC_FlashCard* find_comet_by_id(int id);
+MC_FlashCard* check_answer(int ans);
+
+int read_stdin_nonblock(char* buf, size_t max_length);
+
+/* Functions to handle messages from server: */
+int game_check_msgs(void);
+int add_quest_recvd(char* buf);
+int remove_quest_recvd(char* buf);
+int player_msg_recvd(char* buf);
+int total_quests_recvd(char* buf);
+int mission_accompl_recvd(char* buf);
+
+/* Display to player: */
+void print_current_quests(void);
+
+/* Main function: ------------------------------------- */
+
+int main(int argc, char **argv)
+{
+ char buffer[NET_BUF_LEN]; // for command-line input
+ int servers_found = 0;
+ int server_number = -1;
+
+ //Scan local network to find running server:
+ servers_found = LAN_DetectServers();
+
+ if(servers_found < 1)
+ {
+ printf("No server could be found - exiting.\n");
+ exit(EXIT_FAILURE);
+ }
+ else if(servers_found == 1) //One server - connect without player intervention
+ {
+ printf("Single server found - connecting automatically...");
+
+ if(!LAN_AutoSetup(0)) //i.e.first (and only) entry in list
+ {
+ printf("setup_client() failed - exiting.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ printf("connected\n");
+ }
+
+
+ else // More than one server - will have to get player selection:
+ {
+ while(server_number < 0 || server_number >= servers_found)
+ {
+ printf("The following TuxMath servers were detected:\n");
+ print_server_list();
+ printf("Enter the SERVER NUMBER you would like to connect to:\n");
+ scanf("%d", &server_number);
+ if(server_number < 0 || server_number >= servers_found)
+ printf("Illegal value - try again.\n");
+ }
+ if(!LAN_AutoSetup(server_number)) //i.e.first (and only) entry in list
+ {
+ printf("setup_client() failed - exiting.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ printf("connected\n");
+ }
+
+
+ /* Now we are connected - get nickname from player: */
+ {
+ char name[NAME_SIZE];
+ char* p;
+
+ printf("Please enter your name:\n>\n");
+ fgets(buffer, NAME_SIZE, stdin);
+ p = strchr(buffer, '\n'); //get rid of newline character
+ if(p)
+ *p = '\0';
+ strncpy(name, buffer, NAME_SIZE);
+ /* If no nickname received, use default: */
+ if(strlen(name) == 1)
+ strcpy(name, "Anonymous Coward");
+
+ snprintf(buffer, NET_BUF_LEN, "%s", name);
+ LAN_SetName(name);
+ }
+
+ printf("Welcome to the Tux Math Test Client!\n");
+ printf("Type:\n"
+ "'game' to start math game;\n"
+ "'exit' to end client leaving server running;\n"
+ "'quit' to end both client and server\n>\n");
+
+
+ /* Set stdin to be non-blocking: */
+ fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK);
+
+
+ quit = 0;
+ while(!quit)
+ {
+ // See if we have any messages from server:
+ game_check_msgs();
+
+ //Get user input from command line and send it to server:
+ /*now display the options*/
+ if(read_stdin_nonblock(buffer, NET_BUF_LEN))
+ {
+ //Figure out if we are trying to quit:
+ if( (strncmp(buffer, "exit", 4) == 0)
+ ||(strncmp(buffer, "quit", 4) == 0))
+
+ {
+ quit = 1;
+ }
+ else if (strncmp(buffer, "game", 4) == 0)
+ {
+ // Begin the actual math game
+ playgame();
+ printf("Math game finished.\n\n");
+ printf("Type:\n"
+ "'game' to start math game;\n"
+ "'exit' to end client leaving server running;\n"
+ "'quit' to end both client and server\n>\n");
+ }
+ else
+ {
+ printf("Command not recognized. Type:\n"
+ "'game' to start math game;\n"
+ "'exit' to end client leaving server running;\n"
+ "'quit' to end both client and server\n\n>\n");
+ }
+ }
+ //Limit loop to once per 10 msec so we don't eat all CPU
+ Throttle(10);
+ }
+
+ LAN_Cleanup();
+
+ return EXIT_SUCCESS;
+}
+
+
+
+
+
+int game_check_msgs(void)
+{
+ char buf[NET_BUF_LEN];
+ int status = 1;
+ while(1)
+ {
+ buf[0] = '\0';
+ status = LAN_NextMsg(buf);
+ if (status == -1) //Fatal error
+ {
+ printf("Error - LAN_NextMsg() returned -1\n");
+ return -1;
+ }
+
+ if (status == 0) //No more messages
+ {
+ break;
+ }
+#ifdef LAN_DEBUG
+ printf("Buffer from server is: %s\n", buf);
+#endif
+
+ /* Now we process the buffer according to the command: */
+ if(strncmp(buf, "SEND_QUESTION", strlen("SEND_QUESTION")) == 0)
+ {
+ if(!add_quest_recvd(buf))
+ printf("SEND_QUESTION received but could not add question\n");
+ else
+ // If we successfully added question, show new questions to user:
+ print_current_quests();
+ }
+ else if(strncmp(buf, "ADD_QUESTION", strlen("ADD_QUESTION")) == 0)
+ {
+ if(!add_quest_recvd(buf))
+ printf("ADD_QUESTION received but could not add question\n");
+ else
+ print_current_quests();
+ }
+ else if(strncmp(buf, "REMOVE_QUESTION", strlen("REMOVE_QUESTION")) == 0)
+ {
+ if(!remove_quest_recvd(buf)) //remove the question with id in buf
+ printf("REMOVE_QUESTION received but could not remove question\n");
+ else
+ print_current_quests();
+ }
+ else if(strncmp(buf, "SEND_MESSAGE", strlen("SEND_MESSAGE")) == 0)
+ {
+ printf("%s\n", buf);
+ }
+ else if(strncmp(buf, "PLAYER_MSG", strlen("PLAYER_MSG")) == 0)
+ {
+ player_msg_recvd(buf);
+ }
+ else if(strncmp(buf, "TOTAL_QUESTIONS", strlen("TOTAL_QUESTIONS")) == 0)
+ {
+ //update the "questions remaining" counter
+ total_quests_recvd(buf);
+ }
+ else if(strncmp(buf, "MISSION_ACCOMPLISHED", strlen("MISSION_ACCOMPLISHED")) == 0)
+ {
+ game_status = GAME_OVER_WON;
+ }
+ else
+ {
+ printf("game_check_msgs() - unrecognized message: %s\n", buf);
+ }
+ }
+
+ return 1;
+}
+
+
+
+int add_quest_recvd(char* buf)
+{
+ MC_FlashCard* fc = find_comet_by_id(-1);
+
+ if(!fc || !buf)
+ {
+ printf("NULL fc or buf\n");
+ return 0;
+ }
+ /* function call to parse buffer and receive question */
+ if(!Make_Flashcard(buf, fc))
+ {
+ printf("Unable to parse buffer into FlashCard\n");
+ return 0;
+ }
+
+ return 1;
+}
+
+
+
+int remove_quest_recvd(char* buf)
+{
+ int id = 0;
+ char* p = NULL;
+ MC_FlashCard* fc = NULL;
+
+ if(!buf)
+ return 0;
+
+ p = strchr(buf, '\t');
+ if(!p)
+ return 0;
+
+ id = atoi(p);
+ fc = find_comet_by_id(id);
+ if(!fc)
+ return 0;
+
+ erase_flashcard(fc);
+ return 1;
+}
+
+
+
+/* This function prints the 'msg' part of the buffer (i.e. everything */
+/* after the first '\t') to stdout. */
+int player_msg_recvd(char* buf)
+{
+ char* p;
+ if(buf == NULL)
+ return 0;
+ p = strchr(buf, '\t');
+ if(p)
+ {
+ p++;
+ printf("%s\n", p);
+ return 1;
+ }
+ else
+ return 0;
+}
+
+
+int total_quests_recvd(char* buf)
+{
+ char* p;
+ if(buf == NULL)
+ return 0;
+ p = strchr(buf, '\t');
+ if(p)
+ {
+ p++;
+ remaining_quests = atoi(p);
+ return 1;
+ }
+ else
+ return 0;
+}
+
+
+
+
+
+
+int playgame(void)
+{
+ int ans = 0;
+ MC_FlashCard* fc = NULL;
+ char buf[NET_BUF_LEN];
+
+ printf("\nStarting Tux, of the Math Command Line ;-)\n");
+ printf("Waiting for other players to be ready...\n\n");
+
+ //Tell server we're ready to start:
+ LAN_StartGame();
+ game_status = GAME_IN_PROGRESS;
+
+ /* Start out with our "comets" empty: */
+ {
+ int i;
+ for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
+ erase_flashcard(&comets[i]);
+ }
+
+ //Begin game loop:
+ while (game_status == GAME_IN_PROGRESS)
+ {
+
+ //Check our network messages, bailing out for fatal errors:
+ if (game_check_msgs() == -1)
+ return -1;
+
+
+ //Now we check for any user responses
+
+ //This function returns 1 and updates buf with input from
+ //stdin if input is present.
+ //If no input, it returns 0 without blocking or waiting
+ if(read_stdin_nonblock(buf, NET_BUF_LEN))
+ {
+ //While in game, these just quit the current math game:
+ if ((strncmp(buf, "quit", 4) == 0)
+ ||(strncmp(buf, "exit", 4) == 0)
+ ||(strncmp(buf, "q", 1) == 0))
+ {
+ game_status = GAME_OVER_ESCAPE;
+// end = 1; //Exit our loop in playgame()
+ //Tell server we are quitting current game:
+ LAN_LeaveGame();
+ }
+ else
+ {
+ /*NOTE atoi() will return zero for any string that is not
+ a valid int, not just '0' - should not be a big deal for
+ our test program - DSB */
+ ans = atoi(buf);
+ fc = check_answer(ans);
+ if((fc != NULL))
+ {
+ printf("%s is correct!\nAwait next question...\n>\n", buf);
+ //Tell server we answered it right:
+ LAN_AnsweredCorrectly(fc->question_id);
+ erase_flashcard(fc);
+ print_current_quests();
+ }
+ else //we got input, but not the correct answer:
+ {
+ int i = rand()%QUEST_QUEUE_SIZE;
+ printf("Sorry, %s is incorrect. Try again!\n", buf);
+ // Can't tell which question was the 'wrong' one, so we
+ // a non-empty one at random. Note that this is just for
+ // purposes of testing LAN_NotAnsweredCorrectly()
+ while(-1 == comets[i].question_id)
+ i = rand()%QUEST_QUEUE_SIZE;
+ LAN_NotAnsweredCorrectly(comets[i].question_id);
+ print_current_quests();
+ }
+ } //input wasn't any of our keywords
+ } // Input was received
+
+ Throttle(10); //so don't eat all CPU
+ } //End of game loop
+
+ switch(game_status)
+ {
+ case GAME_OVER_ESCAPE:
+ printf("You quit :(\n");
+ break;
+ case GAME_OVER_WON:
+ printf("You won! :-)\n");
+ }
+
+ DEBUGMSG(debug_lan, "Leaving playgame()\n");
+
+ return 1;
+}
+
+
+
+
+//Here we read up to max_length bytes from stdin into the buffer.
+//The first '\n' in the buffer, if present, is replaced with a
+//null terminator.
+//returns 0 if no data ready, 1 if at least one byte read.
+//NOTE for this to work we must first set stdin to O_NONBLOCK with:
+// fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK);
+
+int read_stdin_nonblock(char* buf, size_t max_length)
+{
+ int bytes_read = 0;
+ char* term = NULL;
+ buf[0] = '\0';
+
+ bytes_read = fread (buf, 1, max_length, stdin);
+ term = strchr(buf, '\n');
+ if (term)
+ *term = '\0';
+
+ if(bytes_read > 0)
+ bytes_read = 1;
+ else
+ bytes_read = 0;
+
+ return bytes_read;
+}
+
+/* Display the current questions and the number of remaining questions: */
+void print_current_quests(void)
+{
+ int i;
+ printf("\n------------ Current Questions: -----------\n");
+ for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
+ {
+ if(comets[i].question_id != -1)
+ printf("Comet %d - question %d:\t%s\n", i, comets[i].question_id, comets[i].formula_string);
+ else
+ printf("Comet %d:\tEmpty\n", i);
+ }
+ printf("-----------------------------------------------\n");
+}
+
+
+int erase_flashcard(MC_FlashCard* fc)
+{
+ if(!fc)
+ return 0;
+ fc->formula_string[0] = '\0';
+ fc->answer_string[0] = '\0';
+ fc->question_id = -1;
+ fc->answer = -9999;
+ fc->difficulty = 0;
+ return 1;
+}
+
+
+/* Return a pointer to an empty comet slot, */
+/* returning NULL if no vacancy found: */
+
+MC_FlashCard* find_comet_by_id(int id)
+{
+ int i = 0;
+ for(i = 0; i < QUEST_QUEUE_SIZE; i++)
+ {
+ if(comets[i].question_id == id)
+ return &comets[i];
+ }
+ //if we don't find a match:
+ return NULL;
+}
+
+/* Check the "comets" in order to see if the given */
+/* value matches the answer for any of the comets: */
+/* Returns a pointer to the matching comet, or */
+/* NULL if the answer doesn't match: */
+
+MC_FlashCard* check_answer(int ans)
+{
+ int i = 0;
+ for(i = 0; i < QUEST_QUEUE_SIZE; i++)
+ {
+ /* Make sure we don't "match" an empty question with a zero answer: */
+ if( (comets[i].question_id != -1)
+ && (comets[i].answer == ans))
+
+ return &comets[i];
+ }
+ //if we don't find a matching question:
+ return NULL;
+}
Copied: tuxmath/trunk/src/testclient.h (from rev 1552, tuxmath/trunk/server/testclient.h)
===================================================================
--- tuxmath/trunk/src/testclient.h (rev 0)
+++ tuxmath/trunk/src/testclient.h 2009-09-25 03:10:14 UTC (rev 1553)
@@ -0,0 +1,35 @@
+/*
+
+ testclient.h
+
+ Description: As of now it conatinsthe enum, which identifies
+ the network commands , as they are added(WORK IN PROGRESS).
+
+ Author: David Bruce ,Akash Gangil and the TuxMath team, (C) 2009
+
+ Copyright: See COPYING file that comes with this distribution (briefly, GNU GPL version 2 or later)
+
+*/
+
+#ifndef TESTCLIENT_H
+#define TESTCLIENT_H
+
+
+enum {
+ GAME_NOT_STARTED,
+ GAME_IN_PROGRESS,
+ GAME_OVER_WON,
+ GAME_OVER_LOST,
+ GAME_OVER_OTHER,
+ GAME_OVER_ESCAPE,
+ GAME_OVER_WINDOW_CLOSE,
+ GAME_OVER_CHEATER,
+ GAME_OVER_ERROR
+};
+
+
+enum {
+ SEND_QUESTION
+};
+
+#endif
More information about the Tux4kids-commits
mailing list