[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. e1d3310de8ecba31958538189648998deec5977a
julio (none)
julio at julio-desktop.
Sun Jun 27 06:13:03 UTC 2010
The following commit has been merged in the master branch:
commit e1d3310de8ecba31958538189648998deec5977a
Author: julio <julio at julio-desktop.(none)>
Date: Sun Jun 27 01:11:24 2010 -0500
Dynamic variables allocation, still with compiling errors...
diff --git a/configure.ac b/configure.ac
index fb49738..336f0f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,6 +459,7 @@ data/images/terrain/swamp/Makefile
data/images/terrain/tundra/Makefile
data/images/terrain/unexplored/Makefile
data/images/forest/Makefile
+data/maps/Makefile
data/menus/Makefile
data/sounds/Makefile
doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index c197dd7..ede0074 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am for tuxmath - data:
+## Makefile.am for tuxhsitory - data:
## Process with Automake to create Makefile.in
SUBDIRS = fonts \
diff --git a/data/maps/Makefile.am b/data/maps/Makefile.am
index 8aaf57f..78ea985 100644
--- a/data/maps/Makefile.am
+++ b/data/maps/Makefile.am
@@ -3,4 +3,4 @@
## Process with AutoMake:
mapsdir = $(pkgdatadir)/maps
-dist_grassland_DATA = map.xml
+dist_maps_DATA = map.xml
diff --git a/po/ar.gmo b/po/ar.gmo
index ff9f27a..bc42219 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 9de80fa..549b605 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -152,19 +152,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net ناقش المستقبل على "
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "! العمل يتقدم"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "هذه الخاصية ليست جاهزة حتى الآن"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "ناقش مستقبل اللعبة فى"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "Tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ast.po b/po/ast.po
index d526358..c9062fa 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -166,19 +166,19 @@ msgstr "¡Pues contribuyir con suxerencies, trabayu asrtísticu y códigu!"
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Alderica no que cinca a TuxMath en tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "¡Trabayu en marcha!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Esta función nun ta preparada entá"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Alderica al rodiu del futuru de TuxMath en"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/cs.gmo b/po/cs.gmo
index 4129922..0c0e91b 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index e1b94ec..b2a0aea 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -157,19 +157,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Ve výstavbě!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Tato vlastnost ještě nefunguje"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Diskutuj o budoucnosti TuxMath na"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/de.gmo b/po/de.gmo
index 36fba94..32995d1 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 87b90e6..47f4dbb 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -155,19 +155,19 @@ msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr ""
"Diskutiere die Zukunft von TuxMath auf tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "In Arbeit!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Dieser Bereich ist noch nicht fertig."
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Diskutiere über die Zukunft von TuxMath auf "
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/en at boldquot.gmo b/po/en at boldquot.gmo
index 564d041..1ac82e8 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 d9c2340..8c931cd 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-0500\n"
"PO-Revision-Date: 2010-05-27 00:16-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -184,19 +184,19 @@ msgstr "Suggestions, artwork, and code are all welcome!"
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Discuss the future of TuxMath at"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/en at quot.gmo b/po/en at quot.gmo
index 65c5e1c..c577e55 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 bce1a17..48c7b19 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-0500\n"
"PO-Revision-Date: 2010-05-27 00:16-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -181,19 +181,19 @@ msgstr "Suggestions, artwork, and code are all welcome!"
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Discuss the future of TuxMath at"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 5a49544..925c0da 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 b08deda..c076430 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -165,19 +165,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Discuss the future of TuxMath at"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/es.gmo b/po/es.gmo
index 58591b4..eebf21b 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index a625b56..4664d64 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -162,19 +162,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discute el futuro en tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "¡Trabajo en curso!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Esta opción no funciona todavía"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Para discutir el futuro de TuxMath puedes ir a"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
diff --git a/po/fi.gmo b/po/fi.gmo
index ac70fb3..fcf01b2 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 1e933ad..5fe00a1 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -161,19 +161,19 @@ msgstr ""
"Keskustele tuxmathin tulevaisuudesta osoitteesta tuxmath-devel at lists."
"sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Työn alla!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Tämä ominaisuus ei ole vielä valmis"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/fr.gmo b/po/fr.gmo
index 6fa8835..d3b81d3 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index b9ca6e5..75d287b 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -155,19 +155,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Parlons-en sur tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Chargement"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Cette option n'est pas encore disponible"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Participer au futur de TuxMath au"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ga.gmo b/po/ga.gmo
index 5073185..98a3a03 100644
Binary files a/po/ga.gmo and b/po/ga.gmo differ
diff --git a/po/ga.po b/po/ga.po
index e3488e4..b45bc00 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -154,19 +154,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Plé an todhchaà ag tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Obair Idir Lámha!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "NÃl an ghné seo réidh fós"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Plé todhchaà TuzMath ag"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/he.gmo b/po/he.gmo
index 8c7761c..e59503f 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index c287562..bb0c46d 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -163,19 +163,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "דון בעתיד טאקסמטיקה ברשימת הדיוור tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "עבודה בתהליכים!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "תכונה זו אינה מוכנה עדיין"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "דון בעתידה של טאקסמתיקה בקבוצת הדיון"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/hu.gmo b/po/hu.gmo
index 4d4dea2..8d8deff 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index e3961b2..f2054d1 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -154,19 +154,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Levelezőlista (angol nyelvű): tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Fejlesztés alatt."
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Ez a funkció még nem működik"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "A TuxMath jövőjét itt vitathatod meg:"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/it.gmo b/po/it.gmo
index 92ff29c..46b13d6 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 2de050c..d7a8bc2 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -162,19 +162,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuti del futuro su tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Lavori in corso!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Questa caratteristica non è ancora pronta."
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Discuti del futuro di TuxMatch su"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ja.gmo b/po/ja.gmo
index d269855..d163211 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 5bede76..97eaaca 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -160,19 +160,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "連絡先はこちら tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "作業中!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "この機能はまだありません"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "TuxMathについての要望は"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ku.po b/po/ku.po
index 8c2551b..2e04588 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -159,19 +159,19 @@ msgstr ""
"Dikarî ji navnîşana tuxmath-devel at lists.sourceforge.net tevli nîqaşên ji bo "
"dahatûya bernameyê bibî."
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Kiriyar Didome!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Ev taybetmendî hê ne amade ye"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Sohbeta der barê dahatûya TuxMathê de"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/nb.gmo b/po/nb.gmo
index 674788e..8ac8739 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index fe9c070..c7798dc 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -157,19 +157,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar ennå."
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter fremtiden til TuxMath på"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/nl.gmo b/po/nl.gmo
index 77cf039..ea480b6 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index b25562d..8fb8dfb 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -155,19 +155,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Werk in uitvoering"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Deze functie is nog niet beschikbaar"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Praat over de toekomst van TuxMath op"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/nn.gmo b/po/nn.gmo
index 400690d..5be43aa 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index 800be14..b874eee 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -168,19 +168,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikkje klar enno."
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter framtida til TuxMath på"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/oc.gmo b/po/oc.gmo
index 19b7784..e4f10ee 100644
Binary files a/po/oc.gmo and b/po/oc.gmo differ
diff --git a/po/oc.po b/po/oc.po
index c15c5f8..3c2baea 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -158,19 +158,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/pl.gmo b/po/pl.gmo
index 0a58eb2..e749649 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 9075d3f..5304083 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -162,19 +162,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Dyskutuj na temat przyszłości na tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Prace trwają!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Ta cecha jeszcze nie jest gotowa"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Dyskusje na temat przyszłości Tuxmath na"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/pt.gmo b/po/pt.gmo
index f718a26..29fc81f 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 4f0f4c5..f7bb831 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -172,19 +172,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuta o futuro em tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Trabalho em Progresso!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Este recurso ainda não está pronto"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Discuta o futuro do TuxMath em"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index b9ab9c7..559a468 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 a78a722..fad6eb4 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -163,19 +163,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Discutir o futuro em tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Trabalho em curso"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Esta função ainda não está disponível"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Discutir o futuro do TuxMath em"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/ru.gmo b/po/ru.gmo
index ff2ca2b..4a7e177 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 4a72163..fea9e5d 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -160,19 +160,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Обсудите будущее программы на tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Работа продолжается!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Эта функция пока не готова"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Обсудить будущее TuxMath на"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/sk.gmo b/po/sk.gmo
index 1a18adb..53c8542 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index aa1c6fc..89f2894 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -160,19 +160,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutuj o budúcnosti na tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Spracováva sa!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Táto vlastnosť ešte nie je pripravená"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Diskutuj o budúcnosti TuxMath na"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/sl.po b/po/sl.po
index 9fed5e2..8c11bd4 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -157,19 +157,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Pogovor o prihodnosti na tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Delo še poteka!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Ta možnost še ni pripravljena"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Pogovor o prihodnsti programa TuxMath na"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/sv.gmo b/po/sv.gmo
index e5a6405..dd3316a 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index f5631c7..50bd262 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -156,19 +156,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutera framtiden på tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Arbete pågår!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Denna funktion är inte färdig ännu"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Diskutera framtiden för TuxMath på"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/tr.gmo b/po/tr.gmo
index 064b620..2b7b559 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 6ef525c..f6b7d31 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -157,19 +157,19 @@ msgstr ""
"tuxmath-devel at lists.sourceforge.net e-posta listesinde TuxMath'in geleceğini "
"tartışabilirsin"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Çalışmalar Sürüyor!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Bu özellik henüz hazır değil"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Tuxmath'in geleceğini tartışıldığı liste :"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/vi.po b/po/vi.po
index 290384f..ed8544c 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -157,19 +157,19 @@ msgstr ""
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"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Đang được thực hiện!"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Tính năng này chưa sẵn sàng"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "Thảo luận tương lại của TuxMath tại"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/po/zam.po b/po/zam.po
index 322bf35..29b355c 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -158,19 +158,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "discute el futuro en tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "Deé thus kue kue "
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "Naá reshint kue"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "para discutir el futuro de TuxMath puedes ir a"
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 1635a01..84b1fcb 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 012482a..4cdfedc 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-11 13:40-0500\n"
+"POT-Creation-Date: 2010-06-26 21:53-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"
@@ -159,19 +159,19 @@ msgstr ""
msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
msgstr "讨论TuxMath： tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:478
+#: src/titlescreen.c:477
msgid "Work In Progress!"
msgstr "运行中"
-#: src/titlescreen.c:479
+#: src/titlescreen.c:478
msgid "This feature is not ready yet"
msgstr "角色还没准备好"
-#: src/titlescreen.c:480
+#: src/titlescreen.c:479
msgid "Discuss the future of TuxMath at"
msgstr "讨论TuxMath："
-#: src/titlescreen.c:481
+#: src/titlescreen.c:480
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
diff --git a/src/Makefile.am b/src/Makefile.am
index 28cf9b9..7fa4dc1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ endif
tuxhistory_SOURCES = tuxhistory.c \
setup.c \
titlescreen.c \
+ map.c \
menu.c \
game.c \
fileops_media.c \
@@ -59,7 +60,7 @@ EXTRA_DIST = credits.h \
linewrap.h \
loaders.h \
titlescreen.h \
- menu.h \
+ map.h \
options.h \
setup.h \
tuxhistory.h \
diff --git a/src/globals.h b/src/globals.h
index 8dea453..4a3c178 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -39,6 +39,9 @@ typedef enum { false, true } bool;
#define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b))
+// Free memory marco
+#define FREE(p) do { free(p); (p) = NULL; } while(0)
+
/* for Tim's feedback speed control code */
//#define FEEDBACK_DEBUG
//#define LINEBREAK
diff --git a/src/map.c b/src/map.c
index 916b510..0977a85 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,3 +1,16 @@
+/*
+ * map.c
+ *
+ * Description: The main game loop for TuxHistory
+ *
+ * Author: Jesús Manuel Mager Hois (fongog at gmail.com) 2010
+ * Copyright: GPL v3 or later
+ *
+ * Part of "Tux4Kids Project
+ * http://www.tux4kids.com
+ *
+ */
+
#include "tuxhistory.h"
#include<ctype.h>
diff --git a/src/map.h b/src/map.h
index a30762a..9236631 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,4 +1,17 @@
/*
+ * map.h
+ *
+ * Description: The main game loop for TuxHistory
+ *
+ * Author: Jesús Manuel Mager Hois (fongog at gmail.com) (C) 2010
+ * Copyright: GPL v3 or later
+ *
+ * Part of "Tux4Kids Project
+ * http://www.tux4kids.com
+ *
+ */
+
+/*
* This file contains the map data structure
* called th_map. th_map is a two dimensional
* data structure, made bye with pointers.
@@ -20,35 +33,34 @@ enum{
NUM_OF_OBJECTS
};
+/*Global tuxhistory vars*/
+typedef struct {
+ int x, y; // (x,y) in the th_map array
+ int type;
+ int live; // 100 to 0
+ char name[30];
+ int defence;
+ int attack;
+ int move;
+}th_obj;
// th_map is the main data strucutre
// th_map_tilde specifies the terrain
// of the isometric map
-typedef struct th_map{
+typedef struct {
int height; //Height of this tilde
int terrain;
- th_obj *obj;// Pointer to object
+ //th_obj *obj;// Pointer to object
}th_map;
// th_obj represent each object in the field, in
// each tilde there can be only one object.
-typedef struct th_obj{
- int x, y; // (x,y) in the th_map array
- int type;
- int live; // 100 to 0
- char *name;
- int defence;
- int attack;
- int move;
-}th_obj;
-
-
void th_draw_map(void);
//Generates the th_map from a XML string.
//th_map** th_make_map(char *);
-char* th_serialize_map(th_map **);
+//char *th_serialize_map(th_map **);
#endif
diff --git a/src/setup.c b/src/setup.c
index ec8af50..fdc34b1 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -67,9 +67,7 @@ int win_res_y = 480;
int fs_res_x = 0;
int fs_res_y = 0;
-/*Global tuxhistory vars*/
-
-th_map map[MAX_X_TILDES][MAX_Y_TILDES]; //The map array.
+th_map **map; //The map array.
th_obj* object = NULL;
@@ -103,9 +101,6 @@ void usage(int err, char * cmd);
void cleanup_memory(void);
-
-
-
/* --- Set-up function - now in four easier-to-digest courses! --- */
/* --- Er - make that six courses! --- */
/* --- Six is right out. Seven is much better. --- */
@@ -118,6 +113,10 @@ void setup(int argc, char * argv[])
handle_command_args(argc, argv);
/* SDL setup in own function:*/
initialize_SDL();
+
+ /*Alloc global vars fot tuxhistory*/
+ data_memory_alloc();
+
/* Read image and sound files: */
load_data_files();
/* Note that the per-user options will be set after the call to
@@ -598,13 +597,31 @@ void load_data_files(void)
void data_memory_alloc(void)
{
+ int i;
object = NULL;
- object = (th_obj *)malloc(MAX_OBJECTS * sizeof(th_obj));
- if object = NULL;
+ object = (th_obj*)malloc(MAX_OBJECTS * sizeof(th_obj));
+ if (object == NULL)
{
printf("Allocation of game objects filed!\n");
exit(0);
}
+
+ map = NULL;
+ map = (th_map**)malloc(MAX_X_TILDES * sizeof(th_map *));
+ if(map == NULL)
+ {
+ printf("Error\n");
+ exit(0);
+ }
+ 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, no hay memoria suficinete\n");
+ exit(0);
+ }
+ }
}
@@ -639,14 +656,22 @@ void cleanup_on_error(void)
/* need to check all pointers before freeing them, */
/* and set them to NULL after freeing them, so we */
/* avoid segfaults at exit from double free() */
-void cleanup_memory(void)
+void [MAX_X_TILDES]cleanup_memory(void)
{
int i;
int frequency,channels,n_timesopened;
Uint16 format;
/* Free global memory allocation ( from memory_data_alloc() )*/
- free(object);
+ FREE(object);
+
+ for(i = 0; i < MAX_X_TILDES; i++)
+ {
+ FREE(map[i]);
+ }
+ FREE(map);
+
+
/* Free all images and sounds used by SDL: */
Cleanup_SDL_Text();
@@ -686,34 +711,6 @@ void cleanup_memory(void)
musics[i] = NULL;
}
- if (lesson_list_titles)
- {
- for (i = 0; i < num_lessons; i++)
- {
- if (lesson_list_titles[i])
- {
- free(lesson_list_titles[i]);
- lesson_list_titles[i] = NULL;
- }
- }
- free(lesson_list_titles);
- lesson_list_titles = NULL;
- }
-
- if (lesson_list_filenames)
- {
- for (i = 0; i < num_lessons; i++)
- {
- if (lesson_list_filenames[i])
- {
- free(lesson_list_filenames[i]);
- lesson_list_filenames[i] = NULL;
- }
- }
- free(lesson_list_filenames);
- lesson_list_filenames = NULL;
- }
-
// Close the audio mixer. We have to do this at least as many times
// as it was opened.
n_timesopened = Mix_QuerySpec(&frequency,&format,&channels);
diff --git a/src/setup.h b/src/setup.h
index 437db20..ab0f839 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -1,7 +1,7 @@
/*
setup.h
- For TuxMath
+ For TuxHistory
Contains functions to initialize the settings structs,
read in command-line arguments, and to clean up on exit.
All code involving file I/O has been moved to fileops.h/fileops.c
@@ -23,13 +23,15 @@
Modified by David Bruce
davidstuartbruce at gmail.com
September 1, 2006
+
+ And by Jesus Mager
+ June 2010
*/
#ifndef SETUP_H
#define SETUP_H
-
void setup(int argc, char * argv[]);
void cleanup(void);
void cleanup_on_error(void);
diff --git a/src/tuxhistory.h b/src/tuxhistory.h
index 914e0f1..fd90e81 100644
--- a/src/tuxhistory.h
+++ b/src/tuxhistory.h
@@ -32,6 +32,7 @@
#include "SDL_mixer.h"
#endif
+#include "map.h"
#define MAX_SPRITE_FRAMES 30
@@ -66,7 +67,7 @@ extern sprite* sprites[];
extern SDL_Surface* flipped_images[];
extern SDL_Surface* terrain[];
extern SDL_Surface* objects[];
-extern th_map map[][];
+extern th_map **map;
extern th_obj* object;
#define NUM_BLENDED_IGLOOS 15
--
tuxhistory - Educational history game
More information about the Tux4kids-commits
mailing list