[Tux4kids-commits] r1584 - in tuxmath/trunk: po src
David Bruce
dbruce-guest at alioth.debian.org
Mon Oct 12 18:49:57 UTC 2009
Author: dbruce-guest
Date: 2009-10-12 18:49:57 +0000 (Mon, 12 Oct 2009)
New Revision: 1584
Modified:
tuxmath/trunk/po/ar.gmo
tuxmath/trunk/po/ar.po
tuxmath/trunk/po/cs.gmo
tuxmath/trunk/po/cs.po
tuxmath/trunk/po/de.gmo
tuxmath/trunk/po/de.po
tuxmath/trunk/po/en at boldquot.gmo
tuxmath/trunk/po/en at boldquot.po
tuxmath/trunk/po/en at quot.gmo
tuxmath/trunk/po/en at quot.po
tuxmath/trunk/po/en_GB.gmo
tuxmath/trunk/po/en_GB.po
tuxmath/trunk/po/es.gmo
tuxmath/trunk/po/es.po
tuxmath/trunk/po/fi.gmo
tuxmath/trunk/po/fi.po
tuxmath/trunk/po/fr.gmo
tuxmath/trunk/po/fr.po
tuxmath/trunk/po/ga.gmo
tuxmath/trunk/po/ga.po
tuxmath/trunk/po/he.gmo
tuxmath/trunk/po/he.po
tuxmath/trunk/po/hu.gmo
tuxmath/trunk/po/hu.po
tuxmath/trunk/po/it.gmo
tuxmath/trunk/po/it.po
tuxmath/trunk/po/ja.gmo
tuxmath/trunk/po/ja.po
tuxmath/trunk/po/nb.gmo
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nl.gmo
tuxmath/trunk/po/nl.po
tuxmath/trunk/po/nn.gmo
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/oc.gmo
tuxmath/trunk/po/oc.po
tuxmath/trunk/po/pl.gmo
tuxmath/trunk/po/pl.po
tuxmath/trunk/po/pt.gmo
tuxmath/trunk/po/pt.po
tuxmath/trunk/po/pt_BR.gmo
tuxmath/trunk/po/pt_BR.po
tuxmath/trunk/po/ru.gmo
tuxmath/trunk/po/ru.po
tuxmath/trunk/po/sk.gmo
tuxmath/trunk/po/sk.po
tuxmath/trunk/po/sv.gmo
tuxmath/trunk/po/sv.po
tuxmath/trunk/po/tr.gmo
tuxmath/trunk/po/tr.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/po/zam.po
tuxmath/trunk/po/zh_CN.gmo
tuxmath/trunk/po/zh_CN.po
tuxmath/trunk/src/game.c
tuxmath/trunk/src/mathcards.c
tuxmath/trunk/src/mathcards.h
Log:
replaced old debug statements with new run-time system in mathcards.c/h
Modified: tuxmath/trunk/po/ar.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ar.po
===================================================================
--- tuxmath/trunk/po/ar.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/ar.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -236,108 +236,108 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "مرحبا بكم في tuxmath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "مهمتكم هو انقاذ"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "اكواخ البطاريق من"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "المذنبات المتساقطة."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "أوقف المذنب بكتابة"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "الجواب على مشكلة الرياضيات"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "والضغط على زر اﻷدخال او المساقة"
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "جربها الآن!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "رميه جيده!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "اذا اصيب كوخ اﻷسكيمو"
-#: src/game.c:1046
+#: src/game.c:1044
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "فسيذاب ولكن لا تقلق"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "البطريق بخير!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "اﻷن شاهد ما يحدث :"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(الصحافة مفتاح البدأ)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "اشعار الاجابه"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "اما اذا صدم مرة أخرى"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "فأن البطريق سيغادر."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(اضغط اى مفتاح عندما تستعد)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "يمكنك اصلاح اكواخ الاسكيمو"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "بوقف مكافاه المذنبات."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "انطلق الآن!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "رائع!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "يمكنك الخروج اى وقت بالضغط على"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "'ESC' أو 'X'"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "في الركن الايمن العلوي."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "افعلها اﻷن, ثم ابدأ اللعب !"
Modified: tuxmath/trunk/po/cs.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/cs.po
===================================================================
--- tuxmath/trunk/po/cs.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/cs.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -241,107 +241,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/de.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/de.po
===================================================================
--- tuxmath/trunk/po/de.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/de.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -238,108 +238,108 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Willkommen bei TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Deine Mission besteht darin, "
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "die Iglus der Pinguine vor den "
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "herabfallenden Kometen zu schützen."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Stoppe einen Kometen, indem du "
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "die Antwort auf das mathematische Problem"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "eingibst und die \"Leertaste\" oder \"Enter\" drückst. "
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Versuch es jetzt!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Guter Schuß!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Wenn ein Iglu von einem Kometen getroffen wird, "
-#: src/game.c:1046
+#: src/game.c:1044
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "schmilzt es. Aber keine Angst, dem "
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "Pingiun geht es gut!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Sie einfach zu was passiert "
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Eine Taste zum starten drücken)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Beachte die Antwort"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "wenn es noch einmal getroffen wird, "
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "wird der Pinguin verschwinden."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Wenn fertig, bitte Taste drücken)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "Du kannst die kaputten Iglus reparieren"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "wenn du Bonus-Kometen aufhälst."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Knall ihn jetzt ab!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Super Arbeit!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Beende das Spiel zu jeder Zeit durch Drücken von "
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "'Esc' oder durch klicken auf das 'X'"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "in der oberen rechten Ecke."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Tu es jetzt - und dann spiele!"
Modified: tuxmath/trunk/po/en at boldquot.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/en at boldquot.po
===================================================================
--- tuxmath/trunk/po/en at boldquot.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/en at boldquot.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -31,8 +31,8 @@
msgstr ""
"Project-Id-Version: tuxmath 1.7.3\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-10-11 20:04-0500\n"
-"PO-Revision-Date: 2009-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-0500\n"
+"PO-Revision-Date: 2009-10-12 09:25-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -293,107 +293,107 @@
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Welcome to TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Your mission is to save your"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "penguins' igloos from the"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "falling comets."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Stop a comet by typing"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "the answer to the math problem"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "and hitting ‘[1mspace[0m’ or 'enter'."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Try it now!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Good shot!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "If an igloo gets hit by a comet,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "it melts. But don't worry: the"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "penguin is OK!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Just watch what happens:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Press a key to start)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Notice the answer"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "If it gets hit again, the"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "penguin leaves."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Press a key when ready)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "You can fix the igloos"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "by stopping bonus comets."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Zap it now!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Great job!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Quit at any time by pressing"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "‘[1mEsc[0m’ or clicking the ‘[1mX[0m’"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "in the upper right corner."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
Modified: tuxmath/trunk/po/en at quot.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/en at quot.po
===================================================================
--- tuxmath/trunk/po/en at quot.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/en at quot.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -28,8 +28,8 @@
msgstr ""
"Project-Id-Version: tuxmath 1.7.3\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-10-11 20:04-0500\n"
-"PO-Revision-Date: 2009-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-0500\n"
+"PO-Revision-Date: 2009-10-12 09:25-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -290,107 +290,107 @@
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Welcome to TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Your mission is to save your"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "penguins' igloos from the"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "falling comets."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Stop a comet by typing"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "the answer to the math problem"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "and hitting ‘space’ or 'enter'."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Try it now!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Good shot!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "If an igloo gets hit by a comet,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "it melts. But don't worry: the"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "penguin is OK!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Just watch what happens:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Press a key to start)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Notice the answer"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "If it gets hit again, the"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "penguin leaves."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Press a key when ready)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "You can fix the igloos"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "by stopping bonus comets."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Zap it now!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Great job!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Quit at any time by pressing"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "‘Esc’ or clicking the ‘X’"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "in the upper right corner."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
Modified: tuxmath/trunk/po/en_GB.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/en_GB.po
===================================================================
--- tuxmath/trunk/po/en_GB.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/en_GB.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -270,107 +270,107 @@
"to split it. Destroy fractions that can not be further simplified in a "
"single shot!"
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Welcome to TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Your mission is to save your"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "penguins’ igloos from the"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "falling comets."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Stop a comet by typing"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "the answer to the maths problem"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "and hitting ‘space’ or ‘enter’."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Try it now!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Good shot!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "If an igloo gets hit by a comet,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "it melts. But don’t worry: the"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "penguin is OK!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Just watch what happens:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Press a key to start)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Notice the answer"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "If it gets hit again, the"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "penguin leaves."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Press a key when ready)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "You can fix the igloos"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "by stopping bonus comets."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Zap it now!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Great job!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Quit at any time by pressing"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "‘Esc’ or clicking the ‘X’"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "in the upper right corner."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
Modified: tuxmath/trunk/po/es.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/es.po
===================================================================
--- tuxmath/trunk/po/es.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/es.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -239,108 +239,108 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "bien benido a tuxmath"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "tu mision es salvar"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "los igloos de tus pinguinos"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "de los cometas que caen"
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "para parar el cometa"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "debes teclar la respuesta correcta al problema matematico"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "y oprimir la decla de espacio"
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "tratalo ahora"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "buen tiro"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "si uno de los igloos es derramado por el cometa"
-#: src/game.c:1046
+#: src/game.c:1044
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "se derritira, pero no te preocupes"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "que el pinguino estara asalvo"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "observa lo que sucede"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "aprieta una tecla para empezar"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "nota la respuesta"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "si el igloo es pegado por el cometa de nuevo "
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "el pinguino se va"
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "aprieta una tecla cuando estes listo "
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr " tu puedes areglar los igloos"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr " si logras parrar a los cometas de bono"
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "disparale ahora"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "bien hecho"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "si quieres parrarel juego en cualquier momento"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "lo puedes hacer oprimiendo la tecla de ESC or la x en la pantalla"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "en la equinq derecha"
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "haclo ahora y luego juega"
Modified: tuxmath/trunk/po/fi.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/fi.po
===================================================================
--- tuxmath/trunk/po/fi.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/fi.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -243,107 +243,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/fr.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/fr.po
===================================================================
--- tuxmath/trunk/po/fr.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/fr.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -239,107 +239,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/ga.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ga.po
===================================================================
--- tuxmath/trunk/po/ga.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/ga.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -238,107 +238,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Fáilte go TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "An cúram atá agat ná"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "Ãoglúanna do phiongain a chosaint"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "ó na réalta mhongach atá ag titim anuas."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Stad réalt mhongach trà an"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "freagra don ceist mata a chlóscrÃobh"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "agus brúigh 'bearna' nó 'isteach'."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Imir anois é!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Amas iontach!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Má bhuaileann réalt mhongach Ãoglú,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "leáitear é. Ach ná bà buartha:"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "tá an phiogain togha!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Féach cad a tharlaÃonn:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Brúigh cnaipe chun tosú)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Tabhair faoi deara an freagra"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "Má bhuailfà arÃs é,"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "fágann an piongain."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Brúigh cnaipe ar bith nuair atá tú réidh)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "Is fédir na hioglúanna a dheisiú"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "trà réalta mhongach breise a stadadh."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Buail anois é!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Maith thú!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Scoir ag am ar bith trà brúigh"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "'Esc' nó brúigh an 'X'"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "sa chúinne uachtarach ar dheis."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Déan anois é, agus ansin imir!"
Modified: tuxmath/trunk/po/he.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/he.po
===================================================================
--- tuxmath/trunk/po/he.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/he.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -247,107 +247,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "ברוכים הבאים לטאקסמטיקה!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "מטרתך היא להציל את"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "הפינגווינים שלך מפני"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "הכוכבים הנופלים."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "תוכל להדוף כוכב על ידי"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "הקלדת התשובה לבעיה המתמטית"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "ולחיצה על 'רווח' או 'Enter'."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "נסה זאת כעת!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "פגיעה יפה!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "אם פוגע כוכב באיגלו,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "האיגלו נמס. אך אל דאגה:"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "הפינגווינים בסדר גמור!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "פשוט שים לב מה קורה:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(לחץ על מקש להתחלה)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "שים לב לתשובה"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "אם האיגלו נפגע שוב,"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "הפינגווין עוזב."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(לחץ על מקש כשאתה מוכן)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "תוכלו לתקן את האיגלואים"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "על ידי הדיפת כוכבי בונוס."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "תירה בו כעת!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "עבודה יפה!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "תוכל לצאת בכל על על ידי"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "לחיצה על 'Esc' או על ה־'X'"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "בפינה השמאלית העליונה."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "עשה זאת כעת, שחק לאחר מכן!"
Modified: tuxmath/trunk/po/hu.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/hu.po
===================================================================
--- tuxmath/trunk/po/hu.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/hu.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -238,108 +238,108 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Üdvözöllek a TuxMath-ban!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Küldetésed a pingvinek"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "jégkunyhóinak megvédése"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "az aláhulló meteoritoktól."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Gépeld be a matematikai feladat "
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "eredményét, és üss Enter-t"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "a meteor megállításához!"
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Próbáld meg most!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Szép lövés!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Ha egy jégkunyhót eltalál"
-#: src/game.c:1046
+#: src/game.c:1044
#, fuzzy
msgid "it melts. But don't worry: the"
msgstr "egy meteor, megolvad, de a"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "pingvinnek még nem lesz baja!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Nézd, mi történik:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Nyomj meg egy gombot!)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Látod a választ?"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "A második találat után"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "a pingvin elmenekül."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Nyomj meg egy gombot!)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "A jégkunyhókat a bónusz meteorok"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "szétlövésével javíthatod meg."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Adj neki!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Szép munka!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Akármikor kiléphetsz az 'ESC'"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "gomb megnyomásával, vagy "
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "az 'X'-re való kattintással."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Lépj ki, és kezdd a játékot!"
Modified: tuxmath/trunk/po/it.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/it.po
===================================================================
--- tuxmath/trunk/po/it.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/it.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -246,107 +246,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/ja.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ja.po
===================================================================
--- tuxmath/trunk/po/ja.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/ja.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -244,107 +244,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/nb.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/nb.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -241,107 +241,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Velkommen til TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Oppdraget ditt er å redde"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "igloene til pingvinene fra"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "kometer fra verdensrommet."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Du kan stoppe en komet ved"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "å skrive inn svaret, og så"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "«Mellomrom» eller «Enter»."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Prøv det nå!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Bra skudd!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Hvis en iglo blir truffet av en"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "komet, smelter den. Men ta det"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "med ro: pingvinen klarer seg!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Berre se hva som skjer."
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Trykk en tast for å se.)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Legg merke til rett svar."
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "Hvis igloen blir truffet på nytt,"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "vandrer pingvinen bort."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Trykk en tast når du er klar.)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "Du kan bygge opp igjen igloene"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "ved å stoppe bonuskometer."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Skyt kometen nå!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Kjempebra!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Du kan når som helst gi deg,"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "ved å trykke «Escape» eller"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "klikke på X-en oppe til høyre."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Prøv det nå, og start spillet!"
Modified: tuxmath/trunk/po/nl.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/nl.po
===================================================================
--- tuxmath/trunk/po/nl.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/nl.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -239,107 +239,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/nn.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/nn.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -271,107 +271,107 @@
"eller «Mellomrom» for å dela han. Øydelegg brøkar som ikkje kan forenklast "
"med eit enkeltskot."
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Velkommen til TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Oppdraget ditt er å redda"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "igloane til pingvinane frå"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "kometar frå verdsrommet."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Du kan stoppa ein komet ved"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "å skriva inn svaret, og så"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "«Mellomrom» eller «Enter»."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Prøv det no!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Bra skot!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Viss ein iglo vert treft av ein"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "komet, smeltar han. Men ta det"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "med ro: pingvinen klarer seg!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Berre sjå kva som skjer."
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Trykk ein tast for å sjå.)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Legg merke til rett svar."
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "Viss igloen vert treft på nytt,"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "vandrar pingvinen vekk."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Trykk ein tast når du er klar.)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "Du kan byggja opp att igloane"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "ved å stoppa bonuskometar."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Skyt kometen no!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Kjempebra!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Du kan når som helst gje deg,"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "ved å trykkja «Escape» eller"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "klikka på X-en oppe til høgre."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Prøv det no, og start spelet!"
Modified: tuxmath/trunk/po/oc.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/oc.po
===================================================================
--- tuxmath/trunk/po/oc.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/oc.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -243,107 +243,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/pl.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/pl.po
===================================================================
--- tuxmath/trunk/po/pl.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/pl.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -246,107 +246,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/pt.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/pt.po
===================================================================
--- tuxmath/trunk/po/pt.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/pt.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -245,107 +245,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/pt_BR.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/pt_BR.po
===================================================================
--- tuxmath/trunk/po/pt_BR.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/pt_BR.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -247,107 +247,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/ru.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ru.po
===================================================================
--- tuxmath/trunk/po/ru.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/ru.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -244,107 +244,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/sk.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/sk.po
===================================================================
--- tuxmath/trunk/po/sk.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/sk.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -244,107 +244,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/sv.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/sv.po
===================================================================
--- tuxmath/trunk/po/sv.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/sv.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -246,107 +246,107 @@
msgstr ""
"för att dela det. Förstör bråken som inte kan förenklas mer i ett enda skott!"
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Välkommen till TuxMath!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Ditt uppdrag är att rädda dina"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "pingviners igloos från"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "fallande kometer."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Stoppa en komet genom att"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "skriva in svaret på matteproblemet,"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "trycka på \"blanksteg\" eller \"Enter\"."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Prova det nu!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Bra skjutet!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Om en igloo träffas av en komet,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "så smälter den. Men var lugn,"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "pingvinen är OK!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Se vad som händer:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Tryck på en tangent)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Observera svaret"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "Om den blir träffad igen,"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "kommer pingvinen att gå."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Tryck på en tangent)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "Du kan bygga nya igloos"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "genom att stoppa bonuskometer."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Skjut den nu!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Bra jobbat!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Avsluta när du vill genom att"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "trycka \"Esc\" eller klicka på \"X\""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "i övre högra hörnet."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Gör det nu och spela sedan!"
Modified: tuxmath/trunk/po/tr.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/tr.po
===================================================================
--- tuxmath/trunk/po/tr.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/tr.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -244,107 +244,107 @@
msgstr ""
"parçalayın. Daha fazla basitleştirilemeyen kesirleri tek bir atışta yok et!"
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "TuxMath'e Hoş Geldin!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Görevin penguenlerin evlerini"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "düşen kuyruklu yıldızlardan"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "korumak."
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "Kuyruklu yıldızı durdurmak için"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "matematik probleminin yanıtını yaz"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "ve 'boşluk' ya da 'enter' tuşuna bas."
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "Şimdi dene!"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "İyi atış!"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "Eğer bir ev kuyruklu yıldız tarafından"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "vurulursa erir. Ama merak etme :"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "içindeki penguene zarar gelmez!"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "Yalnız ne olduğunu izle:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(Başlamak için bir tuşa bas)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "Yanıta dikkat et"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "Eğer ev tekrar vurulursa,"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "içindeki penguen evi terk eder."
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(Hazır olunca herhangi bir tuşa basın)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "Ek kuyruklu yıldızları durdurarak"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "evlerini tamir edebilirsin."
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "Hemen vur onu!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "İyi iş!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "Her an 'Esc'e basarak ya da"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "sağ üst köşedeki 'X'e"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "tıklayarak çıkabilirsin."
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "Hemen şimdi yap ve sonra oyna!"
Modified: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/tuxmath.pot 2009-10-12 18:49:57 UTC (rev 1584)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxmath 1.7.3\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -239,107 +239,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr ""
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr ""
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr ""
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr ""
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr ""
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr ""
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr ""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr ""
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr ""
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr ""
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr ""
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr ""
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr ""
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr ""
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr ""
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr ""
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr ""
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr ""
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr ""
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr ""
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr ""
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr ""
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr ""
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr ""
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr ""
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr ""
Modified: tuxmath/trunk/po/zam.po
===================================================================
--- tuxmath/trunk/po/zam.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/zam.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-0500\n"
"PO-Revision-Date: 2009-09-23 17:52-0600\n"
"Last-Translator: Rodrigo Perez <rodpera at yahoo.com>\n"
"Language-Team: espanol <LL at li.org>\n"
@@ -243,107 +243,107 @@
"single shot!"
msgstr ""
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "Vestaá diiefluú TuxMath"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "Naá kiÃn ruúl tree"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "los igloos de tus pinguinos"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "Beél kià de laá "
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "luhus Beél kii"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "debes teclar la respuesta correcta al problema matematico"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "Gaás \"enter\" o \"barra espaciadora\""
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "taá diif beés"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "Vesta bluú vi lil"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "si uno de los igloos es derramado por el cometa"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "Luús ha, naá sieéb luú"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "que el pinguino estara asalvo"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "GÃŒii koo bshaaÂŽk "
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "Gaás kuue paar tetél "
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "nota la respuesta"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "si el igloo es pegado por el cometa de nuevo "
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "el pinguino se va"
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "aprieta una tecla cuando estes listo "
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr " tu puedes areglar los igloos"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr " si logras parrar a los cometas de bono"
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "diis ah"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "Vaá kaá liÃl lÃ"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "si quieres parrarel juego en cualquier momento"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "lo puedes hacer oprimiendo la tecla de ESC or la x en la pantalla"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "en la equinq derecha"
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "LiÃy naál, será kiid"
Modified: tuxmath/trunk/po/zh_CN.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/zh_CN.po
===================================================================
--- tuxmath/trunk/po/zh_CN.po 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/po/zh_CN.po 2009-10-12 18:49:57 UTC (rev 1584)
@@ -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-10-11 20:04-0500\n"
+"POT-Creation-Date: 2009-10-12 09:25-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"
@@ -253,107 +253,107 @@
"single shot!"
msgstr "分解它。"
-#: src/game.c:986
+#: src/game.c:984
msgid "Welcome to TuxMath!"
msgstr "欢迎来到TuxMax!"
-#: src/game.c:1003
+#: src/game.c:1001
msgid "Your mission is to save your"
msgstr "你的任务是保护你的"
-#: src/game.c:1004
+#: src/game.c:1002
msgid "penguins' igloos from the"
msgstr "企鹅的小屋"
-#: src/game.c:1005
+#: src/game.c:1003
msgid "falling comets."
msgstr "正在降落的彗星。"
-#: src/game.c:1024
+#: src/game.c:1022
msgid "Stop a comet by typing"
msgstr "要制止彗星的话，按"
-#: src/game.c:1025
+#: src/game.c:1023
msgid "the answer to the math problem"
msgstr "数学问题的答案"
-#: src/game.c:1026
+#: src/game.c:1024
msgid "and hitting 'space' or 'enter'."
msgstr "按空格或回车键"
-#: src/game.c:1027
+#: src/game.c:1025
msgid "Try it now!"
msgstr "现在就试一试吧！"
-#: src/game.c:1035
+#: src/game.c:1033
msgid "Good shot!"
msgstr "打的好！"
-#: src/game.c:1045
+#: src/game.c:1043
msgid "If an igloo gets hit by a comet,"
msgstr "如果一个小屋被彗星击中的话,"
-#: src/game.c:1046
+#: src/game.c:1044
msgid "it melts. But don't worry: the"
msgstr "如果融化的话，别担心:"
-#: src/game.c:1047
+#: src/game.c:1045
msgid "penguin is OK!"
msgstr "企鹅正常！"
-#: src/game.c:1048
+#: src/game.c:1046
msgid "Just watch what happens:"
msgstr "只要观察发生了什么:"
-#: src/game.c:1049
+#: src/game.c:1047
msgid "(Press a key to start)"
msgstr "(按任意键开始)"
-#: src/game.c:1062
+#: src/game.c:1060
msgid "Notice the answer"
msgstr "注意答案"
-#: src/game.c:1072
+#: src/game.c:1070
msgid "If it gets hit again, the"
msgstr "如果再次被击中的话，"
-#: src/game.c:1073
+#: src/game.c:1071
msgid "penguin leaves."
msgstr "企鹅离开了。"
-#: src/game.c:1074
+#: src/game.c:1072
msgid "(Press a key when ready)"
msgstr "(准备好后按任意键)"
-#: src/game.c:1097
+#: src/game.c:1095
msgid "You can fix the igloos"
msgstr "你可以修复小屋"
-#: src/game.c:1098
+#: src/game.c:1096
msgid "by stopping bonus comets."
msgstr "通过停止奖励的彗星"
-#: src/game.c:1109
+#: src/game.c:1107
msgid "Zap it now!"
msgstr "现在攻击!"
-#: src/game.c:1115
+#: src/game.c:1113
msgid "Great job!"
msgstr "干的好!"
-#: src/game.c:1133
+#: src/game.c:1131
msgid "Quit at any time by pressing"
msgstr "任何时间退出，按"
-#: src/game.c:1134
+#: src/game.c:1132
msgid "'Esc' or clicking the 'X'"
msgstr "按'Esc'键或点击'X'"
-#: src/game.c:1135
+#: src/game.c:1133
msgid "in the upper right corner."
msgstr "在右上角"
-#: src/game.c:1136
+#: src/game.c:1134
msgid "Do it now, and then play!"
msgstr "现在就做，开始吧！"
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/src/game.c 2009-10-12 18:49:57 UTC (rev 1584)
@@ -194,8 +194,6 @@
static void reset_comets(void);
static int num_comets_alive(void);
-static void copy_card(MC_FlashCard* src, MC_FlashCard* dest);
-
static void game_mouse_event(SDL_Event event);
static void game_key_event(SDLKey key);
static void free_on_exit(void);
@@ -2862,7 +2860,7 @@
if(Opts_LanMode())
{
- copy_card(&(quest_queue[q_found]), &(comets[com_found].flashcard));
+ MC_CopyCard(&(quest_queue[q_found]), &(comets[com_found].flashcard));
MC_ResetFlashCard(&(quest_queue[q_found]));
}
else // Not LAN mode - just get question with direct call:
@@ -3703,21 +3701,6 @@
}
-void copy_card(MC_FlashCard* src, MC_FlashCard* dest)
-{
- if (!src || !dest)
- return;
- mcdprintf("Copying '%s' to '%s', ", src->formula_string,dest->formula_string);
- mcdprintf("copying '%s' to '%s'\n", src->answer_string, dest->answer_string);
- strncpy(dest->formula_string, src->formula_string, MC_FORMULA_LEN);
- strncpy(dest->answer_string, src->answer_string, MC_ANSWER_LEN);
- mcdprintf("Card is: '%s', '%s'\n", dest->formula_string, dest->answer_string);
- dest->answer = src->answer;
- dest->difficulty = src->difficulty;
- dest->question_id = src->question_id;
-}
-
-
void print_status(void)
{
int i;
Modified: tuxmath/trunk/src/mathcards.c
===================================================================
--- tuxmath/trunk/src/mathcards.c 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/src/mathcards.c 2009-10-12 18:49:57 UTC (rev 1584)
@@ -201,7 +201,7 @@
int length_time_per_question_list = 0;
int length_alloc_time_per_question_list = 0;
-const MC_FlashCard DEFAULT_CARD = {0,0,0,0}; //empty card to signal error
+const MC_FlashCard DEFAULT_CARD = {{'\0'}, {'\0'}, 0, 0, 0}; //empty card to signal error
/* "private" function prototypes: */
/* */
@@ -213,7 +213,7 @@
static void clear_negatives(void);
//static int validate_question(int n1, int n2, int n3);
//static MC_MathQuestion* create_node(int n1, int n2, int op, int ans, int f);
-static MC_MathQuestion* create_node_from_card(const MC_FlashCard* flashcard);
+//static MC_MathQuestion* create_node_from_card(const MC_FlashCard* flashcard);
static MC_MathQuestion* create_node_copy(MC_MathQuestion* other);
static MC_MathQuestion* insert_node(MC_MathQuestion* first, MC_MathQuestion* current, MC_MathQuestion* new_node);
static MC_MathQuestion* append_node(MC_MathQuestion* list, MC_MathQuestion* new_node);
@@ -223,29 +223,26 @@
static int list_length(MC_MathQuestion* list);
static int randomize_list(MC_MathQuestion** list);
-int comp_randomizer(const void *a, const void *b);
+int comp_randomizer(const void* a, const void* b);
static MC_MathQuestion* pick_random(int length, MC_MathQuestion* list);
static int compare_node(MC_MathQuestion* first, MC_MathQuestion* other);
static int already_in_list(MC_MathQuestion* list, MC_MathQuestion* ptr);
//static int int_to_bool(int i);
//static int sane_value(int i);
//static int abs_value(int i);
-static int floatCompare(const void *v1,const void *v2);
+static int floatCompare(const void* v1,const void* v2);
static void print_list(FILE* fp,MC_MathQuestion* list);
void print_vect_list(FILE* fp, MC_MathQuestion** vect, int length);
-/* these functions are dead code unless compiling with debug turned on: */
-#ifdef MC_DEBUG
static void print_counters(void);
//static MC_FlashCard create_card_from_node(MC_MathQuestion* node);
-#endif
+
/* Functions for new mathcards architecture */
static void free_node(MC_MathQuestion* mq); //wrapper for free() that also frees card
static MC_FlashCard generate_random_flashcard(void);
static MC_FlashCard generate_random_ooo_card_of_length(int length, int reformat);
-static void copy_card(const MC_FlashCard* src, MC_FlashCard* dest); //deep copy a flashcard
static MC_MathQuestion* allocate_node(void); //allocate space for a node
static int compare_card(const MC_FlashCard* a, const MC_FlashCard* b); //test for identical cards
static int find_divisor(int a); //return a random positive divisor of a
@@ -265,16 +262,17 @@
{
int i;
- mcdprintf("\nEntering MC_Initialize()");
+ DEBUGMSG(debug_mathcards,"\nEntering MC_Initialize()");
/* check flag to see if we did this already */
if (initialized)
{
- #ifdef MC_DEBUG
- printf("\nAlready initialized");
- MC_PrintMathOptions(stdout, 0);
- printf("\nLeaving MC_Initialize()\n");
- #endif
+ DEBUGCODE(debug_mathcards)
+ {
+ printf("\nAlready initialized");
+ MC_PrintMathOptions(stdout, 0);
+ printf("\nLeaving MC_Initialize()\n");
+ }
return 1;
}
@@ -282,8 +280,8 @@
/* bail out if no struct */
if (!math_opts)
{
- mcdprintf("\nError: malloc couldn't allocate math_opts for some reason\n");
- mcdprintf("\nLeaving MC_Initialize()\n");
+ DEBUGMSG(debug_mathcards,"\nError: malloc couldn't allocate math_opts for some reason\n");
+ DEBUGMSG(debug_mathcards,"\nLeaving MC_Initialize()\n");
fprintf(stderr, "\nUnable to initialize math_options");
return 0;
@@ -303,10 +301,11 @@
initialized = 1;
- #ifdef MC_DEBUG
- MC_PrintMathOptions(stdout, 0);
- printf("\nLeaving MC_Initialize()\n");
- #endif
+ DEBUGCODE(debug_mathcards)
+ {
+ MC_PrintMathOptions(stdout, 0);
+ printf("\nLeaving MC_Initialize()\n");
+ }
return 1;
}
@@ -322,21 +321,21 @@
int MC_StartGame(void)
{
- mcdprintf("\nEntering MC_StartGame()");
+ DEBUGMSG(debug_mathcards,"\nEntering MC_StartGame()");
/* if math_opts not set up yet, initialize it: */
if (!initialized)
{
- mcdprintf("\nNot initialized - calling MC_Initialize()");
+ DEBUGMSG(debug_mathcards, "\nNot initialized - calling MC_Initialize()");
MC_Initialize();
}
if (!math_opts)
{
- mcdprintf("\nCould not initialize - bailing out");
- mcdprintf("\nLeaving MC_StartGame()\n");
+ DEBUGMSG(debug_mathcards, "\nCould not initialize - bailing out");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_StartGame()\n");
return 0;
}
@@ -382,15 +381,15 @@
/* make sure list now exists and has non-zero length: */
if (question_list && quest_list_length)
{
- mcdprintf("\nGame set up successfully");
- mcdprintf("\nLeaving MC_StartGame()\n");
+ DEBUGMSG(debug_mathcards, "\nGame set up successfully");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_StartGame()\n");
return 1;
}
else
{
- mcdprintf("\nGame NOT set up successfully - no valid list");
- mcdprintf("\nLeaving MC_StartGame()\n");
+ DEBUGMSG(debug_mathcards, "\nGame NOT set up successfully - no valid list");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_StartGame()\n");
return 0;
}
@@ -406,7 +405,7 @@
/* valid wrong question list? */
int MC_StartGameUsingWrongs(void)
{
- mcdprintf("\nEntering MC_StartGameUsingWrongs()");
+ DEBUGMSG(debug_mathcards, "\nEntering MC_StartGameUsingWrongs()");
/* Note: if not initialized, control will pass to */
/* MC_StartGame() via else clause so don't need to test */
@@ -414,8 +413,8 @@
if (wrong_quests &&
list_length(wrong_quests))
{
- mcdprintf("\nNon-zero length wrong_quests list found, will");
- mcdprintf("\nuse for new game list:");
+ DEBUGMSG(debug_mathcards, "\nNon-zero length wrong_quests list found, will");
+ DEBUGMSG(debug_mathcards, "\nuse for new game list:");
/* initialize lists for new game: */
delete_list(question_list);
@@ -448,8 +447,8 @@
else /* if no wrong_quests list, go to MC_StartGame() */
/* to set up list based on math_opts */
{
- mcdprintf("\nNo wrong questions to review - generate list from math_opts\n");
- mcdprintf("\nLeaving MC_StartGameUsingWrongs()\n");
+ DEBUGMSG(debug_mathcards, "\nNo wrong questions to review - generate list from math_opts\n");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_StartGameUsingWrongs()\n");
return MC_StartGame();
}
@@ -465,7 +464,7 @@
/* or if argument pointer is invalid. */
int MC_NextQuestion(MC_FlashCard* fc)
{
- mcdprintf("\nEntering MC_NextQuestion()\n");
+ DEBUGMSG(debug_mathcards, "\nEntering MC_NextQuestion()\n");
/* (so we can move the node into active_quests:) */
MC_MathQuestion* ptr;
@@ -473,7 +472,7 @@
if (!fc )
{
fprintf(stderr, "\nNull MC_FlashCard* argument!\n");
- mcdprintf("\nLeaving MC_NextQuestion()\n");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_NextQuestion()\n");
return 0;
}
@@ -481,14 +480,14 @@
/* !next_question || */
!list_length(question_list) )
{
- mcdprintf("\nquestion_list invalid or empty");
- mcdprintf("\nLeaving MC_NextQuestion()\n");
+ DEBUGMSG(debug_mathcards, "\nquestion_list invalid or empty");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_NextQuestion()\n");
return 0;
}
/* 'draw' - copy over the first question */
- copy_card(&question_list->card, fc);
+ MC_CopyCard(&question_list->card, fc);
/* take first question node out of list and move it into active_quests list: */
ptr = question_list;
@@ -515,7 +514,7 @@
/* correctly. Returns 1 if no errors. */
int MC_AnsweredCorrectly(int id)
{
- mcdprintf("\nEntering MC_AnsweredCorrectly()");
+ DEBUGMSG(debug_mathcards, "\nEntering MC_AnsweredCorrectly()");
MC_MathQuestion* quest = NULL;
@@ -525,7 +524,7 @@
return 0;
}
- mcdprintf("\nQuestion id was: %d\n", id);
+ DEBUGMSG(debug_mathcards, "\nQuestion id was: %d\n", id);
//First take the question out of the active_quests list
quest = active_quests;
@@ -538,7 +537,8 @@
return 0;
}
- if (debug_status & debug_mathcards) {
+ DEBUGCODE(debug_mathcards)
+ {
printf("\nQuestion was:");
print_card(quest->card);
}
@@ -553,7 +553,7 @@
if (!math_opts->iopts[PLAY_THROUGH_LIST])
/* reinsert question into question list at random location */
{
- mcdprintf("\nReinserting question into list");
+ DEBUGMSG(debug_mathcards, "\nReinserting question into list");
MC_MathQuestion* rand_spot;
/* put it into list */
@@ -565,13 +565,14 @@
}
else
{
- mcdprintf("\nNot reinserting question into list");
+ DEBUGMSG(debug_mathcards, "\nNot reinserting question into list");
free_node(quest);
/* not recycling questions so fewer questions remain: */
unanswered--;
}
- if (debug_status & debug_mathcards) {
+ DEBUGCODE(debug_mathcards)
+ {
print_counters();
printf("\nLeaving MC_AnsweredCorrectly()\n");
}
@@ -590,7 +591,7 @@
/* gets hit by a question, not if they "miss". */
int MC_NotAnsweredCorrectly(int id)
{
- mcdprintf("\nEntering MC_NotAnsweredCorrectly()");
+ DEBUGMSG(debug_mathcards, "\nEntering MC_NotAnsweredCorrectly()");
MC_MathQuestion* quest = NULL;
@@ -600,7 +601,7 @@
return 0;
}
- mcdprintf("\nQuestion id was: %d\n", id);
+ DEBUGMSG(debug_mathcards, "\nQuestion id was: %d\n", id);
//First take the question out of the active_quests list
quest = active_quests;
@@ -613,7 +614,7 @@
return 0;
}
- mcdprintf("\nMatching question is:");
+ DEBUGMSG(debug_mathcards, "\nMatching question is:");
print_card(quest->card);
@@ -624,9 +625,10 @@
MC_MathQuestion* quest_copy;
MC_MathQuestion* rand_loc;
- mcdprintf("\nAdding %d copies to question_list:", math_opts->iopts[COPIES_REPEATED_WRONGS]);
+ DEBUGMSG(debug_mathcards, "\nAdding %d copies to question_list:", math_opts->iopts[COPIES_REPEATED_WRONGS]);
- if (debug_status & debug_mathcards) {
+ DEBUGCODE(debug_mathcards)
+ {
print_counters();
printf("\nLeaving MC_AnsweredCorrectly()\n");
}
@@ -645,7 +647,7 @@
}
else
{
- mcdprintf("\nNot repeating wrong answers\n");
+ DEBUGMSG(debug_mathcards, "\nNot repeating wrong answers\n");
/* not repeating questions so list gets shorter: */
unanswered--;
}
@@ -660,7 +662,7 @@
/* add question to wrong_quests list: */
if (!already_in_list(wrong_quests, quest)) /* avoid duplicates */
{
- mcdprintf("\nAdding to wrong_quests list");
+ DEBUGMSG(debug_mathcards, "\nAdding to wrong_quests list");
wrong_quests = append_node(wrong_quests, quest);
}
else /* avoid memory leak */
@@ -668,7 +670,8 @@
free_node(quest);
}
- if (debug_status & debug_mathcards) {
+ DEBUGCODE(debug_mathcards)
+ {
print_counters();
printf("\nLeaving MC_NotAnswered_Correctly()\n");
}
@@ -734,7 +737,8 @@
if (newsize == 0)
newsize = 100;
newlist = realloc(time_per_question_list, newsize*sizeof(float));
- if (newlist == NULL) {
+ if (newlist == NULL)
+ {
DEBUGMSG(debug_mathcards,"\nError: allocation for time_per_question_list failed\n");
return 0;
}
@@ -888,7 +892,7 @@
}
- mcdprintf("\nEntering MC_PrintMathOptions()\n");
+ DEBUGMSG(debug_mathcards, "\nEntering MC_PrintMathOptions()\n");
/* bail out if no struct */
if (!math_opts)
@@ -903,7 +907,7 @@
fprintf(fp, "%s", vcomments[i]);
fprintf(fp, "%s = %d\n", MC_OPTION_TEXT[i], math_opts->iopts[i]);
}
- mcdprintf("\nLeaving MC_PrintMathOptions()\n");
+ DEBUGMSG(debug_mathcards, "\nLeaving MC_PrintMathOptions()\n");
}
@@ -1016,42 +1020,15 @@
// return 1;
// }
-#if 0 //this code is probably on the way out...
-/* create a new node and return a pointer to it */
-MC_MathQuestion* create_node(int n1, int n2, int op, int ans, int f)
-{
- MC_MathQuestion* ptr = NULL;
- ptr = (MC_MathQuestion*)malloc(sizeof(MC_MathQuestion));
- if (!ptr)
- {
- fprintf(stderr, "create_node() - malloc() failed!\n");
- return NULL;
- }
+// MC_MathQuestion* create_node_from_card(const MC_FlashCard* flashcard)
+// {
+// MC_MathQuestion* ret = allocate_node();
+// MC_CopyCard(flashcard, &(ret->card));
+// return ret;
+// }
- ptr->card = MC_AllocateFlashcard();
- ptr->next = NULL;
- ptr->previous = NULL;
-
- snprintf(ptr->card.formula_string, max_formula_size, "%d %c %d = ?",
- n1, op < MC_NUM_OPERS ? operchars[op] : '\0', n2);
- snprintf(ptr->card.answer_string, max_formula_size, "%d", ans);
- ptr->card.difficulty = 25 * (op + 1);
-
-
- /* ptr should now point to a properly constructed node: */
- return ptr;
-}
-#endif
-
-MC_MathQuestion* create_node_from_card(const MC_FlashCard* flashcard)
-{
- MC_MathQuestion* ret = allocate_node();
- copy_card(flashcard, &(ret->card));
- return ret;
-}
-
// /* FIXME take care of strings */
// /* this one copies the contents, including pointers; both nodes must be allocated */
// int copy_node(MC_MathQuestion* original, MC_MathQuestion* copy)
@@ -1198,11 +1175,11 @@
}
int i = 0;
- mcdprintf("Entering print_vect_list()\n");
+ DEBUGMSG(debug_mathcards, "Entering print_vect_list()\n");
for(i = 0; i < length; i++)
fprintf(fp, "%s\n", vect[i]->card.formula_string);
- mcdprintf("Leaving print_vect_list()\n");
+ DEBUGMSG(debug_mathcards, "Leaving print_vect_list()\n");
}
@@ -1260,7 +1237,7 @@
{
MC_MathQuestion* ret = allocate_node();
if (ret)
- copy_card(&(other->card), &(ret->card) );
+ MC_CopyCard(&(other->card), &(ret->card) );
return ret;
}
@@ -1473,15 +1450,15 @@
Functions for new mathcards architecture
****************************************************/
-void copy_card(const MC_FlashCard* src, MC_FlashCard* dest)
+void MC_CopyCard(const MC_FlashCard* src, MC_FlashCard* dest)
{
if (!src || !dest)
return;
- mcdprintf("Copying '%s' to '%s', ", src->formula_string,dest->formula_string);
- mcdprintf("copying '%s' to '%s'\n", src->answer_string, dest->answer_string);
+ DEBUGMSG(debug_mathcards, "Copying '%s' to '%s', ", src->formula_string,dest->formula_string);
+ DEBUGMSG(debug_mathcards, "copying '%s' to '%s'\n", src->answer_string, dest->answer_string);
strncpy(dest->formula_string, src->formula_string, MC_FORMULA_LEN);
strncpy(dest->answer_string, src->answer_string, MC_ANSWER_LEN);
- mcdprintf("Card is: '%s', '%s'\n", dest->formula_string, dest->answer_string);
+ DEBUGMSG(debug_mathcards, "Card is: '%s', '%s'\n", dest->formula_string, dest->answer_string);
dest->answer = src->answer;
dest->difficulty = src->difficulty;
dest->question_id = src->question_id;
@@ -1527,8 +1504,8 @@
static int generate_random_flashcard_id=0;
generate_random_flashcard_id+=1;
- mcdprintf("Entering generate_random_flashcard()\n");
- mcdprintf("%d\n",generate_random_flashcard_id);
+ DEBUGMSG(debug_mathcards, "Entering generate_random_flashcard()\n");
+ DEBUGMSG(debug_mathcards, "%d\n",generate_random_flashcard_id);
do
pt = rand() % MC_NUM_PTYPES;
while ( (pt == MC_PT_TYPING && !MC_GetOpt(TYPING_PRACTICE_ALLOWED) ) ||
@@ -1541,7 +1518,7 @@
if (pt == MC_PT_TYPING) //typing practice
{
- mcdprintf("Generating typing question\n");
+ DEBUGMSG(debug_mathcards, "Generating typing question\n");
ret = MC_AllocateFlashcard();
num = rand() % (MC_GetOpt(MAX_TYPING_NUM)-MC_GetOpt(MIN_TYPING_NUM) + 1)
+ MC_GetOpt(MIN_TYPING_NUM);
@@ -1553,11 +1530,11 @@
}
else //if (pt == MC_PT_ARITHMETIC)
{
- mcdprintf("Generating arithmetic question");
+ DEBUGMSG(debug_mathcards, "Generating arithmetic question");
length = rand() % (MC_GetOpt(MAX_FORMULA_NUMS) -
MC_GetOpt(MIN_FORMULA_NUMS) + 1) //avoid div by 0
+ MC_GetOpt(MIN_FORMULA_NUMS);
- mcdprintf(" of length %d", length);
+ DEBUGMSG(debug_mathcards, " of length %d", length);
ret = generate_random_ooo_card_of_length(length, 1);
if (debug_status & debug_mathcards) {
@@ -1566,7 +1543,7 @@
}
//TODO comparison problems (e.g. "6 ? 9", "<")
- mcdprintf("Exiting generate_random_flashcard()\n");
+ DEBUGMSG(debug_mathcards, "Exiting generate_random_flashcard()\n");
return ret;
}
@@ -1581,9 +1558,10 @@
otherwise a format is chosen at random.
*/
-/* FIXME this function has to go - it is extremely difficult to follow,
- it is impossible to check for invalid questions, and it really
- cannot be maintained.
+/* FIXME we should consider rewriting this - it currently generates some
+questions with indeterminate answers (e.g. ? * 0 = 0) that seem to be
+impossible to prevent using the current scheme with recursive string
+operations.
*/
MC_FlashCard generate_random_ooo_card_of_length(int length, int reformat)
@@ -1597,18 +1575,18 @@
MC_Operation op;
id += 1;
- mcdprintf(".");
+ DEBUGMSG(debug_mathcards, ".");
if (length > MAX_FORMULA_NUMS)
return DEFAULT_CARD;
if (length <= 2)
{
- mcdprintf("\n");
+ DEBUGMSG(debug_mathcards, "\n");
ret = MC_AllocateFlashcard();
for (op = rand() % MC_NUM_OPERS; //pick a random operation
MC_GetOpt(op + ADDITION_ALLOWED) == 0; //make sure it's allowed
op = rand() % MC_NUM_OPERS);
- mcdprintf("Operation is %c\n", operchars[op]);
+ DEBUGMSG(debug_mathcards, "Operation is %c\n", operchars[op]);
/*
if (op == MC_OPER_ADD)
{
@@ -1639,7 +1617,7 @@
*/
if (op > MC_OPER_DIV || op < MC_OPER_ADD)
{
- mcdprintf("Invalid operator: value %d\n", op);
+ DEBUGMSG(debug_mathcards, "Invalid operator: value %d\n", op);
return DEFAULT_CARD;
}
//choose two numbers in the proper range and get their result
@@ -1666,13 +1644,13 @@
} while ( (ans < 0 && !MC_GetOpt(ALLOW_NEGATIVES)) || ans > MC_GetOpt(MAX_ANSWER) );
- mcdprintf("Constructing answer_string\n");
+ DEBUGMSG(debug_mathcards, "Constructing answer_string\n");
snprintf(ret.answer_string, MC_ANSWER_LEN, "%d", ans);
- mcdprintf("Constructing formula_string\n");
+ DEBUGMSG(debug_mathcards, "Constructing formula_string\n");
snprintf(ret.formula_string, MC_FORMULA_LEN, "%d %c %d",
r1, operchars[op], r2);
ret.answer = ans;
- mcdprintf("int answer is %d\n", ret.answer);
+ DEBUGMSG(debug_mathcards, "int answer is %d\n", ret.answer);
ret.difficulty = op + 1;
}
@@ -1698,7 +1676,7 @@
MC_GetOpt(op + ADDITION_ALLOWED) == 0; //make sure it's allowed
op = rand() % MC_NUM_OPERS);
}
- mcdprintf("Next operation is %c,", operchars[op]);
+ DEBUGMSG(debug_mathcards, "Next operation is %c,", operchars[op]);
//pick the next operand
if (op == MC_OPER_ADD)
@@ -1725,8 +1703,8 @@
{
; //invalid operator
}
- mcdprintf(" operand is %d\n", r1);
- mcdprintf("Answer: %d\n", ret.answer);
+ DEBUGMSG(debug_mathcards, " operand is %d\n", r1);
+ DEBUGMSG(debug_mathcards, "Answer: %d\n", ret.answer);
//next append or prepend the new number (might need optimization)
if (op == MC_OPER_SUB || op == MC_OPER_DIV || //noncommutative, append only
@@ -1750,7 +1728,7 @@
if (reformat)
{
- mcdprintf("Reformatting...\n");
+ DEBUGMSG(debug_mathcards, "Reformatting...\n");
do {
format = rand() % MC_NUM_FORMATS;
} while (!MC_GetOpt(FORMAT_ANSWER_LAST + format) &&
@@ -1761,7 +1739,7 @@
}
ret.question_id = id;
- mcdprintf("At end of generate_rand_ooo_card_of_length():\n");
+ DEBUGMSG(debug_mathcards, "At end of generate_rand_ooo_card_of_length():\n");
print_card(ret);
return ret;
@@ -1793,11 +1771,11 @@
{
r1 = (double)rand() / RAND_MAX / 2 + 0.5; //interval (0, 1)
r2 = (double)rand() / RAND_MAX / 2 + 0.5; //interval (0, 1)
- mcdprintf("Randoms chosen: %5f, %5f\n", r1, r2);
+ DEBUGMSG(debug_mathcards, "Randoms chosen: %5f, %5f\n", r1, r2);
delta = sqrt(-2 * log(r1) ) * cos(2 * PI_VAL * r2); //standard normal dist.
var = length / 10.0; //variance
delta = delta * var;
- mcdprintf("Delta of average is %5f\n", delta);
+ DEBUGMSG(debug_mathcards, "Delta of average is %5f\n", delta);
length += delta;
if (length < 0)
length = 1; //just in case...
@@ -1820,8 +1798,8 @@
if((cycles_needed * num_valid_questions) < length)
cycles_needed++;
- mcdprintf("In generate_list() - COMPREHENSIVE method requested\n");
- mcdprintf("num_valid_questions = %d\t cycles_needed = %d\n",
+ DEBUGMSG(debug_mathcards, "In generate_list() - COMPREHENSIVE method requested\n");
+ DEBUGMSG(debug_mathcards, "num_valid_questions = %d\t cycles_needed = %d\n",
num_valid_questions, cycles_needed);
for (i = MC_PT_TYPING; i < MC_NUM_PTYPES; ++i)
@@ -1835,7 +1813,7 @@
if (MC_GetOpt(RANDOMIZE) )
{
- mcdprintf("Randomizing list\n");
+ DEBUGMSG(debug_mathcards, "Randomizing list\n");
randomize_list(&list);
}
@@ -1846,7 +1824,7 @@
// generation until we have enough questions.
if (length > cl) //if not enough questions, pad out with randoms
{
- mcdprintf("Padding out list from %d to %d questions\n", cl, length);
+ DEBUGMSG(debug_mathcards, "Padding out list from %d to %d questions\n", cl, length);
for (i = cl; i < length; ++i)
{
tnode = malloc(sizeof(MC_MathQuestion) );
@@ -1860,12 +1838,12 @@
tnode->card = generate_random_flashcard();
list = insert_node(list, end_of_list, tnode);
end_of_list = tnode;
-// mcdprintf("%d.", list_length(list) );
+// DEBUGMSG(debug_mathcards, "%d.", list_length(list) );
}
}
else if (length < cl) //if too many questions, chop off tail end of list
{
- mcdprintf("Cutting list to %d questions\n", length);
+ DEBUGMSG(debug_mathcards, "Cutting list to %d questions\n", length);
end_of_list = find_node(list, length);
delete_list(end_of_list->next);
end_of_list->next = NULL;
@@ -1875,9 +1853,11 @@
/* Here we are just generating random questions, one at a */
/* time until we have enough */
+ /* NOTE generate_random_flashcard() has some bugs, so only */
+ /* use this method if we need multiple operand questions */
else
{
- mcdprintf("In generate_list() - COMPREHENSIVE method NOT requested\n");
+ DEBUGMSG(debug_mathcards, "In generate_list() - COMPREHENSIVE method NOT requested\n");
for (i = 0; i < length; ++i)
{
@@ -1935,7 +1915,7 @@
//NOTE strings now simply hard-coded to MC_FORMULA_LEN (= 40) and
//MC_ANSWER_LEN (= 5) instead of tailoring them to save a few bytes - DSB
-// mcdprintf("Allocating %d + %d bytes for flashcard\n",
+// DEBUGMSG(debug_mathcards, "Allocating %d + %d bytes for flashcard\n",
// max_formula_size + 1, max_answer_size + 1);
// ret.formula_string = malloc( (max_formula_size + 1) * sizeof(char));
// ret.answer_string = malloc( (max_answer_size + 1) * sizeof(char));
@@ -1955,13 +1935,13 @@
return;
// if (!fc)
// return;
-// // mcdprintf("Freeing formula_string\n");
+// // DEBUGMSG(debug_mathcards, "Freeing formula_string\n");
// if (fc->formula_string)
// {
// free(fc->formula_string);
// fc->formula_string = NULL;
// }
-// // mcdprintf("Freeing answer_string\n");
+// // DEBUGMSG(debug_mathcards, "Freeing answer_string\n");
// if (fc->answer_string)
// {
// free(fc->answer_string);
@@ -1977,7 +1957,7 @@
if (!strcasecmp(text, MC_OPTION_TEXT[i]) )
return i;
}
- mcdprintf("'%s' isn't a math option\n", text);
+ DEBUGMSG(debug_mathcards, "'%s' isn't a math option\n", text);
return NOT_VALID_OPTION;
}
@@ -1987,7 +1967,7 @@
{
if (index >= NOPTS)
{
- mcdprintf("Invalid math option index: %d\n", index);
+ DEBUGMSG(debug_mathcards, "Invalid math option index: %d\n", index);
return;
}
@@ -2119,7 +2099,7 @@
{
if (index >= NOPTS)
{
- mcdprintf("Invalid option index: %d\n", index);
+ DEBUGMSG(debug_mathcards, "Invalid option index: %d\n", index);
return MC_MATH_OPTS_INVALID;
}
if (!math_opts)
@@ -2228,7 +2208,7 @@
{
}
- mcdprintf("calc_num_valid_questions():\t%d\n", total_questions);
+ DEBUGMSG(debug_mathcards, "calc_num_valid_questions():\t%d\n", total_questions);
return total_questions;
}
@@ -2239,15 +2219,17 @@
//get updated in the calling code
//NOTE the difficulty is set as add = 1, sub = 2, mult = 3, div = 4, plus a 2 point
//bonus if the format is a "missing number".
-MC_MathQuestion* add_all_valid(MC_ProblemType pt, MC_MathQuestion* list, MC_MathQuestion** end_of_list)
+MC_MathQuestion* add_all_valid(MC_ProblemType pt,
+ MC_MathQuestion* list,
+ MC_MathQuestion** end_of_list)
{
int i, j;
int ans = 0, tmp;
MC_Operation k;
MC_MathQuestion* tnode;
- mcdprintf("Entering add_all_valid(%d)\n", pt);
- mcdprintf("List already has %d questions\n", list_length(list));
+ DEBUGMSG(debug_mathcards, "Entering add_all_valid(%d)\n", pt);
+ DEBUGMSG(debug_mathcards, "List already has %d questions\n", list_length(list));
//make sure this problem type is actually allowed
if (!MC_GetOpt(pt + TYPING_PRACTICE_ALLOWED) )
@@ -2256,10 +2238,10 @@
//add all typing questions in range
if (pt == MC_PT_TYPING)
{
- mcdprintf("Adding typing...\n");
+ DEBUGMSG(debug_mathcards, "Adding typing...\n");
for (i = MC_GetOpt(MIN_TYPING_NUM); i <= MC_GetOpt(MAX_TYPING_NUM); ++i)
{
- mcdprintf("(%d)\n", i);
+ DEBUGMSG(debug_mathcards, "(%d)\n", i);
tnode = allocate_node();
if(!tnode)
{
@@ -2280,7 +2262,7 @@
//add all allowed arithmetic questions
else if (MC_PT_ARITHMETIC)
{
- mcdprintf("Adding arithmetic...\n");
+ DEBUGMSG(debug_mathcards, "Adding arithmetic...\n");
// The k loop iterates through the four arithmetic operations:
// k = 0 means addition
@@ -2291,12 +2273,12 @@
{
if (!MC_GetOpt(k + ADDITION_ALLOWED) )
continue;
- mcdprintf("\n*%d*\n", k);
+ DEBUGMSG(debug_mathcards, "\n*%d*\n", k);
// The i loop iterates through the first value in the question:
for (i = MC_GetOpt(MIN_AUGEND + 4 * k); i <= MC_GetOpt(MAX_AUGEND + 4 * k); ++i)
{
- mcdprintf("\n%d:\n", i);
+ DEBUGMSG(debug_mathcards, "\n%d:\n", i);
// The j loop iterates through the second value in the question:
for (j = MC_GetOpt(MIN_ADDEND + 4 * k); j <= MC_GetOpt(MAX_ADDEND + 4 * k); ++j)
@@ -2352,7 +2334,7 @@
continue;
}
- mcdprintf("Generating: %d %c %d = %d\n", i, operchars[k], j, ans);
+ DEBUGMSG(debug_mathcards, "Generating: %d %c %d = %d\n", i, operchars[k], j, ans);
//add each format, provided it's allowed in general and for this op
@@ -2460,7 +2442,7 @@
{
j = ans;
i = tmp;
- mcdprintf("resetting to %d %d\n", j, i);
+ DEBUGMSG(debug_mathcards, "resetting to %d %d\n", j, i);
}
}
}
@@ -2492,8 +2474,8 @@
}
}
}
- mcdprintf("Exiting add_all_valid()\n");
- mcdprintf("List now has %d questions\n\n", list_length(list));
+ DEBUGMSG(debug_mathcards, "Exiting add_all_valid()\n");
+ DEBUGMSG(debug_mathcards, "List now has %d questions\n\n", list_length(list));
return list;
}
Modified: tuxmath/trunk/src/mathcards.h
===================================================================
--- tuxmath/trunk/src/mathcards.h 2009-10-12 18:49:50 UTC (rev 1583)
+++ tuxmath/trunk/src/mathcards.h 2009-10-12 18:49:57 UTC (rev 1584)
@@ -19,14 +19,7 @@
#include "transtruct.h"
-#define MC_DEBUG
-#ifdef MC_DEBUG
-#define mcdprintf(...) DEBUGMSG(debug_mathcards,__VA_ARGS__)
-#else
-#define mcdprintf(...) 0
-#endif
-
/* different classes of problems TuxMath will ask */
typedef enum _MC_ProblemType {
MC_PT_TYPING,
@@ -277,6 +270,7 @@
int MC_MaxFormulaSize(void); //amount of memory needed to safely hold strings
int MC_MaxAnswerSize(void);
MC_FlashCard MC_AllocateFlashcard();
+void MC_CopyCard(const MC_FlashCard* src, MC_FlashCard* dest);
void MC_FreeFlashcard(MC_FlashCard* fc);
void MC_ResetFlashCard(MC_FlashCard* fc); //empty flashcard of strings & values
int MC_FlashCardGood(const MC_FlashCard* fc); //verifies a flashcard is valid
More information about the Tux4kids-commits
mailing list