[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. dfc59b66be22f48709d3f6ae16c257ea6ce6d445

julio (none) julio at julio-desktop.
Tue Jun 29 01:17:33 UTC 2010 

The following commit has been merged in the master branch:
commit dfc59b66be22f48709d3f6ae16c257ea6ce6d445
Author: julio <julio at julio-desktop.(none)>
Date:   Mon Jun 28 20:13:35 2010 -0500

    Fixed: Map Reading, Map Parsing, Compiling errors and some segfaults

diff --git a/data/maps/map.xml b/data/maps/map.xml
index d777dc2..7ffa363 100644
--- a/data/maps/map.xml
+++ b/data/maps/map.xml
@@ -8,8 +8,8 @@
 
     <row>
         <tilde>
-            <height>1</height>
-            <terrain>grassland</terrain>
+            <height>0</height>
+            <terrain>OCEAN</terrain>
             <object></object>
             <unit></unit>
             <building></building>
@@ -28,6 +28,13 @@
             <unit></unit>
             <building></building>
         </tilde>
+        <tilde>
+            <height>1</height>
+            <terrain>SWAMP</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
     </row>
     <row>
         <tilde>
@@ -46,7 +53,14 @@
         </tilde>
         <tilde>
             <height>1</height>
-            <terrain>GRASSLAND</terrain>
+            <terrain>SWAMP</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
+        <tilde>
+            <height>1</height>
+            <terrain>SWAMP</terrain>
             <object></object>
             <unit></unit>
             <building></building>
@@ -69,11 +83,48 @@
         </tilde>
         <tilde>
             <height>1</height>
+            <terrain>SWAMP</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
+        <tilde>
+            <height>1</height>
+            <terrain>SWAMP</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
+    </row>    <row>
+        <tilde>
+            <height>1</height>
+            <terrain>GRASSLAND</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
+        <tilde>
+            <height>1</height>
+            <terrain>GRASSLAND</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
+        <tilde>
+            <height>1</height>
+            <terrain>GRASSLAND</terrain>
+            <object></object>
+            <unit></unit>
+            <building></building>
+        </tilde>
+        <tilde>
+            <height>1</height>
             <terrain>GRASSLAND</terrain>
             <object></object>
             <unit></unit>
             <building></building>
         </tilde>
+
     </row>
 </data>
 
diff --git a/po/ar.gmo b/po/ar.gmo
index bc42219..7f131c6 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 549b605..ff16f53 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -134,20 +134,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath برنامج حر مفتوح المصدر"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "يمكنك المساعدة بجعلها افضل بإرسال اى مشاكل تواجها,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net ناقش المستقبل على "
diff --git a/po/ast.po b/po/ast.po
index c9062fa..0a9e775 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath 1.7.3\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2010-03-06 08:41+0200\n"
 "Last-Translator: Xandru Armesto <xandru at softastur.org>\n"
 "Language-Team: Asturian Team alministradores at softastur.org\n"
@@ -150,19 +150,19 @@ msgstr "¡Entrasti nel Salón de la Fama!"
 msgid "Enter Your Name:"
 msgstr "Pon el to Nome:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "¡TuxMath ye llibre y de códigu abiertu!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 msgid "You can help make it better."
 msgstr "Pues ayudar a ameyoralu."
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr "¡Pues contribuyir con suxerencies, trabayu asrtísticu y códigu!"
 
-#: src/menu.c:316
+#: src/menu.c:312
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Alderica no que cinca a TuxMath en tuxmath-devel at lists.sourceforge.net"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 0c0e91b..cb48e61 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index b2a0aea..53b13d1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -139,20 +139,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath je svobodný software!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "I ty ho můžeš vylepšit, když oznámíš chyby, "
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
diff --git a/po/de.gmo b/po/de.gmo
index 32995d1..d722ddf 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 47f4dbb..165496d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -136,20 +136,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath ist frei und OpenSource!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Du kannst bei der Verbesserung helfen, wenn du Probleme "
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
diff --git a/po/en at boldquot.gmo b/po/en at boldquot.gmo
index 1ac82e8..adf0a49 100644
Binary files a/po/en at boldquot.gmo and b/po/en at boldquot.gmo differ
diff --git a/po/en at boldquot.po b/po/en at boldquot.po
index 8c931cd..0a9a5d1 100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxhistory 0.0.1\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2010-05-27 00:16-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -168,19 +168,19 @@ msgstr "You Are In The Hall of Fame!"
 msgid "Enter Your Name:"
 msgstr "Enter Your Name:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is free and open-source!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 msgid "You can help make it better."
 msgstr "You can help make it better."
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr "Suggestions, artwork, and code are all welcome!"
 
-#: src/menu.c:316
+#: src/menu.c:312
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 
diff --git a/po/en at quot.gmo b/po/en at quot.gmo
index c577e55..427f96b 100644
Binary files a/po/en at quot.gmo and b/po/en at quot.gmo differ
diff --git a/po/en at quot.po b/po/en at quot.po
index 48c7b19..a2c6853 100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxhistory 0.0.1\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2010-05-27 00:16-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -165,19 +165,19 @@ msgstr "You Are In The Hall of Fame!"
 msgid "Enter Your Name:"
 msgstr "Enter Your Name:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is free and open-source!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 msgid "You can help make it better."
 msgstr "You can help make it better."
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr "Suggestions, artwork, and code are all welcome!"
 
-#: src/menu.c:316
+#: src/menu.c:312
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 925c0da..c4d7a7a 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index c076430..ebd130b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -147,20 +147,20 @@ msgstr "You Are In The Hall of Fame!"
 msgid "Enter Your Name:"
 msgstr "Enter Your Name:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is free and open-source!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "You can help make it better by reporting problems,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
diff --git a/po/es.gmo b/po/es.gmo
index eebf21b..1c165a1 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 4664d64..54ed6a4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.6.2\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2009-10-29 15:39-0300\n"
 "Last-Translator: SoporteLihuen <soportelihuen at linti.unlp.edu.ar>\n"
 "Language-Team: Español <LL at li.org>\n"
@@ -144,20 +144,20 @@ msgstr "¡Estás en el Salón de la Fama!"
 msgid "Enter Your Name:"
 msgstr "Escribe tu nombre:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "¡TuxMath es gratis y de código abierto!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Puedes hacer que el programa funcione mejor reportando problemas,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discute el futuro en tuxmath-devel at lists.sourceforge.net"
diff --git a/po/fi.gmo b/po/fi.gmo
index fcf01b2..a512ee5 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 5fe00a1..6c276a1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -141,20 +141,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath on vapaa ja avointa koodia!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Voit auttaa meitä tekemään sen paremmaksi ilmoittamalla ongelmista,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index d3b81d3..357f918 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 75d287b..f039afa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.8\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -137,20 +137,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath est gratuit et open-source!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Participez à l'amélioration du jeu en nous signalant des problemes,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Parlons-en sur tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ga.gmo b/po/ga.gmo
index 98a3a03..f7d16e8 100644
Binary files a/po/ga.gmo and b/po/ga.gmo differ
diff --git a/po/ga.po b/po/ga.po
index b45bc00..00a0b71 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -136,20 +136,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "Tá TuxMath ar fáil saor in aisce agus le foinse oscailte!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Is féidir leat cuidiú é a fheabhsú trí fadhbanna a fhógrú,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Plé an todhchaí ag tuxmath-devel at lists.sourceforge.net"
diff --git a/po/he.gmo b/po/he.gmo
index e59503f..3bb89bb 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index bb0c46d..07024ae 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -145,20 +145,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "טאקסמטיקה הינה חופשית ובעלת קוד פתוח!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "תוכל לעזור לנו לשפר אותו על ידי דיווח תקלות,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "דון בעתיד טאקסמטיקה ברשימת הדיוור tuxmath-devel at lists.sourceforge.net"
diff --git a/po/hu.gmo b/po/hu.gmo
index 8d8deff..7a45419 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index f2054d1..795e8e3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -136,20 +136,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "A TuxMath ingyenes és nyílt forráskódú!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Te is segíthetsz még jobbá tenni az észlelt hibák bejelentésével,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Levelezőlista (angol nyelvű): tuxmath-devel at lists.sourceforge.net"
diff --git a/po/it.gmo b/po/it.gmo
index 46b13d6..eb93969 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index d7a8bc2..a040ac1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -144,20 +144,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath è gratuito ed open-source!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Puoi aiutare a migliorarlo riportando i problemi,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuti del futuro su tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ja.gmo b/po/ja.gmo
index d163211..caface1 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 97eaaca..2763bd7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -142,20 +142,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath は自由でオープンソースです!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "問題点を報告してゲームを改善することができます。"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "連絡先はこちら tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ku.po b/po/ku.po
index 2e04588..69b23ac 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2009-05-28 12:30+0000\n"
 "Last-Translator: Amed Çeko Jiyan <amedcj at gmail.com>\n"
 "Language-Team: Kurdish <ku at li.org>\n"
@@ -139,20 +139,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "Tuxmath belaş e û ji çavkaniya-vekirî ye!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Ji bo pêşdebirinê dikarî çewtiyan rapor bikî,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index 8ac8739..e4fd78d 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index c7798dc..8c20ce4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -139,20 +139,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath er fri programvare!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Du kan være med på å gjøre spillet bedre, ved å melde fra"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
diff --git a/po/nl.gmo b/po/nl.gmo
index ea480b6..c4cccb7 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 8fb8dfb..468852c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -137,20 +137,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is gratis en open-source!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Je kan helpen met het verbeteren door problemen te melden,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
diff --git a/po/nn.gmo b/po/nn.gmo
index 5be43aa..bc22189 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index b874eee..add8726 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -150,20 +150,20 @@ msgstr "Du fekk ein ny rekord!"
 msgid "Enter Your Name:"
 msgstr "Skriv inn namnet ditt:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath er fri programvare!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Du kan vera med på å gjera spelet betre, ved å melda frå"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
diff --git a/po/oc.gmo b/po/oc.gmo
index e4f10ee..f1c2860 100644
Binary files a/po/oc.gmo and b/po/oc.gmo differ
diff --git a/po/oc.po b/po/oc.po
index 3c2baea..ba2689b 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -141,19 +141,19 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr ""
 
-#: src/menu.c:314
+#: src/menu.c:310
 msgid "You can help make it better."
 msgstr ""
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/pl.gmo b/po/pl.gmo
index e749649..6bea793 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 5304083..4873e02 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -144,20 +144,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath jest wolny i ma otwarte źródła"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Możesz pomóc uczynić go lepszym zgłaszając błędy."
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Dyskutuj na temat przyszłości na tuxmath-devel at lists.sourceforge.net"
diff --git a/po/pt.gmo b/po/pt.gmo
index 29fc81f..8f3c357 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index f7bb831..1dcfbc7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2009-10-14 16:04+0100\n"
 "Last-Translator: Pedro Amorim <pedro_amorim at live.com.pt>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
@@ -154,20 +154,20 @@ msgstr "Tu estás no Corredor da Fama"
 msgid "Enter Your Name:"
 msgstr "Coloca o Teu Nome:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath é livre e com código aberto!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Podes ajudar o TuxMath ao reportar problemas,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuta o futuro em tuxmath-devel at lists.sourceforge.net"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 559a468..6b8b813 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fad6eb4..cf834bd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -145,20 +145,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath é gratuíto e software livre!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Você pode ajudar a torná-lo melhor reportando problemas."
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discutir o futuro em tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ru.gmo b/po/ru.gmo
index 4a7e177..fa874c9 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index fea9e5d..d7ef3fd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -142,20 +142,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath свободный и открытый!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Вы можете улучшить этот продукт, сообщив о проблеме,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Обсудите будущее программы на tuxmath-devel at lists.sourceforge.net"
diff --git a/po/sk.gmo b/po/sk.gmo
index 53c8542..5f3585d 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 89f2894..556468c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -142,20 +142,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath je slobodný software!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Môžeš ho vylepšiť aj ty oznamovaním problémov,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskutuj o budúcnosti na tuxmath-devel at lists.sourceforge.net"
diff --git a/po/sl.po b/po/sl.po
index 8c11bd4..be85b2e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2008-07-17 12:30+0000\n"
 "Last-Translator: Štefan Baebler <Unknown>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -139,20 +139,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath je prost in odprtokoden!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "S sporočanjem težav, predlogov za izboljšave in"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Pogovor o prihodnosti na tuxmath-devel at lists.sourceforge.net"
diff --git a/po/sv.gmo b/po/sv.gmo
index dd3316a..5bdc5e4 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 50bd262..9e7da5d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -138,20 +138,20 @@ msgstr "Du kom med på poänglistan!"
 msgid "Enter Your Name:"
 msgstr "Skriv ditt namn:"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath är gratis och öppen källkod!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Du kan hjälpa oss att göra det bättre genom att rapportera problem,"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskutera framtiden på tuxmath-devel at lists.sourceforge.net"
diff --git a/po/tr.gmo b/po/tr.gmo
index 2b7b559..a3a8bd1 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index f6b7d31..ef88608 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr2\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -137,20 +137,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath özgür ve açık kaynak kodlu!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Sorunları bildirerek, iyileştirmeler önererek ya da kod yazarak"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index ed8544c..3652821 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-0500\n"
 "PO-Revision-Date: 2008-07-22 18:01+0000\n"
 "Last-Translator: lusiads <Unknown>\n"
 "Language-Team: Vietnamese <vi at li.org>\n"
@@ -139,20 +139,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMatch là phần mềm miễn phí và mã nguồn mở!"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Bạn có thể giúp cải thiện chương trình bằng cách báo cáo lỗi."
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Thảo luận về tương lai tại tuxmath-devel at lists.sourceforge.net"
diff --git a/po/zam.po b/po/zam.po
index 29b355c..74c7aaf 100644
--- a/po/zam.po
+++ b/po/zam.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.6.2\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -138,22 +138,22 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr "Taá leel"
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath es gratis y es una opcion abierta"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr ""
 "puedes hacer que el programa funcione mejor si reportas problems con el "
 "programa"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "discute el futuro en tuxmath-devel at lists.sourceforge.net"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 84b1fcb..522f626 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4cdfedc..c337962 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxmath\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-26 21:53-0500\n"
+"POT-Creation-Date: 2010-06-28 17:16-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"
@@ -141,20 +141,20 @@ msgstr ""
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:313
+#: src/menu.c:309
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath 是自由软件而且是开放源代码的！"
 
-#: src/menu.c:314
+#: src/menu.c:310
 #, fuzzy
 msgid "You can help make it better."
 msgstr "你可以改进它或报告程序错误，"
 
-#: src/menu.c:315
+#: src/menu.c:311
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:316
+#: src/menu.c:312
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "讨论TuxMath： tuxmath-devel at lists.sourceforge.net"
diff --git a/src/game.c b/src/game.c
index 5a76ea1..a990ef4 100644
--- a/src/game.c
+++ b/src/game.c
@@ -64,6 +64,8 @@ static int escape_received;
 static SDL_Surface* bkgd = NULL; //640x480 background (windowed)
 static SDL_Surface* scaled_bkgd = NULL; //native resolution (fullscreen)
 
+// Game vars
+static SDL_Rect origin;
 /********** Static functions definitions *********/
 
 static int game_init(void);
@@ -85,10 +87,22 @@ static SDL_Surface* current_bkgd()
 
 static int game_init(void)
 {
+    FILE *fp;
+
+    //SDL variables init
     SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
     SDL_Flip(screen);
+
+    SDL_FillRect(map_image, NULL, SDL_MapRGB(map_image->format, 0, 0 ,0));
+    //SDL_Flip(map_image);
     quit = 0;
+    
+    origin.x = 0;
+    origin.y = 0;
+    origin.w = screen->w;
+    origin.h = screen->h;
 
+    //Control variables init
     left_pressed = 0;
     right_pressed = 0;
     up_pressed = 0;
@@ -100,15 +114,22 @@ static int game_init(void)
     user_quit_received = 0;
     SDL_quit_received = 0;
     escape_received = 0;
-
     
-    if(!map_xml(LoadMap("map")))
+    fp = LoadMap("map");
+    if(fp == NULL)
     {
+        DEBUGMSG(debug_game, "File not found!");
+        return 1;
+    }
+    
+    if(map_xml(fp))
+    {
+        printf("Error parsing file!");
         DEBUGMSG(debug_game, "Error loading the map file.\n");
-        return 0;
+        return 1;
     }
 
-    return 1;
+    return 0;
 }
 
 
@@ -124,7 +145,7 @@ int game(void)
         ;//SwitchScreenMode();  //Huh??
     }
 
-    if(!game_init())
+    if(game_init())
     {
         DEBUGMSG(debug_game, "Error loading game using game_init()\n");
         return -1;
@@ -160,15 +181,21 @@ int game(void)
 
 static void game_draw(void)
 {
-    SDL_Surface* surf;
     SDL_Rect dest;
-    
+
     dest.x = 200;
     dest.y = 200;
 
-    SDL_BlitSurface(terrain[TUNDRA_CENTER_1], NULL, screen, &dest);
-    SDL_BlitSurface(objects[OBJ_TROPICAL], NULL, screen, &dest);
+    SDL_BlitSurface(terrain[TUNDRA_CENTER_1], NULL, map_image, &dest);
+    SDL_BlitSurface(objects[OBJ_TROPICAL], NULL, map_image, &dest);
 
+    origin.x = 0;
+    origin.y = 0;
+    origin.w = screen->w;
+    origin.h = screen->h;
+    dest.x = 0;
+    dest.y = 0;
+    SDL_BlitSurface(map_image, &origin, screen, &dest);
     dest.x = (screen->w - images[IMG_STOP]->w - 5);
     dest.y = glyph_offset;
     SDL_BlitSurface(images[IMG_STOP], NULL, screen, &dest);
diff --git a/src/loaders.c b/src/loaders.c
index c6c6314..de980ef 100644
--- a/src/loaders.c
+++ b/src/loaders.c
@@ -655,20 +655,13 @@ Mix_Music* LoadMusic(char *datafile )
 }
 
 /* load_map: Load map from a XML datafile */
-FILE* LoadMap(const char* name)
+FILE *LoadMap(const char* name)
 {
   FILE *fp = NULL;
   char fn[PATH_MAX];
   int fn_len;
   int i;
 
-  if(NULL == fp)
-  {
-    DEBUGMSG(debug_loaders, "load_image(): file_name is NULL, exiting.\n");
-    return NULL;
-  }
-
-
   /* check if map file is present */
   sprintf(fn, "%s/maps/%s.xml", DATA_PREFIX, name);
   fn_len = strlen(fn);
@@ -681,6 +674,12 @@ FILE* LoadMap(const char* name)
 
   fp = fopen(fn, "r");
 
+  if(fp == NULL)
+  {
+    DEBUGMSG(debug_loaders, "load_image(): file_name is NULL, exiting.\n");
+    printf("Error at trying to find map file!\n");
+    return NULL;
+  }
   return fp;
 }
 
diff --git a/src/map.c b/src/map.c
index 1475bb0..06a5e85 100644
--- a/src/map.c
+++ b/src/map.c
@@ -26,12 +26,11 @@ int map_xml(FILE *fp)
 {
     int value;
     int x,y;
-    char *text;
     mxml_node_t *tree;
     mxml_node_t *node;
     mxml_node_t *inode;
     mxml_node_t *jnode;
-
+   
     tree = mxmlLoadFile(NULL, fp, MXML_TEXT_CALLBACK);
 
     x = 0;
@@ -70,15 +69,14 @@ int map_xml(FILE *fp)
                 map[x][y].height = node->child->value.integer;
             }
 
+            printf("%d ", map[x][y].terrain);
+
             y++;
         }
         x++;
         printf("\n");
     }
-
-    str_upper(text);
     
-    printf("%s\n",text);
     
 
     mxmlDelete(jnode);
@@ -86,6 +84,8 @@ int map_xml(FILE *fp)
     mxmlDelete(node);
 
     fclose(fp);
+
+    return 0;
 }
 
 // Returns the enum value for each terrain type. If the terrain
@@ -93,29 +93,29 @@ int map_xml(FILE *fp)
 
 int get_terrain_enum(char *terrain_string)
 {
-    if(strcmp(terrain_string, "HIGHSEA"))
+    if(strcmp(terrain_string, "HIGHSEA") == 0)
         return HIGHSEA;
-    else if(strcmp(terrain_string, "TUNDRA"))
+    else if(strcmp(terrain_string, "TUNDRA") == 0)
         return TUNDRA;
-    else if(strcmp(terrain_string, "SWAMP"))
+    else if(strcmp(terrain_string, "SWAMP") == 0)
         return SWAMP;
-    else if(strcmp(terrain_string, "UNEXPLORED"))
+    else if(strcmp(terrain_string, "UNEXPLORED") == 0)
         return UNEXPLORED;
-    else if(strcmp(terrain_string, "DESERT"))
+    else if(strcmp(terrain_string, "DESERT") == 0)
         return DESERT;
-    else if(strcmp(terrain_string, "GRASSLAND"))
+    else if(strcmp(terrain_string, "GRASSLAND") == 0)
         return GRASSLAND;
-    else if(strcmp(terrain_string, "ARCTIC"))
+    else if(strcmp(terrain_string, "ARCTIC") == 0)
         return ARCTIC;
-    else if(strcmp(terrain_string, "OCEAN"))
+    else if(strcmp(terrain_string, "OCEAN") == 0)
         return OCEAN;
-    else if(strcmp(terrain_string, "MARSH"))
+    else if(strcmp(terrain_string, "MARSH") == 0)
         return MARSH;
-    else if(strcmp(terrain_string, "SAVANNAH"))
+    else if(strcmp(terrain_string, "SAVANNAH") == 0)
         return SAVANNAH;
-    else if(strcmp(terrain_string, "PLAINS"))
+    else if(strcmp(terrain_string, "PLAINS") == 0)
         return PLAINS;
-    else if(strcmp(terrain_string, "PRAIRIE"))
+    else if(strcmp(terrain_string, "PRAIRIE") == 0)
         return PRAIRIE;
     else
         return -1;
diff --git a/src/setup.c b/src/setup.c
index ba8adfa..7489cdc 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -604,40 +604,40 @@ void data_memory_alloc(void)
     object = (th_obj*)malloc(MAX_OBJECTS * sizeof(th_obj));
     if (object == NULL)
     {
-        printf("Allocation of game objects faild!\n");
-        exit(0);
+        DEBUGMSG(debug_setup, "Allocation of game objects faild!\n");
+        exit(1);
     }
 
     map = NULL;
     map = (th_map**)malloc(MAX_X_TILDES * sizeof(th_map *));
     if(map == NULL)
     {
-        printf("Error\n");
-        exit(0);
+        DEBUGMSG(debug_setup,"Error\n");
+        exit(1);
     }
     for(i = 0; i < MAX_X_TILDES; i++){
         map[i] = NULL;
         map[i] = (th_map*)malloc(MAX_Y_TILDES * sizeof(th_map));
         if(map[i] == NULL)
         {
-            printf("Error: Allocation of objects faild!\n");
-            exit(0);
+            DEBUGMSG(debug_setup, "Error: Allocation of objects faild!\n");
+            exit(1);
         }
     }
 
     map_image = NULL;
-    map_image = SDL_CreateRGBSurface(SDL_SWSURFACE, MAP_WIDTH, MAP_HEIGHT, 32,
-                           rmask, gmask, bmask, amask); //32 Bits are OK?
+    //printf("%d", terrain[TUNDRA_CENTER_1]->w);
+    
+    map_image = SDL_CreateRGBSurface(SDL_SWSURFACE, 1000, 1000, 
+            32, rmask, gmask, bmask, amask); 
     if(map_image == NULL)
     {
-        printf("Couldn't Create img_image");
-        exit(0);
+        DEBUGMSG(debug_setup,"Couldn't create img_image\n");
+        exit(1);
     }
 
 }
 
-
-
 /* save options and free heap */
 /* use for successful exit */
 void cleanup(void)
diff --git a/src/setup.h b/src/setup.h
index 01f8b53..6768876 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -34,8 +34,8 @@
 
 #include "fileops.h"
 
-int MAP_HEIGHT = MAX_X_TILDES * terrain[0]->h;
-int MAP_WIDTH = MAX_Y_TILDES * terrain[0]->w;
+#define MAP_HEIGHT MAX_X_TILDES * terrain[0]->h
+#define MAP_WIDTH MAX_Y_TILDES * terrain[0]->w
 
 
 void setup(int argc, char * argv[]);

-- 
tuxhistory - Educational history game

More information about the Tux4kids-commits mailing list