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

julio (none) julio at julio-desktop.
Thu May 27 06:24:58 UTC 2010


The following commit has been merged in the master branch:
commit b4438c3fac8890fc1b8a28b094995028cf9d89ec
Author: julio <julio at julio-desktop.(none)>
Date:   Thu May 27 01:23:44 2010 -0500

    Win32 Building support

diff --git a/doc/changelog b/doc/changelog
index 5ee9702..2588701 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,3 +1,11 @@
+
+2010.May.26 (git://git.debian.org/tux4kids/tuxhistory.git)
+	We start TuxHistory, I made the first import using as base the
+	existing code of TuxMath. At this moment TuxHistory have had a 
+	cleaning process deleting the Tuxmath specific code. 
+
+	Jesús Mager <fongog at gmail dot com>
+
 2010.Mar.12 (git://git.debian.org/tux4kids/tuxmath.git)
         Tuxmath now using Git for source code management, which provides
 	superior automated documentation for changes in the form of commit
diff --git a/nsis/tuxmath.nsi.in b/nsis/tuxmath.nsi.in
index 687f3e0..5a5ff02 100644
--- a/nsis/tuxmath.nsi.in
+++ b/nsis/tuxmath.nsi.in
@@ -4,11 +4,11 @@
 # modified more for tuxmath by David Bruce <davidstuartbruce at gmail.com>
 
 !define PKG_VERSION "@VERSION@"
-!define PKG_PREFIX  "tuxmath"
+!define PKG_PREFIX  "tuxhistory"
 
-!define APP_PREFIX  "TuxMath"
+!define APP_PREFIX  "TuxHistory"
 !define APP_EXE     "${APP_PREFIX}.exe"
-!define APP_NAME    "Tux of Math Command"
+!define APP_NAME    "Tux History"
 
 OutFile     "${PKG_PREFIX}-${PKG_VERSION}-win32-installer.exe"
 Name        "${APP_NAME}"
@@ -46,7 +46,7 @@ AutoCloseWindow     true
 
 Section
   SetOutPath $INSTDIR
-  File "mingw32\${APP_EXE}"
+  File "src\${APP_EXE}"
 #  File "mingw32\*.dll"
   SetOutPath $INSTDIR\data
   File /r "mingw32\data\*.*"
@@ -77,19 +77,19 @@ Section "Start Menu Shortcuts"
                   "-f" \
                   "$INSTDIR\data\images\icons\tuxmath.ico" \
                   0 "" ""  \
-                  "Start TuxMath in Fullscreen mode"
+                  "Start Tux History in Fullscreen mode"
 
   CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" \
                   "$INSTDIR\${APP_EXE}" \
                   "-w" \
                   "$INSTDIR\data\images\icons\tuxmath.ico"  \ 
                   0 "" "" \
-                  "Start TuxMath in a Window"
+                  "Start TuxHistory in a Window"
 
   CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" \
                   "$INSTDIR\uninstall.exe" ""  \ 
                   "$INSTDIR\uninstall.exe" 0 "" "" \
-                  "Remove Tux of Math Command"
+                  "Remove Tux History Command"
 SectionEnd
 
 Section "Desktop Shortcut"
@@ -99,7 +99,7 @@ Section "Desktop Shortcut"
                  "$INSTDIR\${APP_EXE}"  ""  \
                  "$INSTDIR\data\images\icons\tuxmath.ico" \
                  0  "" ""  \ 
-                 "Run Tux of Math Command"
+                 "Run Tux History"
 SectionEnd
 
 # Uninstall stuff
diff --git a/nsis/tuxmath_with_conf.nsi.in b/nsis/tuxmath_with_conf.nsi.in
index edffcc6..726d61d 100644
--- a/nsis/tuxmath_with_conf.nsi.in
+++ b/nsis/tuxmath_with_conf.nsi.in
@@ -3,11 +3,11 @@
 # modified for tuxmath by Yves Combe (yves at ycombe.net)
 
 !define PKG_VERSION "@VERSION@"
-!define PKG_PREFIX  "tuxmath"
+!define PKG_PREFIX  "tuxhistory"
 
-!define APP_PREFIX  "TuxMath"
+!define APP_PREFIX  "TuxHistory"
 !define APP_EXE     "${APP_PREFIX}.exe"
-!define APP_NAME    "Tux of Math Command"
+!define APP_NAME    "Tux History"
 
 !define CONF_EXE     "tuxmath_config.exe"
 !define CONF_DIR     "TuxMathConfig"
@@ -68,17 +68,17 @@ Section "Start Menu Shortcuts"
   SetShellVarContext all
   SetOutPath $INSTDIR
   CreateDirectory "$SMPROGRAMS\${APP_NAME}"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" "$INSTDIR\${APP_EXE}" "-f" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in Fullscreen mode"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" "$INSTDIR\${APP_EXE}" "-w" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in a Window"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Configure TuxMath.lnk" "$INSTDIR\${CONF_DIR}\${CONF_EXE}" "-w" "$INSTDIR\${CONF_DIR}\${CONF_EXE}" 0 "" "" "Configure TuxMath"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux of Math Command"
+  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" "$INSTDIR\${APP_EXE}" "-f" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxHistory in Fullscreen mode"
+  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" "$INSTDIR\${APP_EXE}" "-w" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxHistory in a Window"
+  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Configure TuxMath.lnk" "$INSTDIR\${CONF_DIR}\${CONF_EXE}" "-w" "$INSTDIR\${CONF_DIR}\${CONF_EXE}" 0 "" "" "Configure TuxHistory"
+  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux History"
 SectionEnd
 
 
 Section "Desktop Shortcut"
   SetShellVarContext all
   SetOutPath $INSTDIR
-  CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}" "" "$INSTDIR\${APP_EXE}" 0  "" "" "Run Tux of Math Command"
+  CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}" "" "$INSTDIR\${APP_EXE}" 0  "" "" "Run Tux History"
 SectionEnd
 
 ;Function .onInstSuccess
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 53be6b7..61b3249 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,9 @@
 # List of source files which contain translatable strings.
-src/campaign.h
-src/campaign.c
 src/credits.c
-src/factoroids.c
 src/game.c
 src/highscore.c
 src/menu.c
-src/multiplayer.c
-src/server.c
 src/titlescreen.c
-src/tuxmath.c
+src/tuxhistory.c
 data/missions/lessons/descr_lessons
-data/menus/menu_strings
\ No newline at end of file
+data/menus/menu_strings
diff --git a/po/ar.gmo b/po/ar.gmo
index 750e24e..8f9de26 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 05c976c..2ea5d28 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -12,122 +12,6 @@ msgstr ""
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-Country: UNITED KINGDOM\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -210,321 +94,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "مرحبا بكم في tuxmath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "مهمتكم هو انقاذ"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "اكواخ البطاريق من"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "المذنبات المتساقطة."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "أوقف المذنب بكتابة"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "الجواب على مشكلة الرياضيات"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "والضغط على زر اﻷدخال او المساقة"
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "جربها الآن!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "رميه جيده!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "اذا اصيب كوخ اﻷسكيمو"
-
-#: src/game.c:1151
-#, fuzzy
-msgid "it melts. But don't worry: the"
-msgstr "فسيذاب ولكن لا تقلق"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "البطريق بخير!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "اﻷن شاهد ما يحدث :"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(الصحافة مفتاح البدأ)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "اشعار الاجابه"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "اما اذا صدم مرة أخرى"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "فأن البطريق سيغادر."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(اضغط اى مفتاح عندما تستعد)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "يمكنك اصلاح اكواخ الاسكيمو"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "بوقف مكافاه المذنبات."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "انطلق الآن!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "رائع!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "يمكنك الخروج اى وقت بالضغط على"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "'ESC' أو 'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "في الركن الايمن العلوي."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "افعلها اﻷن, ثم ابدأ اللعب !"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "قاعة الشهره"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "مبتدئ"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "الكشفيه"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "حارس"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "اس"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath برنامج حر مفتوح المصدر"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "يمكنك المساعدة بجعلها افضل بإرسال اى مشاكل تواجها,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net ناقش المستقبل على "
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "حرر ملف 'الخيارات' فى مجلدك الافتراضى"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "لإنشاء لعبة مخصصة"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "اضغط فوق مفتاح أو انقر الماوس لبدء اللعبة."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Readme.txt انظر لمزيد من المعلومات"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(اضغط اى مفتاح عندما تستعد)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "! العمل يتقدم"
@@ -541,7 +168,7 @@ msgstr "ناقش مستقبل اللعبة فى"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "Tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "مساعدة"
 
@@ -779,77 +406,136 @@ msgstr "ضرب الأرقام الموجية والسالبة "
 msgid "Division of Positives and Negatives"
 msgstr "قسمة الأرقام الموجية والسالبة"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "فريق العمل"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "القائمة الرئيسية"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "ديمو"
+msgid "More Options"
+msgstr "مزيد من الخيارات"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
+msgid "Project Info"
+msgstr "معلومات المشروع"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "خروج"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "القائمة الرئيسية"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "مرحبا بكم في tuxmath!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "مهمتكم هو انقاذ"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "اكاديميه التدريب"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "اكواخ البطاريق من"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "مزيد من الخيارات"
+#~ msgid "falling comets."
+#~ msgstr "المذنبات المتساقطة."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "أوقف المذنب بكتابة"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "الجواب على مشكلة الرياضيات"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "لعبه تقليدية"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "والضغط على زر اﻷدخال او المساقة"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "لعبة مخصصة"
+#~ msgid "Try it now!"
+#~ msgstr "جربها الآن!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Good shot!"
+#~ msgstr "رميه جيده!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "معلومات المشروع"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "اذا اصيب كوخ اﻷسكيمو"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "خروج"
+#, fuzzy
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "فسيذاب ولكن لا تقلق"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "البطريق بخير!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "اﻷن شاهد ما يحدث :"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(الصحافة مفتاح البدأ)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "اشعار الاجابه"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "اما اذا صدم مرة أخرى"
+
+#~ msgid "penguin leaves."
+#~ msgstr "فأن البطريق سيغادر."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(اضغط اى مفتاح عندما تستعد)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "يمكنك اصلاح اكواخ الاسكيمو"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "بوقف مكافاه المذنبات."
+
+#~ msgid "Zap it now!"
+#~ msgstr "انطلق الآن!"
+
+#~ msgid "Great job!"
+#~ msgstr "رائع!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "يمكنك الخروج اى وقت بالضغط على"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "'ESC' أو 'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "في الركن الايمن العلوي."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "افعلها اﻷن, ثم ابدأ اللعب !"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "حرر ملف 'الخيارات' فى مجلدك الافتراضى"
+
+#~ msgid "to create customized game!"
+#~ msgstr "لإنشاء لعبة مخصصة"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "اضغط فوق مفتاح أو انقر الماوس لبدء اللعبة."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Readme.txt انظر لمزيد من المعلومات"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(اضغط اى مفتاح عندما تستعد)"
+
+#~ msgid "Demo"
+#~ msgstr "ديمو"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "اكاديميه التدريب"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "لعبه تقليدية"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "لعبة مخصصة"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "أو اى مقترحات أو كتابة أكواد"
diff --git a/po/ast.po b/po/ast.po
index d1638ec..3a8ed6f 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -18,144 +18,6 @@ msgstr ""
 "X-Generator: Virtaal 0.5.2\n"
 "X-Poedit-Language: Asturian\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "¡Norabona! ¡Ganasti!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Ronda"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] pa saltar"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Misión 1: Cuidáu Cadete"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "¡¡Préstame tanto que vinieres!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"¡Los pingüinos necesítente! Tán cayendo cometes dende'l cielu y derriten los "
-"iglús de los pingüinos. Pa salvar les sos cases, necesitamos qu'atopes el "
-"códigu secretu pa esborrar cada cometa."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "¡Failo lo meyor que puedas!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Misión 2: Esplorador Intelixente"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"¡Bien fecho! Salvasti abondes cases, ascedímoste a Esplorador. Los "
-"Esploradores son bonos vixilando por si hai problemes..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...¡como'l d'agora mesmo! ¡Vinieron los Birlladores y tán mandando cometes "
-"nuevos y más complicaos escontra los pingüinos!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "¡Pero tu pues salvalos!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Misión 3: Guarda Real"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"¡Llográstilo otra vuelta! L'Emperador Pingüín escoyóte pa ser el xefe del "
-"equipu de Guardes qu'ayuden a la ciudá. Tamos unviándote ellí agora mesmo..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...¡oh, non! ¡L'Emperador ta siendo atacáu por una triba nueva de cometes: "
-"los problemes multiplíquense! Pa derrotalos vas necesitar grandes "
-"habilidaes. Creyemos que pues facelo. ¡Garra los Guardes y ayuda a salvar la "
-"ciudá!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Misión 4: As Imperial"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"¡Llográstilo! L'Emperador quier date les gracies en persona. Tamos "
-"mandándote al palaciu de xelu pa recibir un gran honor: ¡vas convertite n'As "
-"Imperial!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-"¡Pero, xusto en metá de la ceremonia, un nuevu ataque dende la tierra de les "
-"Divisiones entama!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "¡Agora nun hai tiempu pa reposar, la ciudá necesítate!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Misión Final: Comando Computador"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Los científicos pingüinos averiguaron que tolos ataques vienen d'una base "
-"secreta, y necesite que vayas ellí pa la batalla final. Amás, ellos quieren "
-"date una pista: primero fae les multiplicaciones y divisiones y depués fae "
-"les sumes y restes."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "¡Espero que'l conseyu furrule!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "¡Esta ye la tuya! ¡Pues acabar con esos ataques pa siempre, Comando!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "¡Téntalo otra vuelta!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Misión finada. ¡La galaxa ta segura!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "TUX, OF MATH COMMAND"
@@ -248,323 +110,62 @@ msgstr ""
 "Pa más información no tocante a Software Llibre y la llicencia GPL de GNU, "
 "visita:"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FACTOROIDES: pa ganar tienes que destruyir tolos asteroides."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Usa les fleches de cursos pa xirar o avanza. Apunta a un asteroide,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "escribi ún de los sos factores, y calca \"espaciu\" o \"intro\""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-"pa dividilu en factores. ¡Les roques con númberos primos van ser destruyíes!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "FRACCIONES: pa ganar tienes que destruyir tolos asteroides"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"escribi un númberu que pueda simplificar la fracción y calca \"espaciu\" o "
-"\"intro\""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"pa dividilu. ¡Destrúi les fracciones que nun puen ser más simplificaes con "
-"un disparu namás!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "¡Bienllegáu a TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "La to misión ye salvar los"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "iglús de los pingüinos de los"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "cometes que caen."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Para un cometa escribiendo"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "la rempuesta a la operación matemática"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "y calcando 'espaciu' o 'intro'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "¡Téntalo agora!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "¡Bon disparu!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Si un iglú ye golpeáu por un cometa,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "ésti queda dañáu. Pero nun t'esmolezas:"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "¡los pingüinos van tar bien!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Namás mira lo que pasa:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Calca una tecla pa entamar)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Observa la rempuesta"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Si lu golpeen otra vuelta,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr " el pingüín marcha."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Calca una tecla cuando teas preparáu)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Pues iguar los iglúes"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "parando los cometes con bonus."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "¡Esbórralu agora!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "¡Bon trabayu!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Colar en cualisquier momentu calcando"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "'Esc' o calcando la 'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "de la esquina superior drecha."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "¡Fecho, agora a xugar!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Salón de la Fama"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Cadete Espacial"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Esplorador"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Guarda"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "As"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Comando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Factores"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Fracciones"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "¡Entrasti nel Salón de la Fama!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Pon el to Nome:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "¡TuxMath ye llibre y de códigu abiertu!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 msgid "You can help make it better."
 msgstr "Pues ayudar a ameyoralu."
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr "¡Pues contribuyir con suxerencies, trabayu asrtísticu y códigu!"
 
-#: src/menu.c:378
+#: src/menu.c:316
 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/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "¡Edita'l ficheru 'options' nel to direutoriu del home"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "pa crear un xuegu personalizáu!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Calca una tecla o nel mur pa entamar el xuegu."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Llei README.txt pa más información"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "¿Cuántos neños van xugar?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(Ente 2 y 4 xugadores)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr "El sirvidor ta tovía corriendo"
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr "Mete'l Nome del Sirvidor:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr "(50 carauteres máximo)"
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-"Calca o prime una tecla pa seleicionar un ficheru de lleición del sirvidor"
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr "Nome del Sirvidor:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr "Llección Escoyida:"
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr "Siéntolo, esta versión nun tien sofitu de rede"
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr "Siéntolo, esta versión nun tien sofitu de rede\n"
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr "Detectando sirvidores"
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr "Espera un segundu"
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr "Conectáu col sirvidor: %s"
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Mete'l to nome:"
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr "Calca nel mur cuando teas preparáu"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr "Esperando por otros xugadores"
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr "Siéntolo, el xuegu yá ta en marcha."
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr "Siéntolo, el xuegu yá ta en marcha..\n"
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr "Siéntolo, nun pudi encontrar nengún sirvidor."
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr "Siéntolo, nun pudi encontrar nengún sirvidor.\n"
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr "Entós %s\n"
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "¿Quién xuega primero?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "¿Quién xuega depués?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "¿Cuántes rondes vais xugar?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Mete un númberu"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "¡Trabayu en marcha!"
@@ -581,7 +182,7 @@ msgstr "Alderica al rodiu del futuru de TuxMath en"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Aida"
 
@@ -817,77 +418,378 @@ msgstr "Multiplicación de Positivos y Negativos"
 msgid "Division of Positives and Negatives"
 msgstr "División de Positivos y Negativos"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Créditos"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Menú Principal"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
+msgid "More Options"
+msgstr "Más Opciones"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Eliminación"
+msgid "Play Alone"
+msgstr "Xugar solo"
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "¡Factoroides!"
+msgid "Project Info"
+msgstr "Información del Proyeutu"
+
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Colar"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr "Xunise a una partida"
+#~ msgid "Congratulations! You win!"
+#~ msgstr "¡Norabona! ¡Ganasti!"
+
+#~ msgid "Round"
+#~ msgstr "Ronda"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "-[Esc] pa saltar"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Misión 1: Cuidáu Cadete"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "¡¡Préstame tanto que vinieres!"
+
+#~ msgid ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+#~ msgstr ""
+#~ "¡Los pingüinos necesítente! Tán cayendo cometes dende'l cielu y derriten "
+#~ "los iglús de los pingüinos. Pa salvar les sos cases, necesitamos "
+#~ "qu'atopes el códigu secretu pa esborrar cada cometa."
+
+#~ msgid "Do your best!"
+#~ msgstr "¡Failo lo meyor que puedas!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Misión 2: Esplorador Intelixente"
+
+#~ msgid ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+#~ msgstr ""
+#~ "¡Bien fecho! Salvasti abondes cases, ascedímoste a Esplorador. Los "
+#~ "Esploradores son bonos vixilando por si hai problemes..."
+
+#~ msgid ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+#~ msgstr ""
+#~ "...¡como'l d'agora mesmo! ¡Vinieron los Birlladores y tán mandando "
+#~ "cometes nuevos y más complicaos escontra los pingüinos!"
+
+#~ msgid "But you can save them!"
+#~ msgstr "¡Pero tu pues salvalos!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Misión 3: Guarda Real"
+
+#~ msgid ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+#~ msgstr ""
+#~ "¡Llográstilo otra vuelta! L'Emperador Pingüín escoyóte pa ser el xefe del "
+#~ "equipu de Guardes qu'ayuden a la ciudá. Tamos unviándote ellí agora "
+#~ "mesmo..."
+
+#~ msgid ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+#~ msgstr ""
+#~ "...¡oh, non! ¡L'Emperador ta siendo atacáu por una triba nueva de "
+#~ "cometes: los problemes multiplíquense! Pa derrotalos vas necesitar "
+#~ "grandes habilidaes. Creyemos que pues facelo. ¡Garra los Guardes y ayuda "
+#~ "a salvar la ciudá!"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Misión 4: As Imperial"
+
+#~ msgid ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+#~ msgstr ""
+#~ "¡Llográstilo! L'Emperador quier date les gracies en persona. Tamos "
+#~ "mandándote al palaciu de xelu pa recibir un gran honor: ¡vas convertite "
+#~ "n'As Imperial!"
+
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr ""
+#~ "¡Pero, xusto en metá de la ceremonia, un nuevu ataque dende la tierra de "
+#~ "les Divisiones entama!"
+
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "¡Agora nun hai tiempu pa reposar, la ciudá necesítate!"
+
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Misión Final: Comando Computador"
+
+#~ msgid ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+#~ msgstr ""
+#~ "Los científicos pingüinos averiguaron que tolos ataques vienen d'una base "
+#~ "secreta, y necesite que vayas ellí pa la batalla final. Amás, ellos "
+#~ "quieren date una pista: primero fae les multiplicaciones y divisiones y "
+#~ "depués fae les sumes y restes."
+
+#~ msgid "I hope that hint helps!"
+#~ msgstr "¡Espero que'l conseyu furrule!"
+
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr ""
+#~ "¡Esta ye la tuya! ¡Pues acabar con esos ataques pa siempre, Comando!"
+
+#~ msgid "Sorry, try again!"
+#~ msgstr "¡Téntalo otra vuelta!"
+
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Misión finada. ¡La galaxa ta segura!"
+
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "FACTOROIDES: pa ganar tienes que destruyir tolos asteroides."
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Menú Principal"
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr "Usa les fleches de cursos pa xirar o avanza. Apunta a un asteroide,"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Misiones de Math Command"
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "escribi ún de los sos factores, y calca \"espaciu\" o \"intro\""
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Academia d'Entrenamientu de Math Command"
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr ""
+#~ "pa dividilu en factores. ¡Les roques con númberos primos van ser "
+#~ "destruyíes!"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Más Opciones"
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "FRACCIONES: pa ganar tienes que destruyir tolos asteroides"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr "Xuegu en Rede"
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr ""
+#~ "escribi un númberu que pueda simplificar la fracción y calca \"espaciu\" "
+#~ "o \"intro\""
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Xugar solo"
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "pa dividilu. ¡Destrúi les fracciones que nun puen ser más simplificaes "
+#~ "con un disparu namás!"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Xuegu Arcade"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "¡Bienllegáu a TuxMath!"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Xuegu Personalizáu"
+#~ msgid "Your mission is to save your"
+#~ msgstr "La to misión ye salvar los"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Xugar con Collacios"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "iglús de los pingüinos de los"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Información del Proyeutu"
+#~ msgid "falling comets."
+#~ msgstr "cometes que caen."
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Colar"
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Para un cometa escribiendo"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "la rempuesta a la operación matemática"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "y calcando 'espaciu' o 'intro'."
+
+#~ msgid "Try it now!"
+#~ msgstr "¡Téntalo agora!"
+
+#~ msgid "Good shot!"
+#~ msgstr "¡Bon disparu!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Si un iglú ye golpeáu por un cometa,"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "ésti queda dañáu. Pero nun t'esmolezas:"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "¡los pingüinos van tar bien!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "Namás mira lo que pasa:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Calca una tecla pa entamar)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Observa la rempuesta"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Si lu golpeen otra vuelta,"
+
+#~ msgid "penguin leaves."
+#~ msgstr " el pingüín marcha."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Calca una tecla cuando teas preparáu)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Pues iguar los iglúes"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "parando los cometes con bonus."
+
+#~ msgid "Zap it now!"
+#~ msgstr "¡Esbórralu agora!"
+
+#~ msgid "Great job!"
+#~ msgstr "¡Bon trabayu!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Colar en cualisquier momentu calcando"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "'Esc' o calcando la 'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "de la esquina superior drecha."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "¡Fecho, agora a xugar!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "¡Edita'l ficheru 'options' nel to direutoriu del home"
+
+#~ msgid "to create customized game!"
+#~ msgstr "pa crear un xuegu personalizáu!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Calca una tecla o nel mur pa entamar el xuegu."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Llei README.txt pa más información"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "¿Cuántos neños van xugar?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(Ente 2 y 4 xugadores)"
+
+#~ msgid "The server is already running"
+#~ msgstr "El sirvidor ta tovía corriendo"
+
+#~ msgid "Enter Server Name:"
+#~ msgstr "Mete'l Nome del Sirvidor:"
+
+#~ msgid "(limit 50 characters)"
+#~ msgstr "(50 carauteres máximo)"
+
+#~ msgid "Click or press key to select server lesson file"
+#~ msgstr ""
+#~ "Calca o prime una tecla pa seleicionar un ficheru de lleición del sirvidor"
+
+#~ msgid "Server Name:"
+#~ msgstr "Nome del Sirvidor:"
+
+#~ msgid "Selected Lesson:"
+#~ msgstr "Llección Escoyida:"
+
+#~ msgid "Sorry, this version built without network support"
+#~ msgstr "Siéntolo, esta versión nun tien sofitu de rede"
+
+#~ msgid "Sorry, this version built without network support.\n"
+#~ msgstr "Siéntolo, esta versión nun tien sofitu de rede\n"
+
+#~ msgid "Detecting servers"
+#~ msgstr "Detectando sirvidores"
+
+#~ msgid "Please wait"
+#~ msgstr "Espera un segundu"
+
+#~ msgid "Connected to server: %s"
+#~ msgstr "Conectáu col sirvidor: %s"
+
+#~ msgid "Enter your name:"
+#~ msgstr "Mete'l to nome:"
+
+#~ msgid "Click when ready"
+#~ msgstr "Calca nel mur cuando teas preparáu"
+
+#~ msgid "Waiting for other players"
+#~ msgstr "Esperando por otros xugadores"
+
+#~ msgid "Sorry, game already in progress."
+#~ msgstr "Siéntolo, el xuegu yá ta en marcha."
+
+#~ msgid "Sorry, game already in progress.\n"
+#~ msgstr "Siéntolo, el xuegu yá ta en marcha..\n"
+
+#~ msgid "Sorry, no server could be found."
+#~ msgstr "Siéntolo, nun pudi encontrar nengún sirvidor."
+
+#~ msgid "Sorry, no server could be found.\n"
+#~ msgstr "Siéntolo, nun pudi encontrar nengún sirvidor.\n"
+
+#~ msgid "Then %s\n"
+#~ msgstr "Entós %s\n"
+
+#~ msgid "Who is playing first?"
+#~ msgstr "¿Quién xuega primero?"
+
+#~ msgid "Who is playing next?"
+#~ msgstr "¿Quién xuega depués?"
+
+#~ msgid "How many rounds will you play?"
+#~ msgstr "¿Cuántes rondes vais xugar?"
+
+#~ msgid "Enter a number"
+#~ msgstr "Mete un númberu"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Elimination"
+#~ msgstr "Eliminación"
+
+#~ msgid "Factoroids!"
+#~ msgstr "¡Factoroides!"
+
+#~ msgid "Join Game"
+#~ msgstr "Xunise a una partida"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Misiones de Math Command"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Academia d'Entrenamientu de Math Command"
+
+#~ msgid "Network Game"
+#~ msgstr "Xuegu en Rede"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Xuegu Arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Xuegu Personalizáu"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Xugar con Collacios"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr "Arrancar Sirvidor"
+#~ msgid "Run Server"
+#~ msgstr "Arrancar Sirvidor"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Puntuaciones"
+#~ msgid "Score Sweep"
+#~ msgstr "Puntuaciones"
 
 #~ msgid "Select lesson file for server to use"
 #~ msgstr "Escueyi ficheru de llección pa usar nel sirvidor"
diff --git a/po/cs.gmo b/po/cs.gmo
index d3f4fca..9a53f11 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index cdcc416..d7c5cc5 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -17,122 +17,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -215,319 +99,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Síň slávy"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Nováček"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Průzkumník"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Střelec"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Borec"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath je svobodný software!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "I ty ho můžeš vylepšit, když oznámíš chyby, "
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Uprav soubor «options » ve své domovské složce,"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "abys mohl vytvořit vlastní hru!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Zmáčkni klávesu nebo klikni tlačítkem myši, abys začal hru"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Pokud chceš více informací, podívej se na README.txt"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Ve výstavbě!"
@@ -544,7 +173,7 @@ msgstr "Diskutuj o budoucnosti TuxMath na"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Nápověda"
 
@@ -782,77 +411,53 @@ msgstr "Násobení kladných a záporných čísel"
 msgid "Division of Positives and Negatives"
 msgstr "Dělení kladných a záporných čísel"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Poděkování"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Hlavní menu"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Akademie vesmírné matematiky"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Více možností"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Hra"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Vlastní hra"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Info o projektu"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Ukončit"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Uprav soubor «options » ve své domovské složce,"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "abys mohl vytvořit vlastní hru!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Zmáčkni klávesu nebo klikni tlačítkem myši, abys začal hru"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Pokud chceš více informací, podívej se na README.txt"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademie vesmírné matematiky"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Hra"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Vlastní hra"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "navrhneš vylepšení nebo přidáš svůj kód"
diff --git a/po/de.gmo b/po/de.gmo
index 3847d56..3bb9ae3 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 6174a49..2896819 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -14,122 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -212,322 +96,65 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Willkommen bei TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Deine Mission besteht darin, "
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "die Iglus der Pinguine vor den "
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "herabfallenden Kometen zu schützen."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Stoppe einen Kometen, indem du "
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "die Antwort auf das mathematische Problem"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "eingibst und die \"Leertaste\" oder \"Enter\" drückst. "
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Versuch es jetzt!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Guter Schuß!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Wenn ein Iglu von einem Kometen getroffen wird, "
-
-#: src/game.c:1151
-#, fuzzy
-msgid "it melts. But don't worry: the"
-msgstr "schmilzt es. Aber keine Angst, dem "
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "Pingiun geht es gut!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Sie einfach zu was passiert "
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Eine Taste zum starten drücken)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Beachte die Antwort"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "wenn es noch einmal getroffen wird, "
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "wird der Pinguin verschwinden."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Wenn fertig, bitte Taste drücken)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Du kannst die kaputten Iglus reparieren"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "wenn du Bonus-Kometen aufhälst."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Knall ihn jetzt ab!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Super Arbeit!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Beende das Spiel zu jeder Zeit durch Drücken von "
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "'Esc' oder durch klicken auf das 'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "in der oberen rechten Ecke."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Tu es jetzt - und dann spiele!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Ruhmeshalle"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Raumkadett"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Aufklärer"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Jäger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ass"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath ist frei und OpenSource!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Du kannst bei der Verbesserung helfen, wenn du Probleme "
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
 "Diskutiere die Zukunft von TuxMath auf tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Editiere die 'options' Datei in deinem Benutzerverzeichnis"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "um ein angepasstes Spiel zu erzeugen."
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Drücke eine Taste oder klicke mit der Maus um ein Spiel zu starten"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Lies die README.txt Datei für weitere Infrormationen"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Wenn fertig, bitte Taste drücken)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "In Arbeit!"
@@ -544,7 +171,7 @@ msgstr "Diskutiere über die Zukunft von TuxMath auf "
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Hilfe"
 
@@ -782,77 +409,136 @@ msgstr "Multiplikation von positiven und negativen Zahlen"
 msgid "Division of Positives and Negatives"
 msgstr "Division von positiven und negativen Zahlen"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Abspann"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Hauptmenü"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstration"
+msgid "More Options"
+msgstr "Weitere Optionen"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
+msgid "Project Info"
+msgstr "Projekt Information"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Ende"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Hauptmenü"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Willkommen bei TuxMath!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "Deine Mission besteht darin, "
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Math Command Trainings-Akademie"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "die Iglus der Pinguine vor den "
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Weitere Optionen"
+#~ msgid "falling comets."
+#~ msgstr "herabfallenden Kometen zu schützen."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Stoppe einen Kometen, indem du "
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "die Antwort auf das mathematische Problem"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Spiele Arcade Spiel"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "eingibst und die \"Leertaste\" oder \"Enter\" drückst. "
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Spiele angepasstes Spiel"
+#~ msgid "Try it now!"
+#~ msgstr "Versuch es jetzt!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Good shot!"
+#~ msgstr "Guter Schuß!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Projekt Information"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Wenn ein Iglu von einem Kometen getroffen wird, "
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Ende"
+#, fuzzy
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "schmilzt es. Aber keine Angst, dem "
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "Pingiun geht es gut!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "Sie einfach zu was passiert "
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Eine Taste zum starten drücken)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Beachte die Antwort"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "wenn es noch einmal getroffen wird, "
+
+#~ msgid "penguin leaves."
+#~ msgstr "wird der Pinguin verschwinden."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Wenn fertig, bitte Taste drücken)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Du kannst die kaputten Iglus reparieren"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "wenn du Bonus-Kometen aufhälst."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Knall ihn jetzt ab!"
+
+#~ msgid "Great job!"
+#~ msgstr "Super Arbeit!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Beende das Spiel zu jeder Zeit durch Drücken von "
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "'Esc' oder durch klicken auf das 'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "in der oberen rechten Ecke."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Tu es jetzt - und dann spiele!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Editiere die 'options' Datei in deinem Benutzerverzeichnis"
+
+#~ msgid "to create customized game!"
+#~ msgstr "um ein angepasstes Spiel zu erzeugen."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Drücke eine Taste oder klicke mit der Maus um ein Spiel zu starten"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lies die README.txt Datei für weitere Infrormationen"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Wenn fertig, bitte Taste drücken)"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstration"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Math Command Trainings-Akademie"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Spiele Arcade Spiel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Spiele angepasstes Spiel"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "meldest, Wünsche außerst oder Programmcode beisteuerst."
diff --git a/po/en at boldquot.gmo b/po/en at boldquot.gmo
index e9d6f9d..a7472e3 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 bef90db..08d580a 100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@ -1,4 +1,4 @@
-# English translations for Tux Of Math Command package.
+# English translations for Tux Hisotry package.
 # This file is put in the public domain.
 # Automatically generated, 2010.
 #
@@ -29,10 +29,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tuxmath 1.8.0\n"
+"Project-Id-Version: tuxhistory 0.0.1\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-07 17:05-0500\n"
-"PO-Revision-Date: 2010-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00:16-0500\n"
+"PO-Revision-Date: 2010-05-27 00:16-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -40,142 +40,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Congratulations! You win!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Round"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] to skip"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Mission One: Careful Cadet"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "I'm so glad you've come!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "Do your best!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Mission Two: Smart Scout"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "But you can save them!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Mission Three: Royal Ranger"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Mission Four: Imperial Ace"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Now is no time for resting; the city needs your help!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Final Mission: Computing Commando"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "I hope that hint helps!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "This is it! You can stop these attacks forever, Commando!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Sorry, try again!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Mission accomplished. The galaxy is safe!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "TUX, OF MATH COMMAND"
@@ -264,320 +128,62 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr "For more information about Free Software and the GNU GPL, visit:"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "type one of its factors, and press space or return"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr "to split it into its factors.  Rocks with prime numbers are destroyed!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "FRACTIONS: to win, you need destroy all the asteroids"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"type a number that can simplify the fraction, and press space or return"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Welcome to TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Your mission is to save your"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "penguins' igloos from the"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "falling comets."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Stop a comet by typing"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "the answer to the math problem"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "and hitting ‘space’ or 'enter'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Try it now!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Good shot!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "If an igloo gets hit by a comet,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "it melts. But don't worry: the"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "penguin is OK!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Just watch what happens:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Press a key to start)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Notice the answer"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "If it gets hit again, the"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "penguin leaves."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Press a key when ready)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "You can fix the igloos"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "by stopping bonus comets."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Zap it now!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Great job!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Quit at any time by pressing"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "‘Esc’ or clicking the ‘X’"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "in the upper right corner."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Do it now, and then play!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Hall Of Fame"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ace"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Commando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Factors"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Fractions"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "You Are In The Hall of Fame!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Enter Your Name:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is free and open-source!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 msgid "You can help make it better."
 msgstr "You can help make it better."
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr "Suggestions, artwork, and code are all welcome!"
 
-#: src/menu.c:378
+#: src/menu.c:316
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Edit ‘options’ file in your home directory"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "to create customized game!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Press a key or click your mouse to start game."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "See README.txt for more information"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "How many kids are playing?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(Between 2 and 4 players)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr "The server is already running"
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr "Enter Server Name:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr "(limit 50 characters)"
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr "Click or press key to select server lesson file"
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr "Server Name:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr "Selected Lesson:"
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr "Sorry, this version built without network support"
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr "Sorry, this version built without network support.\n"
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr "Detecting servers"
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr "Please wait"
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr "Connected to server: %s"
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Enter your name:"
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr "Click when ready"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr "Waiting for other players"
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr "Sorry, game already in progress."
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr "Sorry, game already in progress.\n"
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr "Sorry, no server could be found."
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr "Sorry, no server could be found.\n"
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr "Then %s\n"
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "Who is playing first?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "Who is playing next?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "How many rounds will you play?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Enter a number"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Work In Progress!"
@@ -594,7 +200,7 @@ msgstr "Discuss the future of TuxMath at"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Help"
 
@@ -830,74 +436,26 @@ msgstr "Multiplication of Positives and Negatives"
 msgid "Division of Positives and Negatives"
 msgstr "Division of Positives and Negatives"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Credits"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Elimination"
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "Factoroids!"
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr "Join Game"
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Main Menu"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Math Command Fleet Missions"
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Math Command Training Academy"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "More Options"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr "Network Game"
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr "Play Alone"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Play Arcade Game"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Play Custom Game"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Play With Friends"
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Project Info"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Quit"
-
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr "Run Server"
-
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Score Sweep"
diff --git a/po/en at quot.gmo b/po/en at quot.gmo
index ed44be8..78f48cc 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 bb12d32..658726e 100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@ -1,4 +1,4 @@
-# English translations for Tux Of Math Command package.
+# English translations for Tux Hisotry package.
 # This file is put in the public domain.
 # Automatically generated, 2010.
 #
@@ -26,10 +26,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tuxmath 1.8.0\n"
+"Project-Id-Version: tuxhistory 0.0.1\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-07 17:05-0500\n"
-"PO-Revision-Date: 2010-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00:16-0500\n"
+"PO-Revision-Date: 2010-05-27 00:16-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -37,142 +37,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Congratulations! You win!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Round"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] to skip"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Mission One: Careful Cadet"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "I'm so glad you've come!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "Do your best!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Mission Two: Smart Scout"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "But you can save them!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Mission Three: Royal Ranger"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Mission Four: Imperial Ace"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Now is no time for resting; the city needs your help!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Final Mission: Computing Commando"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "I hope that hint helps!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "This is it! You can stop these attacks forever, Commando!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Sorry, try again!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Mission accomplished. The galaxy is safe!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "TUX, OF MATH COMMAND"
@@ -261,320 +125,62 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr "For more information about Free Software and the GNU GPL, visit:"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "type one of its factors, and press space or return"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr "to split it into its factors.  Rocks with prime numbers are destroyed!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "FRACTIONS: to win, you need destroy all the asteroids"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"type a number that can simplify the fraction, and press space or return"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Welcome to TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Your mission is to save your"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "penguins' igloos from the"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "falling comets."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Stop a comet by typing"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "the answer to the math problem"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "and hitting ‘space’ or 'enter'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Try it now!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Good shot!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "If an igloo gets hit by a comet,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "it melts. But don't worry: the"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "penguin is OK!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Just watch what happens:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Press a key to start)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Notice the answer"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "If it gets hit again, the"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "penguin leaves."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Press a key when ready)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "You can fix the igloos"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "by stopping bonus comets."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Zap it now!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Great job!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Quit at any time by pressing"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "‘Esc’ or clicking the ‘X’"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "in the upper right corner."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Do it now, and then play!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Hall Of Fame"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ace"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Commando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Factors"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Fractions"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "You Are In The Hall of Fame!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Enter Your Name:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is free and open-source!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 msgid "You can help make it better."
 msgstr "You can help make it better."
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr "Suggestions, artwork, and code are all welcome!"
 
-#: src/menu.c:378
+#: src/menu.c:316
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Edit ‘options’ file in your home directory"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "to create customized game!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Press a key or click your mouse to start game."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "See README.txt for more information"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "How many kids are playing?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(Between 2 and 4 players)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr "The server is already running"
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr "Enter Server Name:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr "(limit 50 characters)"
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr "Click or press key to select server lesson file"
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr "Server Name:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr "Selected Lesson:"
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr "Sorry, this version built without network support"
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr "Sorry, this version built without network support.\n"
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr "Detecting servers"
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr "Please wait"
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr "Connected to server: %s"
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Enter your name:"
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr "Click when ready"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr "Waiting for other players"
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr "Sorry, game already in progress."
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr "Sorry, game already in progress.\n"
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr "Sorry, no server could be found."
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr "Sorry, no server could be found.\n"
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr "Then %s\n"
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "Who is playing first?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "Who is playing next?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "How many rounds will you play?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Enter a number"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Work In Progress!"
@@ -591,7 +197,7 @@ msgstr "Discuss the future of TuxMath at"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Help"
 
@@ -827,74 +433,26 @@ msgstr "Multiplication of Positives and Negatives"
 msgid "Division of Positives and Negatives"
 msgstr "Division of Positives and Negatives"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Credits"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Elimination"
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "Factoroids!"
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr "Join Game"
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Main Menu"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Math Command Fleet Missions"
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Math Command Training Academy"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "More Options"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr "Network Game"
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr "Play Alone"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Play Arcade Game"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Play Custom Game"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Play With Friends"
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Project Info"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Quit"
-
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr "Run Server"
-
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Score Sweep"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index f166df6..384bd86 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 08a5df5..2ba5e46 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -16,142 +16,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Congratulations! You win!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Round"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] to skip"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Mission One: Careful Cadet"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "I'm so glad you've come!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "Do your best!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Mission Two: Smart Scout"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "But you can save them!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Mission Three: Royal Ranger"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Mission Four: Imperial Ace"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Now is no time for resting; the city needs your help!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Final Mission: Computing Commando"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "I hope that hint helps!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "This is it! You can stop these attacks forever, Commando!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Sorry, try again!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Mission accomplished. The galaxy is safe!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "TUX, OF MATH COMMAND"
@@ -243,325 +107,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr "For more information about Free Software and the GNU GPL, visit:"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "type one of its factors, and press space or return"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr "to split it into its factors.  Rocks with prime numbers are destroyed!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "FRACTIONS: to win, you need destroy all the asteroids"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"type a number that can simplify the fraction, and press space or return"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Welcome to TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Your mission is to save your"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "penguins’ igloos from the"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "falling comets."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Stop a comet by typing"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "the answer to the maths problem"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "and hitting ‘space’ or ‘enter’."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Try it now!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Good shot!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "If an igloo gets hit by a comet,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "it melts. But don’t worry: the"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "penguin is OK!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Just watch what happens:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Press a key to start)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Notice the answer"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "If it gets hit again, the"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "penguin leaves."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Press a key when ready)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "You can fix the igloos"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "by stopping bonus comets."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Zap it now!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Great job!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Quit at any time by pressing"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "‘Esc’ or clicking the ‘X’"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "in the upper right corner."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Do it now, and then play!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Hall Of Fame"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ace"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Commando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Factors"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Fractions"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "You Are In The Hall of Fame!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Enter Your Name:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is free and open-source!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "You can help make it better by reporting problems,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Edit ‘options’ file in your home directory"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "to create customised game!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Press a key or click your mouse to start game."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "See README.txt for more information"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "How many kids are playing?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(Between 2 and 4 players)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-#, fuzzy
-msgid "Enter Server Name:"
-msgstr "Enter Your Name:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-#, fuzzy
-msgid "Server Name:"
-msgstr "Enter Your Name:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Enter your name:"
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Press a key when ready)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "Who is playing first?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "Who is playing next?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "How many rounds will you play?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Enter a number"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Work In Progress!"
@@ -578,7 +181,7 @@ msgstr "Discuss the future of TuxMath at"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Help"
 
@@ -814,77 +417,320 @@ msgstr "Multiplication of Positives and Negatives"
 msgid "Division of Positives and Negatives"
 msgstr "Division of Positives and Negatives"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Credits"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Main Menu"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
+msgid "More Options"
+msgstr "More Options"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Elimination"
+msgid "Play Alone"
+msgstr "Play Alone"
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "Factoroids!"
+msgid "Project Info"
+msgstr "Project Info"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Quit"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Main Menu"
+#~ msgid "Congratulations! You win!"
+#~ msgstr "Congratulations! You win!"
+
+#~ msgid "Round"
+#~ msgstr "Round"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "-[Esc] to skip"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Mission One: Careful Cadet"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "I'm so glad you've come!"
+
+#~ msgid ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+#~ msgstr ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+
+#~ msgid "Do your best!"
+#~ msgstr "Do your best!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Mission Two: Smart Scout"
+
+#~ msgid ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+#~ msgstr ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+
+#~ msgid ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+#~ msgstr ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+
+#~ msgid "But you can save them!"
+#~ msgstr "But you can save them!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Mission Three: Royal Ranger"
+
+#~ msgid ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+#~ msgstr ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+
+#~ msgid ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+#~ msgstr ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Mission Four: Imperial Ace"
+
+#~ msgid ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+#~ msgstr ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "Now is no time for resting; the city needs your help!"
+
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Final Mission: Computing Commando"
+
+#~ msgid ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+#~ msgstr ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+
+#~ msgid "I hope that hint helps!"
+#~ msgstr "I hope that hint helps!"
+
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr "This is it! You can stop these attacks forever, Commando!"
+
+#~ msgid "Sorry, try again!"
+#~ msgstr "Sorry, try again!"
+
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Mission accomplished. The galaxy is safe!"
+
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
+
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "type one of its factors, and press space or return"
+
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "FRACTIONS: to win, you need destroy all the asteroids"
+
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr ""
+#~ "type a number that can simplify the fraction, and press space or return"
+
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Welcome to TuxMath!"
+
+#~ msgid "Your mission is to save your"
+#~ msgstr "Your mission is to save your"
+
+#~ msgid "penguins' igloos from the"
+#~ msgstr "penguins’ igloos from the"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Math Command Fleet Missions"
+#~ msgid "falling comets."
+#~ msgstr "falling comets."
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Math Command Training Academy"
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Stop a comet by typing"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "More Options"
+#~ msgid "the answer to the math problem"
+#~ msgstr "the answer to the maths problem"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "and hitting ‘space’ or ‘enter’."
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Play Alone"
+#~ msgid "Try it now!"
+#~ msgstr "Try it now!"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Play Arcade Game"
+#~ msgid "Good shot!"
+#~ msgstr "Good shot!"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Play Custom Game"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "If an igloo gets hit by a comet,"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Play With Friends"
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "it melts. But don’t worry: the"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Project Info"
+#~ msgid "penguin is OK!"
+#~ msgstr "penguin is OK!"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Quit"
+#~ msgid "Just watch what happens:"
+#~ msgstr "Just watch what happens:"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Press a key to start)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Notice the answer"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "If it gets hit again, the"
+
+#~ msgid "penguin leaves."
+#~ msgstr "penguin leaves."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Press a key when ready)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "You can fix the igloos"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "by stopping bonus comets."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Zap it now!"
+
+#~ msgid "Great job!"
+#~ msgstr "Great job!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Quit at any time by pressing"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "‘Esc’ or clicking the ‘X’"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "in the upper right corner."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Do it now, and then play!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edit ‘options’ file in your home directory"
+
+#~ msgid "to create customized game!"
+#~ msgstr "to create customised game!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Press a key or click your mouse to start game."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "See README.txt for more information"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "How many kids are playing?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(Between 2 and 4 players)"
+
+#, fuzzy
+#~ msgid "Enter Server Name:"
+#~ msgstr "Enter Your Name:"
+
+#, fuzzy
+#~ msgid "Server Name:"
+#~ msgstr "Enter Your Name:"
+
+#~ msgid "Enter your name:"
+#~ msgstr "Enter your name:"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Press a key when ready)"
+
+#~ msgid "Who is playing first?"
+#~ msgstr "Who is playing first?"
+
+#~ msgid "Who is playing next?"
+#~ msgstr "Who is playing next?"
+
+#~ msgid "How many rounds will you play?"
+#~ msgstr "How many rounds will you play?"
+
+#~ msgid "Enter a number"
+#~ msgstr "Enter a number"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Elimination"
+#~ msgstr "Elimination"
+
+#~ msgid "Factoroids!"
+#~ msgstr "Factoroids!"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Math Command Fleet Missions"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Math Command Training Academy"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Play Arcade Game"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Play Custom Game"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Play With Friends"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Score Sweep"
+#~ msgid "Score Sweep"
+#~ msgstr "Score Sweep"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "suggesting improvements, or adding code."
diff --git a/po/es.gmo b/po/es.gmo
index d5c195f..267f4de 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 59a2a8a..7d25cbd 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -15,145 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "¡Felicitaciones! ¡Ganaste!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Vuelta"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] para saltear"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Misión Uno: Cadete Cuidadoso"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "¡Que bueno que viniste!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"¡Los pingüinos necesitan tu ayuda! Están lloviendo cometas que derriten los "
-"iglúes de los pingüinos. Para salvar sus casas, tendrás que encontrar el "
-"código secreto que destruirá cada cometa."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "¡Suerte!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Misión Dos: Supervisor Astuto"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"¡Buen trabajo! Como salvaste las casas de los pingüinos, te promoveremos a "
-"Supervisor. Los Supervisores son buenos vigilando que no haya problemas..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...¡como los que hay ahora! ¡Vinieron los Arrebatadores y están lanzando "
-"cometas más complicados contra los pingüinos!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "¡Pero tú puedes salvarlos!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Misión Tres: Guardia Real"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"¡Lo lograste otra vez! El Emperador Pinguino te ha elegido para unirte a su "
-"equipo de Guardias que ayudan a proteger la ciudad. Te estamos enviando "
-"allí..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...¡No! El Emperador está siendo atacado por nuevos tipos de cometas: ¡Estos "
-"problemas se están multiplicando! Para luchar contra ellos necesitarás "
-"grandes habilidades. Pensamos que podrás lograrlo. ¡Únete a los Guardias y "
-"ayuda a salvar la ciudad!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Misión Cuatro: Maestro Imperial"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"¡Lo lograste! El Emperador quiere agradecerte en persona. Te estamos "
-"llevando a su palacio de hielo para un gran honor: ¡te convertirás en el "
-"Maestro Imperial!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-"Pero en la mitad de la ceremonia... ¡Comienza un nuevo ataque de la tierra "
-"de las Divisiones!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "No es tiempo de descansar, ¡la ciudad necesita tu ayuda!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Misión Final: Comando Computador"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Los científicos pingüinos han aprendido que todos estos ataques provienen de "
-"una base secreta, y necesitan que vayas allí a pelear la última batalla. "
-"También te dan esta pista: primero multiplica y divide, y luego suma y resta."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "¡Espero que esa pista te ayude!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-"¡Este es el momento! Puedes detener estos ataques para siempre, Comando!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "¡Intenta de nuevo!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Misión cumplida. ¡La galaxia está a salvo!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "TUX, DE MATH COMMAND"
@@ -243,326 +104,64 @@ msgstr "Se incluye una copia de la GPL en la documentación de este programa."
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr "Para mayor información sobre el Software Libre y la GPL GNU, visite:"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FACTOROIDES: para ganar, tendrás que destruir todos los asteroides."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Usa las teclas de flecha para avanzar o girar. Apunta a un asteroide,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "escribe uno de sus factores y presiona espacio o retorno"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-"para dividirlo en sus factores. ¡Las rocas con números primos se destruyen!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "FRACCIONES: para ganar, tendrás que destruir todos los asteroides."
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"escribe un número que simplifique la fracción y presiona espacio o retorno"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"para dividirlo. ¡Destruye fracciones que no se pueden simplificar más de un "
-"solo tiro!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "¡Bienvenido a TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Tu mision es salvar a"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "los iglúes de tus pingüinos"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "de los cometas que caen."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Para parar el cometa"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "debes escribir la respuesta correcta al problema matemático"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "y presionar 'espacio' o 'enter'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "¡Prueba ahora!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "¡Buen tiro!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Si uno de los iglúes es atacado por un cometa,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "se derretirá. Pero no te preocupes: "
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "¡el pingüino estará a salvo!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Observa lo que sucede:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Presiona una tecla para empezar)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Nota la respuesta"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Si el iglú es atacado de nuevo,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "el pingüino se irá."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Presiona una tecla cuando estés listo)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Tú puedes areglar los iglúes"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr " si logras parar cometas de bono."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "¡Dispárale ahora!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "¡Bien hecho!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Puedes parar el juego en cualquier momento"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "oprimiendo la tecla 'ESC' o haciendo clic en la X "
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "en la esquina derecha de la pantalla."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Hazlo ahora y luego juega"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Salón de la Fama"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Cadete Espacial"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Supervisor"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Guardia"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Maestro"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Comando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Factores"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Fracciones"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "¡Estás en el Salón de la Fama!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Escribe tu nombre:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "¡TuxMath es gratis y de código abierto!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Puedes hacer que el programa funcione mejor reportando problemas,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discute el futuro en tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "¡Edita el archivo de 'opciones' del directorio principal"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "para personalizar el juego!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Presiona una tecla o haz click para empezar el juego."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Ver README.txt para más información"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "¿Cuántos están jugando?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(Entre 2 y 4 jugadores)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-#, fuzzy
-msgid "Enter Server Name:"
-msgstr "Escribe tu nombre:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-#, fuzzy
-msgid "Server Name:"
-msgstr "Escribe tu nombre:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Escribe tu nombre:"
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Presiona una tecla cuando estés listo)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "¿Quién juega primero?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "¿Quién juega después?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "¿Cuántas vueltas van a jugar?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Escribe un número"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "¡Trabajo en curso!"
@@ -579,7 +178,7 @@ msgstr "Para discutir el futuro de TuxMath puedes ir a"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr ""
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Ayuda"
 
@@ -815,77 +414,327 @@ msgstr "Multiplicación de números positivos y negativos"
 msgid "Division of Positives and Negatives"
 msgstr "División de números positivos y negativos"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Créditos"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Menú principal"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
+msgid "More Options"
+msgstr "Más opciones"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Eliminación"
+msgid "Play Alone"
+msgstr "Jugar solo"
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "¡Factoroides!"
+msgid "Project Info"
+msgstr "Información del projecto"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Terminar"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Menú principal"
+#~ msgid "Congratulations! You win!"
+#~ msgstr "¡Felicitaciones! ¡Ganaste!"
+
+#~ msgid "Round"
+#~ msgstr "Vuelta"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "-[Esc] para saltear"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Misión Uno: Cadete Cuidadoso"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "¡Que bueno que viniste!"
+
+#~ msgid ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+#~ msgstr ""
+#~ "¡Los pingüinos necesitan tu ayuda! Están lloviendo cometas que derriten "
+#~ "los iglúes de los pingüinos. Para salvar sus casas, tendrás que encontrar "
+#~ "el código secreto que destruirá cada cometa."
+
+#~ msgid "Do your best!"
+#~ msgstr "¡Suerte!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Misión Dos: Supervisor Astuto"
+
+#~ msgid ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+#~ msgstr ""
+#~ "¡Buen trabajo! Como salvaste las casas de los pingüinos, te promoveremos "
+#~ "a Supervisor. Los Supervisores son buenos vigilando que no haya "
+#~ "problemas..."
+
+#~ msgid ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+#~ msgstr ""
+#~ "...¡como los que hay ahora! ¡Vinieron los Arrebatadores y están lanzando "
+#~ "cometas más complicados contra los pingüinos!"
+
+#~ msgid "But you can save them!"
+#~ msgstr "¡Pero tú puedes salvarlos!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Misión Tres: Guardia Real"
+
+#~ msgid ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+#~ msgstr ""
+#~ "¡Lo lograste otra vez! El Emperador Pinguino te ha elegido para unirte a "
+#~ "su equipo de Guardias que ayudan a proteger la ciudad. Te estamos "
+#~ "enviando allí..."
+
+#~ msgid ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+#~ msgstr ""
+#~ "...¡No! El Emperador está siendo atacado por nuevos tipos de cometas: "
+#~ "¡Estos problemas se están multiplicando! Para luchar contra ellos "
+#~ "necesitarás grandes habilidades. Pensamos que podrás lograrlo. ¡Únete a "
+#~ "los Guardias y ayuda a salvar la ciudad!"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Misión Cuatro: Maestro Imperial"
+
+#~ msgid ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+#~ msgstr ""
+#~ "¡Lo lograste! El Emperador quiere agradecerte en persona. Te estamos "
+#~ "llevando a su palacio de hielo para un gran honor: ¡te convertirás en el "
+#~ "Maestro Imperial!"
+
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr ""
+#~ "Pero en la mitad de la ceremonia... ¡Comienza un nuevo ataque de la "
+#~ "tierra de las Divisiones!"
+
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "No es tiempo de descansar, ¡la ciudad necesita tu ayuda!"
+
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Misión Final: Comando Computador"
+
+#~ msgid ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+#~ msgstr ""
+#~ "Los científicos pingüinos han aprendido que todos estos ataques provienen "
+#~ "de una base secreta, y necesitan que vayas allí a pelear la última "
+#~ "batalla. También te dan esta pista: primero multiplica y divide, y luego "
+#~ "suma y resta."
+
+#~ msgid "I hope that hint helps!"
+#~ msgstr "¡Espero que esa pista te ayude!"
+
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr ""
+#~ "¡Este es el momento! Puedes detener estos ataques para siempre, Comando!"
+
+#~ msgid "Sorry, try again!"
+#~ msgstr "¡Intenta de nuevo!"
+
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Misión cumplida. ¡La galaxia está a salvo!"
+
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "FACTOROIDES: para ganar, tendrás que destruir todos los asteroides."
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Misiones de Flota de Matemáticas"
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr ""
+#~ "Usa las teclas de flecha para avanzar o girar. Apunta a un asteroide,"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Academia de Entrenamiento de Matemáticas"
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "escribe uno de sus factores y presiona espacio o retorno"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Más opciones"
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr ""
+#~ "para dividirlo en sus factores. ¡Las rocas con números primos se "
+#~ "destruyen!"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "FRACCIONES: para ganar, tendrás que destruir todos los asteroides."
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Jugar solo"
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr ""
+#~ "escribe un número que simplifique la fracción y presiona espacio o retorno"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Jugar el juego de arcade"
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "para dividirlo. ¡Destruye fracciones que no se pueden simplificar más de "
+#~ "un solo tiro!"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Jugar un juego personalizado"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "¡Bienvenido a TuxMath!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Jugar con amigos"
+#~ msgid "Your mission is to save your"
+#~ msgstr "Tu mision es salvar a"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Información del projecto"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "los iglúes de tus pingüinos"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Terminar"
+#~ msgid "falling comets."
+#~ msgstr "de los cometas que caen."
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Para parar el cometa"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "debes escribir la respuesta correcta al problema matemático"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "y presionar 'espacio' o 'enter'."
+
+#~ msgid "Try it now!"
+#~ msgstr "¡Prueba ahora!"
+
+#~ msgid "Good shot!"
+#~ msgstr "¡Buen tiro!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Si uno de los iglúes es atacado por un cometa,"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "se derretirá. Pero no te preocupes: "
+
+#~ msgid "penguin is OK!"
+#~ msgstr "¡el pingüino estará a salvo!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "Observa lo que sucede:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Presiona una tecla para empezar)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Nota la respuesta"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Si el iglú es atacado de nuevo,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "el pingüino se irá."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Presiona una tecla cuando estés listo)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Tú puedes areglar los iglúes"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr " si logras parar cometas de bono."
+
+#~ msgid "Zap it now!"
+#~ msgstr "¡Dispárale ahora!"
+
+#~ msgid "Great job!"
+#~ msgstr "¡Bien hecho!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Puedes parar el juego en cualquier momento"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "oprimiendo la tecla 'ESC' o haciendo clic en la X "
+
+#~ msgid "in the upper right corner."
+#~ msgstr "en la esquina derecha de la pantalla."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Hazlo ahora y luego juega"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "¡Edita el archivo de 'opciones' del directorio principal"
+
+#~ msgid "to create customized game!"
+#~ msgstr "para personalizar el juego!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Presiona una tecla o haz click para empezar el juego."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Ver README.txt para más información"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "¿Cuántos están jugando?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(Entre 2 y 4 jugadores)"
+
+#, fuzzy
+#~ msgid "Enter Server Name:"
+#~ msgstr "Escribe tu nombre:"
+
+#, fuzzy
+#~ msgid "Server Name:"
+#~ msgstr "Escribe tu nombre:"
+
+#~ msgid "Enter your name:"
+#~ msgstr "Escribe tu nombre:"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Presiona una tecla cuando estés listo)"
+
+#~ msgid "Who is playing first?"
+#~ msgstr "¿Quién juega primero?"
+
+#~ msgid "Who is playing next?"
+#~ msgstr "¿Quién juega después?"
+
+#~ msgid "How many rounds will you play?"
+#~ msgstr "¿Cuántas vueltas van a jugar?"
+
+#~ msgid "Enter a number"
+#~ msgstr "Escribe un número"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Elimination"
+#~ msgstr "Eliminación"
+
+#~ msgid "Factoroids!"
+#~ msgstr "¡Factoroides!"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Misiones de Flota de Matemáticas"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Academia de Entrenamiento de Matemáticas"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Jugar el juego de arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Jugar un juego personalizado"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Jugar con amigos"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Limpiar puntuación"
+#~ msgid "Score Sweep"
+#~ msgstr "Limpiar puntuación"
 
 #~ msgid "Main menu"
 #~ msgstr "Menú principal"
diff --git a/po/fi.gmo b/po/fi.gmo
index d3442c9..ca7aa89 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 9d5df96..6a046b9 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -19,122 +19,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -217,322 +101,66 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Parhaat tulokset"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Astronautti"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Tiedustelija"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Jousimies"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr ""
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath on vapaa ja avointa koodia!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Voit auttaa meitä tekemään sen paremmaksi ilmoittamalla ongelmista,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
 "Keskustele tuxmathin tulevaisuudesta osoitteesta tuxmath-devel at lists."
 "sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Muokkaa 'options' tiedostoa kotikansiossasi"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "tehdäksesi kustomoidun pelin!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-"Paina mitä tahansa näppäintä tai napsauta hiirellä aloittaaksesi pelin."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Katso README.txt saadaksesi lisätietoja"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Työn alla!"
@@ -549,7 +177,7 @@ msgstr ""
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "O_hje"
 
@@ -787,78 +415,49 @@ msgstr "Positiivisten ja negatiivisten lukujen kertolasku"
 msgid "Division of Positives and Negatives"
 msgstr "Positiivisten ja negatiivisten lukujen jakolasku"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Tekijät"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr ""
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Päävalikko"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Lisää asetuksia"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Pelaa arcade-peliä"
-
-#: data/menus/menu_strings:19
-#, fuzzy
-msgid "Play Custom Game"
-msgstr "Pelaa arcade-peliä"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Tietoa projektista"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Lopeta"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Muokkaa 'options' tiedostoa kotikansiossasi"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "tehdäksesi kustomoidun pelin!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr ""
+#~ "Paina mitä tahansa näppäintä tai napsauta hiirellä aloittaaksesi pelin."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Katso README.txt saadaksesi lisätietoja"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Pelaa arcade-peliä"
+
+#, fuzzy
+#~ msgid "Play Custom Game"
+#~ msgstr "Pelaa arcade-peliä"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "ehdottamalla parannuksista, tai lisäämällä koodia."
diff --git a/po/fr.gmo b/po/fr.gmo
index 82633ae..bf10fe5 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 00aa6e2..a2451b8 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -15,122 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -213,319 +97,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Tableau des scores"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Cadet de l'espace"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "As"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath est gratuit et open-source!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Participez à l'amélioration du jeu en nous signalant des problemes,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Parlons-en sur tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Editer le fichier 'option' dans le dossier home"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "pour créer une partie personnalisée !"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Appuyez sur une touche ou cliquez pour commencer"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Lisez README.txt pour plus d'informations"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Chargement"
@@ -542,7 +171,7 @@ msgstr "Participer au futur de TuxMath au"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Aide"
 
@@ -780,77 +409,53 @@ msgstr "Multiplication de positifs et négatifs"
 msgid "Division of Positives and Negatives"
 msgstr "Division de positifs et négatifs"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Crédits"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Menu principal"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Ecole d'entrainement au Math"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Plus d'options"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Jouer en mode arcade"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Jouer en mode personnalisé"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "A propos"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Quitter"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Editer le fichier 'option' dans le dossier home"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "pour créer une partie personnalisée !"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Appuyez sur une touche ou cliquez pour commencer"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lisez README.txt pour plus d'informations"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Ecole d'entrainement au Math"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Jouer en mode arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Jouer en mode personnalisé"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "vos suggestions, ou en développement."
diff --git a/po/ga.gmo b/po/ga.gmo
index 718b5f1..b8b175b 100644
Binary files a/po/ga.gmo and b/po/ga.gmo differ
diff --git a/po/ga.po b/po/ga.po
index df73823..9bbcea3 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -14,122 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -212,320 +96,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Fáilte go TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "An cúram atá agat ná"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "íoglúanna do phiongain a chosaint"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "ó na réalta mhongach atá ag titim anuas."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Stad réalt mhongach trí an"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "freagra don ceist mata a chlóscríobh"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "agus brúigh 'bearna' nó 'isteach'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Imir anois é!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Amas iontach!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Má bhuaileann réalt mhongach íoglú,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "leáitear é. Ach ná bí buartha:"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "tá an phiogain togha!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Féach cad a tharlaíonn:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Brúigh cnaipe chun tosú)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Tabhair faoi deara an freagra"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Má bhuailfí arís é,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "fágann an piongain."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Brúigh cnaipe ar bith nuair atá tú réidh)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Is fédir na hioglúanna a dheisiú"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "trí réalta mhongach breise a stadadh."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Buail anois é!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Maith thú!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Scoir ag am ar bith trí brúigh"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "'Esc' nó brúigh an 'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "sa chúinne uachtarach ar dheis."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Déan anois é, agus ansin imir!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Réim na gCuradh"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Glasearcach"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Gasóg"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ránaí"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Curadh"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "Tá TuxMath ar fáil saor in aisce agus le foinse oscailte!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Is féidir leat cuidiú é a fheabhsú trí fadhbanna a fhógrú,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Plé an todhchaí ag tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Cuir in eagar an comhad 'roghanna' i do chomhadlann baile"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "chun cluiche saincheaptha a chruthú!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Brúigh cnaipe nó brúigh do luchóg chun an cluiche a thosú."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Féach ar README.txt le haghaidh breis eolas"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Brúigh cnaipe ar bith nuair atá tú réidh)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Obair Idir Lámha!"
@@ -542,7 +170,7 @@ msgstr "Plé todhchaí TuzMath ag"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Cabhair"
 
@@ -780,77 +408,135 @@ msgstr "Iolrú Deimhneacha agus Diúltacha"
 msgid "Division of Positives and Negatives"
 msgstr "Roinnt Deimhneacha agus Diúltacha"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Buíochas le"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "An Príomh Roghchlár"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Taispeántas"
+msgid "More Options"
+msgstr "Tuilleadh Roghanna"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
+msgid "Project Info"
+msgstr "Faisnéis an Tionscadail"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Scoir"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "An Príomh Roghchlár"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Fáilte go TuxMath!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "An cúram atá agat ná"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Lárionad Oiliúna an Cheannais Mata"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "íoglúanna do phiongain a chosaint"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Tuilleadh Roghanna"
+#~ msgid "falling comets."
+#~ msgstr "ó na réalta mhongach atá ag titim anuas."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Stad réalt mhongach trí an"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "freagra don ceist mata a chlóscríobh"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Imir an Gnáthchluiche"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "agus brúigh 'bearna' nó 'isteach'."
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Imir Cluiche Saincheaptha"
+#~ msgid "Try it now!"
+#~ msgstr "Imir anois é!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Good shot!"
+#~ msgstr "Amas iontach!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Faisnéis an Tionscadail"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Má bhuaileann réalt mhongach íoglú,"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Scoir"
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "leáitear é. Ach ná bí buartha:"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "tá an phiogain togha!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "Féach cad a tharlaíonn:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Brúigh cnaipe chun tosú)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Tabhair faoi deara an freagra"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Má bhuailfí arís é,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "fágann an piongain."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Brúigh cnaipe ar bith nuair atá tú réidh)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Is fédir na hioglúanna a dheisiú"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "trí réalta mhongach breise a stadadh."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Buail anois é!"
+
+#~ msgid "Great job!"
+#~ msgstr "Maith thú!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Scoir ag am ar bith trí brúigh"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "'Esc' nó brúigh an 'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "sa chúinne uachtarach ar dheis."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Déan anois é, agus ansin imir!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Cuir in eagar an comhad 'roghanna' i do chomhadlann baile"
+
+#~ msgid "to create customized game!"
+#~ msgstr "chun cluiche saincheaptha a chruthú!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Brúigh cnaipe nó brúigh do luchóg chun an cluiche a thosú."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Féach ar README.txt le haghaidh breis eolas"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Brúigh cnaipe ar bith nuair atá tú réidh)"
+
+#~ msgid "Demo"
+#~ msgstr "Taispeántas"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Lárionad Oiliúna an Cheannais Mata"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Imir an Gnáthchluiche"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Imir Cluiche Saincheaptha"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "feabhsaithe a mholadh, nó trí cód a chur leis."
diff --git a/po/he.gmo b/po/he.gmo
index 2d702f4..270fae5 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index e399e2e..e71ee8d 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -23,122 +23,6 @@ msgstr ""
 "X-Poedit-Country: ISRAEL\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -221,320 +105,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "ברוכים הבאים לטאקסמטיקה!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "מטרתך היא להציל את"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "הפינגווינים שלך מפני"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "הכוכבים הנופלים."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "תוכל להדוף כוכב על ידי"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "הקלדת התשובה לבעיה המתמטית"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "ולחיצה על 'רווח' או 'Enter'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "נסה זאת כעת!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "פגיעה יפה!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "אם פוגע כוכב באיגלו,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "האיגלו נמס. אך אל דאגה:"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "הפינגווינים בסדר גמור!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "פשוט שים לב מה קורה:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(לחץ על מקש להתחלה)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "שים לב לתשובה"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "אם האיגלו נפגע שוב,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "הפינגווין עוזב."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(לחץ על מקש כשאתה מוכן)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "תוכלו לתקן את האיגלואים"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "על ידי הדיפת כוכבי בונוס."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "תירה בו כעת!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "עבודה יפה!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "תוכל לצאת בכל על על ידי"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "לחיצה על 'Esc' או על ה־'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "בפינה השמאלית העליונה."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "עשה זאת כעת, שחק לאחר מכן!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "היכל התהילה"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "טירון"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "תלמיד"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "מתמצא"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "תותח"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "טאקסמטיקה הינה חופשית ובעלת קוד פתוח!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "תוכל לעזור לנו לשפר אותו על ידי דיווח תקלות,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "דון בעתיד טאקסמטיקה ברשימת הדיוור tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "ערוך את קובץ האפשרויות ('options') בתיקיית הבית שלך"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "כדי ליצור משחק מותאם אישית!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "לחץ על מקש במקלדת או בעכבר כדי להתחיל במשחק."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "עיין בקובץ README.TXT למידע נוסף"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(לחץ על מקש כשאתה מוכן)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "עבודה בתהליכים!"
@@ -551,7 +179,7 @@ msgstr "דון בעתידה של טאקסמתיקה בקבוצת הדיון"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "עזרה"
 
@@ -789,77 +417,135 @@ msgstr "הכפלת מספרים חיוביים בשליליים"
 msgid "Division of Positives and Negatives"
 msgstr "חלוקת מספרים חיוביים בשליליים"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "תודות"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "תפריט ראשי"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "הדגמה"
+msgid "More Options"
+msgstr "אפשרויות נוספות"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
+msgid "Project Info"
+msgstr "מידע על המיזם"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "יציאה"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "תפריט ראשי"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "ברוכים הבאים לטאקסמטיקה!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "מטרתך היא להציל את"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "האקדמיה לאימון פעולות מתמטיות"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "הפינגווינים שלך מפני"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "אפשרויות נוספות"
+#~ msgid "falling comets."
+#~ msgstr "הכוכבים הנופלים."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "תוכל להדוף כוכב על ידי"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "הקלדת התשובה לבעיה המתמטית"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "שחק משחק ארקייד"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "ולחיצה על 'רווח' או 'Enter'."
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "שחק משחק מותאם"
+#~ msgid "Try it now!"
+#~ msgstr "נסה זאת כעת!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Good shot!"
+#~ msgstr "פגיעה יפה!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "מידע על המיזם"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "אם פוגע כוכב באיגלו,"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "יציאה"
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "האיגלו נמס. אך אל דאגה:"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "הפינגווינים בסדר גמור!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "פשוט שים לב מה קורה:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(לחץ על מקש להתחלה)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "שים לב לתשובה"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "אם האיגלו נפגע שוב,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "הפינגווין עוזב."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(לחץ על מקש כשאתה מוכן)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "תוכלו לתקן את האיגלואים"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "על ידי הדיפת כוכבי בונוס."
+
+#~ msgid "Zap it now!"
+#~ msgstr "תירה בו כעת!"
+
+#~ msgid "Great job!"
+#~ msgstr "עבודה יפה!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "תוכל לצאת בכל על על ידי"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "לחיצה על 'Esc' או על ה־'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "בפינה השמאלית העליונה."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "עשה זאת כעת, שחק לאחר מכן!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "ערוך את קובץ האפשרויות ('options') בתיקיית הבית שלך"
+
+#~ msgid "to create customized game!"
+#~ msgstr "כדי ליצור משחק מותאם אישית!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "לחץ על מקש במקלדת או בעכבר כדי להתחיל במשחק."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "עיין בקובץ README.TXT למידע נוסף"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(לחץ על מקש כשאתה מוכן)"
+
+#~ msgid "Demo"
+#~ msgstr "הדגמה"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "האקדמיה לאימון פעולות מתמטיות"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "שחק משחק ארקייד"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "שחק משחק מותאם"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "הצעת שיפורים או הוספת קוד."
diff --git a/po/hu.gmo b/po/hu.gmo
index 8a0dcbb..92af82f 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 5df7c87..849b2dc 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -14,122 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -212,321 +96,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Üdvözöllek a TuxMath-ban!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Küldetésed a pingvinek"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "jégkunyhóinak megvédése"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "az aláhulló meteoritoktól."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Gépeld be a matematikai feladat "
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "eredményét, és üss Enter-t"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "a meteor megállításához!"
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Próbáld meg most!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Szép lövés!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Ha egy jégkunyhót eltalál"
-
-#: src/game.c:1151
-#, fuzzy
-msgid "it melts. But don't worry: the"
-msgstr "egy meteor, megolvad, de a"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "pingvinnek még nem lesz baja!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Nézd, mi történik:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Nyomj meg egy gombot!)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Látod a választ?"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "A második találat után"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "a pingvin elmenekül."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Nyomj meg egy gombot!)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "A jégkunyhókat a bónusz meteorok"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "szétlövésével javíthatod meg."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Adj neki!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Szép munka!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Akármikor kiléphetsz az 'ESC'"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "gomb megnyomásával, vagy "
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "az 'X'-re való kattintással."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Lépj ki, és kezdd a játékot!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Dicsőséglista"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Újonc"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Felderítő"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Járőrparancsnok"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Mesterpilóta"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "A TuxMath ingyenes és nyílt forráskódú!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, 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:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Levelezőlista (angol nyelvű): tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "A home-könyvtáradban levő 'options' fájl "
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "szerkesztésével készíthetsz testreszabott játékot."
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Nyomj le egy billentyűt vagy egy egérgombot a kezdéshez!"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "További részletek a README.txt fájlban."
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Nyomj meg egy gombot!)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Fejlesztés alatt."
@@ -543,7 +170,7 @@ msgstr "A TuxMath jövőjét itt vitathatod meg:"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Segítség"
 
@@ -781,77 +408,136 @@ msgstr "Pozitív és negatív számok szorzása"
 msgid "Division of Positives and Negatives"
 msgstr "Pozitív és negatív számok osztása"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Köszönetnyilvánítás"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Főmenü"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
+msgid "More Options"
+msgstr "Egyebek"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
+msgid "Project Info"
+msgstr "Projekt információ"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Kilépés"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Főmenü"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Üdvözöllek a TuxMath-ban!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "Küldetésed a pingvinek"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Matek-Parancsnok Képző Akadémia"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "jégkunyhóinak megvédése"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Egyebek"
+#~ msgid "falling comets."
+#~ msgstr "az aláhulló meteoritoktól."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Gépeld be a matematikai feladat "
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "eredményét, és üss Enter-t"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Beépített játékok"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "a meteor megállításához!"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Testreszabott játékok"
+#~ msgid "Try it now!"
+#~ msgstr "Próbáld meg most!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Good shot!"
+#~ msgstr "Szép lövés!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Projekt információ"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Ha egy jégkunyhót eltalál"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Kilépés"
+#, fuzzy
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "egy meteor, megolvad, de a"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "pingvinnek még nem lesz baja!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "Nézd, mi történik:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Nyomj meg egy gombot!)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Látod a választ?"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "A második találat után"
+
+#~ msgid "penguin leaves."
+#~ msgstr "a pingvin elmenekül."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Nyomj meg egy gombot!)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "A jégkunyhókat a bónusz meteorok"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "szétlövésével javíthatod meg."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Adj neki!"
+
+#~ msgid "Great job!"
+#~ msgstr "Szép munka!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Akármikor kiléphetsz az 'ESC'"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "gomb megnyomásával, vagy "
+
+#~ msgid "in the upper right corner."
+#~ msgstr "az 'X'-re való kattintással."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Lépj ki, és kezdd a játékot!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "A home-könyvtáradban levő 'options' fájl "
+
+#~ msgid "to create customized game!"
+#~ msgstr "szerkesztésével készíthetsz testreszabott játékot."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Nyomj le egy billentyűt vagy egy egérgombot a kezdéshez!"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "További részletek a README.txt fájlban."
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Nyomj meg egy gombot!)"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Matek-Parancsnok Képző Akadémia"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Beépített játékok"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Testreszabott játékok"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "továbbfejlesztési ötletekkel, vagy programkóddal."
diff --git a/po/it.gmo b/po/it.gmo
index 7d6e3de..6247440 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 1e1bd2d..9a35028 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -22,122 +22,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -220,319 +104,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Galleria dei campioni"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Cadetto spaziale"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Asso"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath è gratuito ed open-source!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Puoi aiutare a migliorarlo riportando i problemi,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuti del futuro su tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Modifica il file 'options' nella tua cartella home"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "per creare una partita personalizzata!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Premi un tasto o fai click con il mouse per iniziare il gioco."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Vedi il file README.txt per maggiori informazioni"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Lavori in corso!"
@@ -549,7 +178,7 @@ msgstr "Discuti del futuro di TuxMatch su"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Aiuto"
 
@@ -789,79 +418,52 @@ msgstr "Moltiplicazione di numeri positivi e negativi"
 msgid "Division of Positives and Negatives"
 msgstr "Divisione di numeri positivi e negativi"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Ringraziamenti"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Menu principale"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Altre opzioni"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-#, fuzzy
-msgid "Play Arcade Game"
-msgstr "Gioca una partita personalizzata"
-
-#: data/menus/menu_strings:19
-#, fuzzy
-msgid "Play Custom Game"
-msgstr "Gioca una partita personalizzata"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Informazioni sul progetto"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Esci"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Modifica il file 'options' nella tua cartella home"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "per creare una partita personalizzata!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Premi un tasto o fai click con il mouse per iniziare il gioco."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Vedi il file README.txt per maggiori informazioni"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#, fuzzy
+#~ msgid "Play Arcade Game"
+#~ msgstr "Gioca una partita personalizzata"
+
+#, fuzzy
+#~ msgid "Play Custom Game"
+#~ msgstr "Gioca una partita personalizzata"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "proponendo miglioramenti o con l'aggiunta di codice."
diff --git a/po/ja.gmo b/po/ja.gmo
index 2f77bbc..1c7a03a 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index c1d6369..f3ebc3d 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -20,122 +20,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -218,319 +102,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "殿堂入り"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "訓練生"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "上等兵"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "特殊部隊"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "超能力者"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath は自由でオープンソースです!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "問題点を報告してゲームを改善することができます。"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "連絡先はこちら tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "ホーム・ディレクトリの'optoins'ファイルを編集して"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "オリジナルのゲームを作ろう!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "キーを押すかクリックしてゲーム開始"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "詳しい説明はREADME.txtを見てください"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "作業中!"
@@ -547,7 +176,7 @@ msgstr "TuxMathについての要望は"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -785,77 +414,53 @@ msgstr "正の数と負の数の掛け算"
 msgid "Division of Positives and Negatives"
 msgstr "正の数と負の数の割り算"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "クレジット"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "デモ"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "メインメニュー"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "計算戦隊訓練学校"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "他のオプション"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "一般訓練開始"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "特殊訓練開始"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "プロジェクト情報"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "終了"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "ホーム・ディレクトリの'optoins'ファイルを編集して"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "オリジナルのゲームを作ろう!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "キーを押すかクリックしてゲーム開始"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "詳しい説明はREADME.txtを見てください"
+
+#~ msgid "Demo"
+#~ msgstr "デモ"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "計算戦隊訓練学校"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "一般訓練開始"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "特殊訓練開始"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "新機能の提案や、コードの追加も歓迎します。"
diff --git a/po/ku.po b/po/ku.po
index 03ad0a8..5b2c57e 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -17,122 +17,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-24 22:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -215,322 +99,66 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Bi xêr hatî TuxMathê!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Peywira te ew e ku"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "îgoyên penguenan ji kevirên fezayî"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "yên dikevin biparêzî."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Bersivên pirsên matematîkê"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "binivîse bişkoka 'space' an jî 'anter' bitikîne"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "û kevirên fezayî bisekinîne."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Niha biceribîne!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Derbekî baş bû!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Eger kevirekî fezayî li îglooyekê bikeve,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "îgloo dihele. Lê xeman nexwe;"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "penguen hê jî dijî!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Binêre ka çi dibe:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Ji bo destpêkirinê pêlî bişkokekê bike)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Ji bo bersivê baldar be"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Eger heman îgloo dîsa derb bixwe,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "penguen diçe."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Dema amade bî pêlî bişkokekê bike)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Dikarî îglooyan bi sekinandina"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "kevirên fezayî tamîr bikî"
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Niha lê bixe!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Pir çak e!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Dema bixwazî derkevî"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "'Esc' an jî 'X' bitikîne"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "û ji lîstikê derkeve."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "NIha 'ESC' an jî 'X' bitikîne û dest bi lîstikê bike!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Hola Navdaran"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Leşkerê Fezayê"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Şopger"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Parazvan"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "As"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "Tuxmath belaş e û ji çavkaniya-vekirî ye!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Ji bo pêşdebirinê dikarî çewtiyan rapor bikî,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
 "Dikarî ji navnîşana tuxmath-devel at lists.sourceforge.net tevli nîqaşên ji bo "
 "dahatûya bernameyê bibî."
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Dikarî peldanka 'options' a di pelrêça malê de"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "serast bikî û lîstikeke taybet biafirînî!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Ji bo destpêkirina lîstikekê pêlî mişkî an jî bişkokekê bike."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Ji bo zêdetir agahî pelê README.txt bixwîne"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Dema amade bî pêlî bişkokekê bike)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Kiriyar Didome!"
@@ -547,7 +175,7 @@ msgstr "Sohbeta der barê dahatûya TuxMathê de"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Alîkarî"
 
@@ -785,77 +413,135 @@ msgstr "Carandina Hejmarên Pozîtîf û yên Negatîf"
 msgid "Division of Positives and Negatives"
 msgstr "Parandina Hejmarên Pozîtîf û yên Negatîf"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Yên ked dane"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Pêşeka Giştî"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
+msgid "More Options"
+msgstr "Zêdetir Vebijêrk"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
+msgid "Project Info"
+msgstr "Agahiyên Projeyê"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Derkeve"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Pêşeka Giştî"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Bi xêr hatî TuxMathê!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "Peywira te ew e ku"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Akademiya Perwerdehiya Matematîkê"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "îgoyên penguenan ji kevirên fezayî"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Zêdetir Vebijêrk"
+#~ msgid "falling comets."
+#~ msgstr "yên dikevin biparêzî."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Bersivên pirsên matematîkê"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "binivîse bişkoka 'space' an jî 'anter' bitikîne"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Lîsteya Lîstikan"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "û kevirên fezayî bisekinîne."
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Lîstika takekes bilîze"
+#~ msgid "Try it now!"
+#~ msgstr "Niha biceribîne!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Good shot!"
+#~ msgstr "Derbekî baş bû!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Agahiyên Projeyê"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Eger kevirekî fezayî li îglooyekê bikeve,"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Derkeve"
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "îgloo dihele. Lê xeman nexwe;"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "penguen hê jî dijî!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "Binêre ka çi dibe:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Ji bo destpêkirinê pêlî bişkokekê bike)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Ji bo bersivê baldar be"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Eger heman îgloo dîsa derb bixwe,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "penguen diçe."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Dema amade bî pêlî bişkokekê bike)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Dikarî îglooyan bi sekinandina"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "kevirên fezayî tamîr bikî"
+
+#~ msgid "Zap it now!"
+#~ msgstr "Niha lê bixe!"
+
+#~ msgid "Great job!"
+#~ msgstr "Pir çak e!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Dema bixwazî derkevî"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "'Esc' an jî 'X' bitikîne"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "û ji lîstikê derkeve."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "NIha 'ESC' an jî 'X' bitikîne û dest bi lîstikê bike!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Dikarî peldanka 'options' a di pelrêça malê de"
+
+#~ msgid "to create customized game!"
+#~ msgstr "serast bikî û lîstikeke taybet biafirînî!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Ji bo destpêkirina lîstikekê pêlî mişkî an jî bişkokekê bike."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Ji bo zêdetir agahî pelê README.txt bixwîne"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Dema amade bî pêlî bişkokekê bike)"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademiya Perwerdehiya Matematîkê"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Lîsteya Lîstikan"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Lîstika takekes bilîze"
 
 #~ msgid "Main menu"
 #~ msgstr "Pêşeka Giştî"
diff --git a/po/nb.gmo b/po/nb.gmo
index c1bfbcc..fbdb6ec 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index 9a26ee0..febbb3a 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -17,122 +17,6 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -215,320 +99,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Velkommen til TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Oppdraget ditt er å redde"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "igloene til pingvinene fra"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "kometer fra verdensrommet."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Du kan stoppe en komet ved"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "å skrive inn svaret, og så"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "«Mellomrom» eller «Enter»."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Prøv det nå!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Bra skudd!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Hvis en iglo blir truffet av en"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "komet, smelter den. Men ta det"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "med ro: pingvinen klarer seg!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Berre se hva som skjer."
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Trykk en tast for å se.)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Legg merke til rett svar."
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Hvis igloen blir truffet på nytt,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "vandrer pingvinen bort."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Trykk en tast når du er klar.)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Du kan bygge opp igjen igloene"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "ved å stoppe bonuskometer."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Skyt kometen nå!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Kjempebra!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Du kan når som helst gi deg,"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "ved å trykke «Escape» eller"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "klikke på X-en oppe til høyre."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Prøv det nå, og start spillet!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Rekordar"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Romkadett"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Romlærling"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Romvokter"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Romsjef"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Romkommandør"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Faktorer"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Brøker"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath er fri programvare!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, 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:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Rediger «options»-fila i hjemmemappa di"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "for å lage ditt eget spill."
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Trykk en tast eller med musen for å starte spillet."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Se «README.txt» for mer informasjon."
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Trykk en tast når du er klar.)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Uferdig!"
@@ -545,7 +173,7 @@ msgstr "Diskuter fremtiden til TuxMath på"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Hjelp"
 
@@ -783,78 +411,145 @@ msgstr "Multiplikasjon av positive og negative tall"
 msgid "Division of Positives and Negatives"
 msgstr "Divisjon av positive og negative tall"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Bidragsytere"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Hovedmeny"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstrasjon"
+msgid "More Options"
+msgstr "Flere valg"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
+msgid "Play Alone"
+msgstr "Spill alene"
 
 #: data/menus/menu_strings:6
-#, fuzzy
-msgid "Factoroids!"
-msgstr "Faktorer"
+msgid "Project Info"
+msgstr "Prosjektinfo"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Avslutt"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Hovedmeny"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Velkommen til TuxMath!"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Oppdrag"
+#~ msgid "Your mission is to save your"
+#~ msgstr "Oppdraget ditt er å redde"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Kadettskole"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "igloene til pingvinene fra"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Flere valg"
+#~ msgid "falling comets."
+#~ msgstr "kometer fra verdensrommet."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Du kan stoppe en komet ved"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Spill alene"
+#~ msgid "the answer to the math problem"
+#~ msgstr "å skrive inn svaret, og så"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Arkadespill"
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "«Mellomrom» eller «Enter»."
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Selvlaget spill"
+#~ msgid "Try it now!"
+#~ msgstr "Prøv det nå!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Spill med venner"
+#~ msgid "Good shot!"
+#~ msgstr "Bra skudd!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Prosjektinfo"
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Hvis en iglo blir truffet av en"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Avslutt"
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "komet, smelter den. Men ta det"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "penguin is OK!"
+#~ msgstr "med ro: pingvinen klarer seg!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Just watch what happens:"
+#~ msgstr "Berre se hva som skjer."
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Trykk en tast for å se.)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Legg merke til rett svar."
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Hvis igloen blir truffet på nytt,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "vandrer pingvinen bort."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Trykk en tast når du er klar.)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Du kan bygge opp igjen igloene"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "ved å stoppe bonuskometer."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Skyt kometen nå!"
+
+#~ msgid "Great job!"
+#~ msgstr "Kjempebra!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Du kan når som helst gi deg,"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "ved å trykke «Escape» eller"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "klikke på X-en oppe til høyre."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Prøv det nå, og start spillet!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Rediger «options»-fila i hjemmemappa di"
+
+#~ msgid "to create customized game!"
+#~ msgstr "for å lage ditt eget spill."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Trykk en tast eller med musen for å starte spillet."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Se «README.txt» for mer informasjon."
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Trykk en tast når du er klar.)"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstrasjon"
+
+#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Faktorer"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Oppdrag"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Kadettskole"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Arkadespill"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Selvlaget spill"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Spill med venner"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "om feil, foreslå forbedringer eller bidra med programkode."
diff --git a/po/nl.gmo b/po/nl.gmo
index 5438b1d..a1fe800 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index e4fa11a..e4efca2 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -15,122 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -213,319 +97,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Hoogste scores"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Ruimte kadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ace"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath is gratis en open-source!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Je kan helpen met het verbeteren door problemen te melden,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Bewerk 'options' bestand in je home folder"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "voor een eigen spel!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Druk op een toets of de muis om het spel te starten."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Lees README.txt voor meer informatie"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Werk in uitvoering"
@@ -542,7 +171,7 @@ msgstr "Praat over de toekomst van TuxMath op"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Help"
 
@@ -780,77 +409,53 @@ msgstr "Vermenigvuldigen van positieven en negatieven"
 msgid "Division of Positives and Negatives"
 msgstr "Delen van positieven en negatieven"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Kredieten"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Reken commando training academie"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Meer opties"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Speel Arcade spel"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Speel je eigen spel"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Projekt info"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Bewerk 'options' bestand in je home folder"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "voor een eigen spel!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Druk op een toets of de muis om het spel te starten."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lees README.txt voor meer informatie"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Reken commando training academie"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Speel Arcade spel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Speel je eigen spel"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "suggesties verbeteringen, of code toevoegen."
diff --git a/po/nn.gmo b/po/nn.gmo
index 9afdc77..d7b4968 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index c6ac92e..8ee6892 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -17,140 +17,6 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Gratulerer! Du vann!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Runde"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "(Trykk «Escape» for å hoppa over.)"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Oppdrag 1: Kampklare kadett"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "Eg er så glad du endeleg er her!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"Pingvinane treng hjelp frå deg! Det fell kometar frå himmelen, og dei "
-"smeltar igloane til pingvinane. For å redda heimane deira, må du finna dei "
-"hemmelege kodane som øydeleggjer kometane."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "Gjer ditt beste!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Oppdrag 2: Listige læring"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"Bra jobba! Sidan du klarte å redda heimane til pingvinane, forfremjar me deg "
-"til romlærling. Håpar du har lært å hanska vanskar …"
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"… for no får du nokon rett i hendene! TaVekk-arane kjem, og dei sender nye "
-"og endå skumlare kometar mot pingvinane!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "Men du kan redda dei!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Oppdrag 3: Vaktsam vaktar"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"Du klarte det igjen! Keisarpingvinen har valt deg til å delta i den "
-"offisielle romvaktargruppa som vernar om byen. Me sender deg der no …"
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"Å nei, å nei! Keisarpingvinen sjølv vert no angripen, av dei nye "
-"gongekometane. Desse er endå vanskelegare, og for å øydeleggja dei må du "
-"vera dugande dyktig. Men me trur du vil klara det. Vert med romvaktarane og "
-"redd byen!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Oppdrag fire: Supersjef"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"Du klarte det! Keisaren ønskjer å takka deg personleg. Me tek deg med til "
-"ispalasset hans, der du får æra av å verta utnemnd til keisarleg romsjef!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr "Men midt under seremonien kjem det eit angrep frå deleland!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Inga tid til å kvila på laurbæra; byen treng di hjelp!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Siste oppdrag: Kodeknekkingskommandør"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Forskarpingvinane har funne ut alle angrepa kjem frå ein hemmeleg base, og "
-"dei treng hjelp frå deg til å øydeleggja basen. Dei har òg eit lite tips: "
-"Gonga først, dela så, og avslutt med å leggja til og trekkja frå."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "Håpar tipset er til hjelp!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "Endeleg! No kan du klara å stoppa angrepa for alltid, romkommandør!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Prøv på nytt!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Oppdrag utførd. Galaksen er no trygg!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "MATTE-TUX"
@@ -244,325 +110,64 @@ msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 "For meir informasjon om fri programvare og GNU GPL, kan du vitja nettstaden"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FAKTOROIDAR: For å vinna må du øydeleggja elle asteroidane."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Bruk piltastane til å dreia rundt eller fly framover. Sikt på ein"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "asteroide, skriv inn éin av faktorane og trykk «Enter»"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-"eller «Mellomrom» for å dela han opp. Primtalsasteroidar vert øydelagde."
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "BRØKAR: For å vinna må du øydeleggja elle asteroidane."
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr "Skriv inn eit tal som kan forenkla brøken, og trykk «Enter»"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"eller «Mellomrom» for å dela han. Øydelegg brøkar som ikkje kan forenklast "
-"med eit enkeltskot."
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Velkommen til TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Oppdraget ditt er å redda"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "igloane til pingvinane frå"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "kometar frå verdsrommet."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Du kan stoppa ein komet ved"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "å skriva inn svaret, og så"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "«Mellomrom» eller «Enter»."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Prøv det no!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Bra skot!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Viss ein iglo vert treft av ein"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "komet, smeltar han. Men ta det"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "med ro: pingvinen klarer seg!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Berre sjå kva som skjer."
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Trykk ein tast for å sjå.)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Legg merke til rett svar."
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Viss igloen vert treft på nytt,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "vandrar pingvinen vekk."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Trykk ein tast når du er klar.)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Du kan byggja opp att igloane"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "ved å stoppa bonuskometar."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Skyt kometen no!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Kjempebra!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Du kan når som helst gje deg,"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "ved å trykkja «Escape» eller"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "klikka på X-en oppe til høgre."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Prøv det no, og start spelet!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Rekordar"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Romkadett"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Romlærling"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Romvaktar"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Romsjef"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Romkommandør"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Faktorar"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Brøkar"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "Du fekk ein ny rekord!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Skriv inn namnet ditt:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath er fri programvare!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Du kan vera med på å gjera spelet betre, ved å melda frå"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Rediger «options»-fila i heimemappa di"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "for å laga ditt eige spel."
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Trykk ein tast eller med musa for å starta spelet."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Sjå «README.txt» for meir informasjon."
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "Kor mange spelar?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(2 til 4 spelarar)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-#, fuzzy
-msgid "Enter Server Name:"
-msgstr "Skriv inn namnet ditt:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-#, fuzzy
-msgid "Server Name:"
-msgstr "Skriv inn namnet ditt:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Skriv inn namnet ditt:"
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Trykk ein tast når du er klar.)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "Kven spelar først?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "Kven sin tur er det så?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "Kor mange rundar vil du spela?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Skriv inn eit tal"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Uferdig!"
@@ -579,7 +184,7 @@ msgstr "Diskuter framtida til TuxMath på"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Hjelp"
 
@@ -815,77 +420,317 @@ msgstr "Multiplikasjon av positive og negative tal"
 msgid "Division of Positives and Negatives"
 msgstr "Divisjon av positive og negative tal"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Bidragsytarar"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Hovudmeny"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstrasjon"
+msgid "More Options"
+msgstr "Fleire val"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Eliminering"
+msgid "Play Alone"
+msgstr "Spel åleine"
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "Faktoroidar!"
+msgid "Project Info"
+msgstr "Prosjektinfo"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Avslutt"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Hovudmeny"
+#~ msgid "Congratulations! You win!"
+#~ msgstr "Gratulerer! Du vann!"
+
+#~ msgid "Round"
+#~ msgstr "Runde"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "(Trykk «Escape» for å hoppa over.)"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Oppdrag 1: Kampklare kadett"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "Eg er så glad du endeleg er her!"
+
+#~ msgid ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+#~ msgstr ""
+#~ "Pingvinane treng hjelp frå deg! Det fell kometar frå himmelen, og dei "
+#~ "smeltar igloane til pingvinane. For å redda heimane deira, må du finna "
+#~ "dei hemmelege kodane som øydeleggjer kometane."
+
+#~ msgid "Do your best!"
+#~ msgstr "Gjer ditt beste!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Oppdrag 2: Listige læring"
+
+#~ msgid ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+#~ msgstr ""
+#~ "Bra jobba! Sidan du klarte å redda heimane til pingvinane, forfremjar me "
+#~ "deg til romlærling. Håpar du har lært å hanska vanskar …"
+
+#~ msgid ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+#~ msgstr ""
+#~ "… for no får du nokon rett i hendene! TaVekk-arane kjem, og dei sender "
+#~ "nye og endå skumlare kometar mot pingvinane!"
+
+#~ msgid "But you can save them!"
+#~ msgstr "Men du kan redda dei!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Oppdrag 3: Vaktsam vaktar"
+
+#~ msgid ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+#~ msgstr ""
+#~ "Du klarte det igjen! Keisarpingvinen har valt deg til å delta i den "
+#~ "offisielle romvaktargruppa som vernar om byen. Me sender deg der no …"
+
+#~ msgid ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+#~ msgstr ""
+#~ "Å nei, å nei! Keisarpingvinen sjølv vert no angripen, av dei nye "
+#~ "gongekometane. Desse er endå vanskelegare, og for å øydeleggja dei må du "
+#~ "vera dugande dyktig. Men me trur du vil klara det. Vert med romvaktarane "
+#~ "og redd byen!"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Oppdrag fire: Supersjef"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Oppdrag"
+#~ msgid ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+#~ msgstr ""
+#~ "Du klarte det! Keisaren ønskjer å takka deg personleg. Me tek deg med til "
+#~ "ispalasset hans, der du får æra av å verta utnemnd til keisarleg romsjef!"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Kadettskule"
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr "Men midt under seremonien kjem det eit angrep frå deleland!"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Fleire val"
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "Inga tid til å kvila på laurbæra; byen treng di hjelp!"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Siste oppdrag: Kodeknekkingskommandør"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Spel åleine"
+#~ msgid ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+#~ msgstr ""
+#~ "Forskarpingvinane har funne ut alle angrepa kjem frå ein hemmeleg base, "
+#~ "og dei treng hjelp frå deg til å øydeleggja basen. Dei har òg eit lite "
+#~ "tips: Gonga først, dela så, og avslutt med å leggja til og trekkja frå."
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Arkadespel"
+#~ msgid "I hope that hint helps!"
+#~ msgstr "Håpar tipset er til hjelp!"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Sjølvlaga spel"
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr "Endeleg! No kan du klara å stoppa angrepa for alltid, romkommandør!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Spel med venner"
+#~ msgid "Sorry, try again!"
+#~ msgstr "Prøv på nytt!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Prosjektinfo"
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Oppdrag utførd. Galaksen er no trygg!"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Avslutt"
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "FAKTOROIDAR: For å vinna må du øydeleggja elle asteroidane."
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr "Bruk piltastane til å dreia rundt eller fly framover. Sikt på ein"
+
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "asteroide, skriv inn éin av faktorane og trykk «Enter»"
+
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr ""
+#~ "eller «Mellomrom» for å dela han opp. Primtalsasteroidar vert øydelagde."
+
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "BRØKAR: For å vinna må du øydeleggja elle asteroidane."
+
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr "Skriv inn eit tal som kan forenkla brøken, og trykk «Enter»"
+
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "eller «Mellomrom» for å dela han. Øydelegg brøkar som ikkje kan forenklast "
+#~ "med eit enkeltskot."
+
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Velkommen til TuxMath!"
+
+#~ msgid "Your mission is to save your"
+#~ msgstr "Oppdraget ditt er å redda"
+
+#~ msgid "penguins' igloos from the"
+#~ msgstr "igloane til pingvinane frå"
+
+#~ msgid "falling comets."
+#~ msgstr "kometar frå verdsrommet."
+
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Du kan stoppa ein komet ved"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "å skriva inn svaret, og så"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "«Mellomrom» eller «Enter»."
+
+#~ msgid "Try it now!"
+#~ msgstr "Prøv det no!"
+
+#~ msgid "Good shot!"
+#~ msgstr "Bra skot!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Viss ein iglo vert treft av ein"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "komet, smeltar han. Men ta det"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "med ro: pingvinen klarer seg!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "Berre sjå kva som skjer."
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Trykk ein tast for å sjå.)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Legg merke til rett svar."
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Viss igloen vert treft på nytt,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "vandrar pingvinen vekk."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Trykk ein tast når du er klar.)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Du kan byggja opp att igloane"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "ved å stoppa bonuskometar."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Skyt kometen no!"
+
+#~ msgid "Great job!"
+#~ msgstr "Kjempebra!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Du kan når som helst gje deg,"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "ved å trykkja «Escape» eller"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "klikka på X-en oppe til høgre."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Prøv det no, og start spelet!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Rediger «options»-fila i heimemappa di"
+
+#~ msgid "to create customized game!"
+#~ msgstr "for å laga ditt eige spel."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Trykk ein tast eller med musa for å starta spelet."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Sjå «README.txt» for meir informasjon."
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "Kor mange spelar?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(2 til 4 spelarar)"
+
+#, fuzzy
+#~ msgid "Enter Server Name:"
+#~ msgstr "Skriv inn namnet ditt:"
+
+#, fuzzy
+#~ msgid "Server Name:"
+#~ msgstr "Skriv inn namnet ditt:"
+
+#~ msgid "Enter your name:"
+#~ msgstr "Skriv inn namnet ditt:"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Trykk ein tast når du er klar.)"
+
+#~ msgid "Who is playing first?"
+#~ msgstr "Kven spelar først?"
+
+#~ msgid "Who is playing next?"
+#~ msgstr "Kven sin tur er det så?"
+
+#~ msgid "How many rounds will you play?"
+#~ msgstr "Kor mange rundar vil du spela?"
+
+#~ msgid "Enter a number"
+#~ msgstr "Skriv inn eit tal"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstrasjon"
+
+#~ msgid "Elimination"
+#~ msgstr "Eliminering"
+
+#~ msgid "Factoroids!"
+#~ msgstr "Faktoroidar!"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Oppdrag"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Kadettskule"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Arkadespel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Sjølvlaga spel"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Spel med venner"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Poengsamling"
+#~ msgid "Score Sweep"
+#~ msgstr "Poengsamling"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "om feil, foreslå forbetringar eller bidra med programkode."
diff --git a/po/oc.gmo b/po/oc.gmo
index d70db14..0f5b28d 100644
Binary files a/po/oc.gmo and b/po/oc.gmo differ
diff --git a/po/oc.po b/po/oc.po
index f713dc3..ccede90 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -19,122 +19,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -217,318 +101,63 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr ""
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr ""
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr ""
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr ""
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr ""
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr ""
 
-#: src/menu.c:376
+#: src/menu.c:314
 msgid "You can help make it better."
 msgstr ""
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr ""
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr ""
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr ""
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr ""
@@ -545,7 +174,7 @@ msgstr ""
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Ajuda"
 
@@ -781,77 +410,29 @@ msgstr ""
 msgid "Division of Positives and Negatives"
 msgstr ""
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Mercejaments"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr ""
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Menut principal"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Mai d'opcions"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr ""
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr ""
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr ""
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Sortir"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
-
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
-
 #~ msgid "Main menu"
 #~ msgstr "Menut principal"
diff --git a/po/pl.gmo b/po/pl.gmo
index 404ec73..4654b4d 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index d7fdb81..5b31716 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -22,122 +22,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -220,319 +104,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Lista najlepszych"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Kosmiczny Kadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Strzelec"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Strażnik"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "As"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath jest wolny i ma otwarte źródła"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Możesz pomóc uczynić go lepszym zgłaszając błędy."
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, 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"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Edytuj pik 'options' w swoim katalogu domowym"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr ""
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Naciśnij klawisz albo kliknij myszką aby uruchomić grę."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Przeczytaj README.txt, żeby uzyskać więcej informacji"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Prace trwają!"
@@ -549,7 +178,7 @@ msgstr "Dyskusje na temat przyszłości Tuxmath na"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Pomoc"
 
@@ -792,77 +421,50 @@ msgstr "Mnożenie liczb dodatnich i ujemnych"
 msgid "Division of Positives and Negatives"
 msgstr "Dzielenie liczb dodatnich i ujemnych"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Twórcy"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstracja"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Menu główne"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Akademia Treningowa Poleceń Math"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Więcej opcji"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Zagraj w grę zręcznościową"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Zagraj w wybraną grę"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Informacja o projekcie"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edytuj pik 'options' w swoim katalogu domowym"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Naciśnij klawisz albo kliknij myszką aby uruchomić grę."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Przeczytaj README.txt, żeby uzyskać więcej informacji"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstracja"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademia Treningowa Poleceń Math"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Zagraj w grę zręcznościową"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Zagraj w wybraną grę"
 
 #, fuzzy
 #~ msgid "suggesting improvements, or adding code."
diff --git a/po/pt.gmo b/po/pt.gmo
index 720384d..456f2e3 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index b818374..e1b95d6 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -23,145 +23,6 @@ msgstr ""
 "X-Generator: Pootle 1.2.1\n"
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Parabéns! Ganhaste!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Volta"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] para saltar"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Missão Um: Cuidado Cadete"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "Estou tão feliz por teres chegado!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"Os pinguins precisam da tua ajuda! Estão a cair cometas do céu, e estão a "
-"derreter os iglos dos pinguins. Para salvar as casas deles, precisamos de ti "
-"para encontrar o código secreto que vai dar um tiro a cada um dos cometas."
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "Faz o teu melhor!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Missão Dois: Batedor Inteligente"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-"Bom trabalho! Uma vez que salvas-te as casas dos pinguins, vais ser "
-"promovido para Batedor. Os Batedores são bons para manter um olho fora dos "
-"sarilhos..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...como o que está acontecer agora mesmo! Os TakeAways vieram, e eles estão "
-"a mandar de novo cometas contra os pinguins!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "Mas tu podes salvá-los!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Missão Três: Ranger Nobre"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"Tu conseguiste outra vez! O Pinguim Imperador escolheu a ti para participar "
-"na sua equipe de Rangers que ajudam a proteger a cidade.  Vamos enviar-te "
-"para lá agora..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...oh não! Agora, o Pinguim Imperador está a ser atacado, por novos tipos de "
-"cometas: estes multiplicam-se! Para combater contra estes, precisas de uma "
-"grande habilidade. Achamos que tu podes fazer isso. Junta-te aos Rangers e "
-"ajuda a salvar a cidade!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Missão Quatro: Ás Imperial"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"Conseguiste! O Imperador quer agradecer-te pessoalmente. Estamos a levar-te "
-"para o seu palácio de gelo com grande honra: tornas-te o Ás Imperial!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-"Mas mesmo no meio da cerimónia, um novo ataque a partir da terra da Divisão "
-"começa!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Agora não é hora para descansar, a cidade precisa da tua ajuda!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Missão Final: Comando Informático"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"Cientistas Pinguins aprenderam que todos estes ataques são provenientes de "
-"uma base secreta, e eles precisam de ti para combater a batalha final. Eles "
-"também te dão esta dica: em primeiro lugar fazer multiplicação e divisão, e "
-"depois fazer soma e subtracção."
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "Espero que a dica ajude!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "É isso! Tu podes parar esses ataques para sempre, Comando!"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Desculpa, tenta outra vez!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Missão cumprida. A galáxia está segura!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr "TUX, COMANDO DA MATEMÁTICA"
@@ -253,333 +114,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr "Para mais informações sobre Software Livre e da GNU GPL, visite:"
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "FACTOROIDS: para ganhar, precisas de destruir todos os asteróides."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-"Utiliza as setas do teclado para virar ou ir em frente. Faz mira contra um "
-"asteróide,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-"digitando o número que corresponde ao seu factor, e carregas nas teclas "
-"Espaço ou Enter"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-"para dividir entre os seus factores.  As rochas com números primos são "
-"destruídos! Por exemplo o factor primo de 6 é 2 e 3 (6 = 2 × 3)"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "FRACÇÕES: para ganhar, precisas de destruir todos os asteróides."
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"digitando um número que pode simplificar a divisão, e carregas nas teclas "
-"Espaço ou Enter"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"para o dividir.  Destrói fracções que não podem ser mais simplificadas com "
-"um único tiro!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Bem-vindo ao TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "A tua missão é salvar os"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "iglos dos pinguins da"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "queda dos cometas."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Pára um cometa"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "respondendo ao problema matemático"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "e carrega na tecla 'espaço' ou 'enter'."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Tenta agora!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Bom tiro!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Se um iglo for atingido por um cometa,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "ele derrete-se. Mas não te preocupes: o"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "pinguim está bem!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Basta veres o que acontece"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Carrega numa tecla para começar)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Observa a resposta"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Se for atingindo outra vez, o"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "pinguim vai embora."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(carrega numa tecla quando estiveres preparado)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Tu podes reparar os iglos"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "parando os cometas bónus."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Destrói-o agora!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Bom trabalho!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Sai a qualquer momento carregando em"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "'Esc' ou 'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "que está no canto superior direito."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Faz isso agora e, depois joga!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Corredor da Fama"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Cadete Espacial"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Batedor"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ás"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Comando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Factores"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Divisões"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "Tu estás no Corredor da Fama"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Coloca o Teu Nome:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath é livre e com código aberto!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Podes ajudar o TuxMath ao reportar problemas,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discuta o futuro em tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Edita o ficheiro 'options' que está na tua directoria pessoal"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "para criar um jogo customizado!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-"Pressiona em qualquer tecla do teclado ou clique no rato para começar o jogo."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Lê o ficheiro README.txt para mais informações!"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "Quantas crianças vão jogar?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(Entre 2 a 4 jogadores)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-#, fuzzy
-msgid "Enter Server Name:"
-msgstr "Coloca o Teu Nome:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-#, fuzzy
-msgid "Server Name:"
-msgstr "Coloca o Teu Nome:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Coloca o teu nome:"
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(carrega numa tecla quando estiveres preparado)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "Quem vai jogar primeiro?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "Quem joga a seguir?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "Quantas voltas querem jogar?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Coloca um número"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Trabalho em Progresso!"
@@ -596,7 +188,7 @@ msgstr "Discuta o futuro do TuxMath em"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Ajuda"
 
@@ -832,77 +424,332 @@ msgstr "Multiplicação de Positivos e Negativos"
 msgid "Division of Positives and Negatives"
 msgstr "Divisão de Positivos e Negativos"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Créditos"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Menu Principal"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstração"
+msgid "More Options"
+msgstr "Mais Opções"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "Eliminação"
+msgid "Play Alone"
+msgstr "Jogar Sozinho"
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "Factoroids!"
+msgid "Project Info"
+msgstr "Informação do Projecto"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Sair"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Menu Principal"
+#~ msgid "Congratulations! You win!"
+#~ msgstr "Parabéns! Ganhaste!"
+
+#~ msgid "Round"
+#~ msgstr "Volta"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "-[Esc] para saltar"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Missão Um: Cuidado Cadete"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "Estou tão feliz por teres chegado!"
+
+#~ msgid ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+#~ msgstr ""
+#~ "Os pinguins precisam da tua ajuda! Estão a cair cometas do céu, e estão a "
+#~ "derreter os iglos dos pinguins. Para salvar as casas deles, precisamos de "
+#~ "ti para encontrar o código secreto que vai dar um tiro a cada um dos "
+#~ "cometas."
+
+#~ msgid "Do your best!"
+#~ msgstr "Faz o teu melhor!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Missão Dois: Batedor Inteligente"
+
+#~ msgid ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+#~ msgstr ""
+#~ "Bom trabalho! Uma vez que salvas-te as casas dos pinguins, vais ser "
+#~ "promovido para Batedor. Os Batedores são bons para manter um olho fora "
+#~ "dos sarilhos..."
+
+#~ msgid ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+#~ msgstr ""
+#~ "...como o que está acontecer agora mesmo! Os TakeAways vieram, e eles "
+#~ "estão a mandar de novo cometas contra os pinguins!"
+
+#~ msgid "But you can save them!"
+#~ msgstr "Mas tu podes salvá-los!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Missão Três: Ranger Nobre"
+
+#~ msgid ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+#~ msgstr ""
+#~ "Tu conseguiste outra vez! O Pinguim Imperador escolheu a ti para "
+#~ "participar na sua equipe de Rangers que ajudam a proteger a cidade.  "
+#~ "Vamos enviar-te para lá agora..."
+
+#~ msgid ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+#~ msgstr ""
+#~ "...oh não! Agora, o Pinguim Imperador está a ser atacado, por novos tipos "
+#~ "de cometas: estes multiplicam-se! Para combater contra estes, precisas de "
+#~ "uma grande habilidade. Achamos que tu podes fazer isso. Junta-te aos "
+#~ "Rangers e ajuda a salvar a cidade!"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Missão Quatro: Ás Imperial"
+
+#~ msgid ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+#~ msgstr ""
+#~ "Conseguiste! O Imperador quer agradecer-te pessoalmente. Estamos a levar-"
+#~ "te para o seu palácio de gelo com grande honra: tornas-te o Ás Imperial!"
+
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr ""
+#~ "Mas mesmo no meio da cerimónia, um novo ataque a partir da terra da "
+#~ "Divisão começa!"
+
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "Agora não é hora para descansar, a cidade precisa da tua ajuda!"
+
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Missão Final: Comando Informático"
+
+#~ msgid ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+#~ msgstr ""
+#~ "Cientistas Pinguins aprenderam que todos estes ataques são provenientes "
+#~ "de uma base secreta, e eles precisam de ti para combater a batalha final. "
+#~ "Eles também te dão esta dica: em primeiro lugar fazer multiplicação e "
+#~ "divisão, e depois fazer soma e subtracção."
+
+#~ msgid "I hope that hint helps!"
+#~ msgstr "Espero que a dica ajude!"
+
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr "É isso! Tu podes parar esses ataques para sempre, Comando!"
+
+#~ msgid "Sorry, try again!"
+#~ msgstr "Desculpa, tenta outra vez!"
+
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Missão cumprida. A galáxia está segura!"
+
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "FACTOROIDS: para ganhar, precisas de destruir todos os asteróides."
+
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr ""
+#~ "Utiliza as setas do teclado para virar ou ir em frente. Faz mira contra "
+#~ "um asteróide,"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Frota de Missões para Comando da Matemática"
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr ""
+#~ "digitando o número que corresponde ao seu factor, e carregas nas teclas "
+#~ "Espaço ou Enter"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Academia de Treino Comando da Matemática"
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr ""
+#~ "para dividir entre os seus factores.  As rochas com números primos são "
+#~ "destruídos! Por exemplo o factor primo de 6 é 2 e 3 (6 = 2 × 3)"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Mais Opções"
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "FRACÇÕES: para ganhar, precisas de destruir todos os asteróides."
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr ""
+#~ "digitando um número que pode simplificar a divisão, e carregas nas teclas "
+#~ "Espaço ou Enter"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Jogar Sozinho"
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "para o dividir.  Destrói fracções que não podem ser mais simplificadas "
+#~ "com um único tiro!"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Jogar Modo Arcada"
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Bem-vindo ao TuxMath!"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Jogar Modo de Prática"
+#~ msgid "Your mission is to save your"
+#~ msgstr "A tua missão é salvar os"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Jogar Com Amigos"
+#~ msgid "penguins' igloos from the"
+#~ msgstr "iglos dos pinguins da"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Informação do Projecto"
+#~ msgid "falling comets."
+#~ msgstr "queda dos cometas."
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Sair"
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Pára um cometa"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "the answer to the math problem"
+#~ msgstr "respondendo ao problema matemático"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "e carrega na tecla 'espaço' ou 'enter'."
+
+#~ msgid "Try it now!"
+#~ msgstr "Tenta agora!"
+
+#~ msgid "Good shot!"
+#~ msgstr "Bom tiro!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Se um iglo for atingido por um cometa,"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "ele derrete-se. Mas não te preocupes: o"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "pinguim está bem!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "Basta veres o que acontece"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Carrega numa tecla para começar)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Observa a resposta"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Se for atingindo outra vez, o"
+
+#~ msgid "penguin leaves."
+#~ msgstr "pinguim vai embora."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(carrega numa tecla quando estiveres preparado)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Tu podes reparar os iglos"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "parando os cometas bónus."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Destrói-o agora!"
+
+#~ msgid "Great job!"
+#~ msgstr "Bom trabalho!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Sai a qualquer momento carregando em"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "'Esc' ou 'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "que está no canto superior direito."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Faz isso agora e, depois joga!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edita o ficheiro 'options' que está na tua directoria pessoal"
+
+#~ msgid "to create customized game!"
+#~ msgstr "para criar um jogo customizado!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr ""
+#~ "Pressiona em qualquer tecla do teclado ou clique no rato para começar o "
+#~ "jogo."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Lê o ficheiro README.txt para mais informações!"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "Quantas crianças vão jogar?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(Entre 2 a 4 jogadores)"
+
+#, fuzzy
+#~ msgid "Enter Server Name:"
+#~ msgstr "Coloca o Teu Nome:"
+
+#, fuzzy
+#~ msgid "Server Name:"
+#~ msgstr "Coloca o Teu Nome:"
+
+#~ msgid "Enter your name:"
+#~ msgstr "Coloca o teu nome:"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(carrega numa tecla quando estiveres preparado)"
+
+#~ msgid "Who is playing first?"
+#~ msgstr "Quem vai jogar primeiro?"
+
+#~ msgid "Who is playing next?"
+#~ msgstr "Quem joga a seguir?"
+
+#~ msgid "How many rounds will you play?"
+#~ msgstr "Quantas voltas querem jogar?"
+
+#~ msgid "Enter a number"
+#~ msgstr "Coloca um número"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstração"
+
+#~ msgid "Elimination"
+#~ msgstr "Eliminação"
+
+#~ msgid "Factoroids!"
+#~ msgstr "Factoroids!"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Frota de Missões para Comando da Matemática"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Academia de Treino Comando da Matemática"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Jogar Modo Arcada"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Jogar Modo de Prática"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Jogar Com Amigos"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "Pontuação"
+#~ msgid "Score Sweep"
+#~ msgstr "Pontuação"
 
 #~ msgid "Main menu"
 #~ msgstr "Menu principal"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 62149a2..48c9e56 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 5a13011..1f47a5f 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -23,122 +23,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -221,319 +105,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Hall da Fama"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Cadete Espacial"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Sentinela"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Defensor"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Especialista"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath é gratuíto e software livre!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Você pode ajudar a torná-lo melhor reportando problemas."
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Discutir o futuro em tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Edite o arquivo 'options\" no seu diretório home"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "criar jogo personalizado!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Pressione uma tecla ou clique com seu mouse para iniciar o jogo."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Leia o README.txt para mais informações"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Trabalho em curso"
@@ -550,7 +179,7 @@ msgstr "Discutir o futuro do TuxMath em"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Ajuda"
 
@@ -788,77 +417,53 @@ msgstr "Multiplicação de Positivos e Negativos"
 msgid "Division of Positives and Negatives"
 msgstr "Divisão de Positivos e Negativos"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Créditos"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstração"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Menu Principal"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Comando de Treinamento Matemático Acadêmico"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Mais Opções"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Jogar jogo de Arcade"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Jogar um Jogo Personalizado"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Informação do Projeto"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Sair"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Edite o arquivo 'options\" no seu diretório home"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "criar jogo personalizado!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Pressione uma tecla ou clique com seu mouse para iniciar o jogo."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Leia o README.txt para mais informações"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstração"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Comando de Treinamento Matemático Acadêmico"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Jogar jogo de Arcade"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Jogar um Jogo Personalizado"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "sugerindo melhorias, ou programando."
diff --git a/po/ru.gmo b/po/ru.gmo
index a0e8496..786d328 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index cf9f5df..c207b04 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -20,122 +20,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -218,319 +102,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Зал славы"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Космический курсант"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Разведчик"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Рейнджер"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ас"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath свободный и открытый!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Вы можете улучшить этот продукт, сообщив о проблеме,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Обсудите будущее программы на tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Редактировать файл параметров в вашей домашней директории"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "для создания пользовательской игры!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Нажмите клавишу или кликните мышью для запуска игры."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Смотрите README.txt для дополнительной информации"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Работа продолжается!"
@@ -547,7 +176,7 @@ msgstr "Обсудить будущее TuxMath на"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Помощь"
 
@@ -785,77 +414,53 @@ msgstr "Умножение положительных на отрицатель
 msgid "Division of Positives and Negatives"
 msgstr "Деление положительных и отрицательных"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Разработчики"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Демонстрация"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Главное меню"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Учебная академия по арифметике"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Дополнительные настройки"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Играть в аркадную игру"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Играть в пользовательскую игру"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Информация о проекте"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Выход"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Редактировать файл параметров в вашей домашней директории"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "для создания пользовательской игры!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Нажмите клавишу или кликните мышью для запуска игры."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Смотрите README.txt для дополнительной информации"
+
+#~ msgid "Demo"
+#~ msgstr "Демонстрация"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Учебная академия по арифметике"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Играть в аркадную игру"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Играть в пользовательскую игру"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "предложив улучшение или добавив код."
diff --git a/po/sk.gmo b/po/sk.gmo
index 8ef7ade..15584ed 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index afb22b3..4725e16 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -20,122 +20,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -218,319 +102,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Sieň slávy"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Vesmírny kadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Skaut"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Poručík"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Eso"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath je slobodný software!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Môžeš ho vylepšiť aj ty oznamovaním problémov,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskutuj o budúcnosti na tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Uprav súbor «options » vo svojom domovskom priečinku,"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "aby si mohol vytvoriť svoju vlastnú hru!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Pre spustenie hry stlačte ľubovoľnú klávesu, alebo kliknite myšou."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Pre viac informácií pozrite README.txt"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Spracováva sa!"
@@ -547,7 +176,7 @@ msgstr "Diskutuj o budúcnosti TuxMath na"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Pomocník"
 
@@ -785,77 +414,53 @@ msgstr "Násobenie kladných a záporných čísiel"
 msgid "Division of Positives and Negatives"
 msgstr "Delenie kladných a záporných čísiel"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Tvorcovia"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demo"
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Hlavná ponuka"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Cvičná akadémia matematického ovládania"
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Viac možností"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Hrať arkádovú hru"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Hrať vlastnú hru"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Informácie o projekte"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Koniec"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Uprav súbor «options » vo svojom domovskom priečinku,"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "aby si mohol vytvoriť svoju vlastnú hru!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Pre spustenie hry stlačte ľubovoľnú klávesu, alebo kliknite myšou."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Pre viac informácií pozrite README.txt"
+
+#~ msgid "Demo"
+#~ msgstr "Demo"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Cvičná akadémia matematického ovládania"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Hrať arkádovú hru"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Hrať vlastnú hru"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "navrhovaním vylepšení, alebo pridaním kódu"
diff --git a/po/sl.po b/po/sl.po
index 7ad1729..82f00cc 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -17,122 +17,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-24 22:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -215,319 +99,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr ""
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr ""
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Tabornik"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Čuvaj"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "As"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath je prost in odprtokoden!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "S sporočanjem težav, predlogov za izboljšave in"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Pogovor o prihodnosti na tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Za igro po meri spremenite datoteko"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "'options' v vaši domači mapi."
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Za začetek igre pritisni tipko ali klikni z miško."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Za več podrobnosti preberite datoteko README.txt"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Delo še poteka!"
@@ -544,7 +173,7 @@ msgstr "Pogovor o prihodnsti programa TuxMath na"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Pomoč"
 
@@ -782,77 +411,47 @@ msgstr "Množenje pozitivnih in negativnih števil"
 msgid "Division of Positives and Negatives"
 msgstr "Deljenje pozitivnih in negativnih števil"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Zasluge"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr ""
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Glavni meni"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Več možnosti"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Igraj arkadno igro"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Igraj igro po meri"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "O projektu"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Končaj"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Za igro po meri spremenite datoteko"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "to create customized game!"
+#~ msgstr "'options' v vaši domači mapi."
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Za začetek igre pritisni tipko ali klikni z miško."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Za več podrobnosti preberite datoteko README.txt"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Igraj arkadno igro"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Igraj igro po meri"
 
 #~ msgid "Main menu"
 #~ msgstr "Glavni meni"
diff --git a/po/sv.gmo b/po/sv.gmo
index 3aa95fe..f1b506a 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index ece4d15..c07642d 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -16,125 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Swedish\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Gratulerar! Du vann!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Omgång"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-[Esc] för att hoppa över"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Uppdrag 1: Försiktig kadett"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "Jag är så glad att du kom!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "Gör ditt yttersta!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Uppdrag 2: Smart scout"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "Du kan rädda dem!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Uppdrag 3: Kunglig jägare"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Uppdrag 4: Empirisk mästare"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-#, fuzzy
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr "en ny attack från Divisionslandet!"
-
-#: src/campaign.c:154
-#, fuzzy
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Det finns ingen tid att förlora. Staden"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Sista uppdraget: Beräknande kommandosoldat"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "Jag hoppas att tipset hjälper!"
-
-#: src/campaign.c:165
-#, fuzzy
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "Nu gäller det! Du kan stoppa dessa"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Tyvärr, försök igen!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Uppdraget slutfört! Galaxen är säker!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -217,327 +98,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "NÄMNARE: för att vinna behöver du förstöra alla asteroider."
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-"Använd piltangenterna för att svänga eller gå framåt. Sikta på en asteroid,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "skriv in en av dess nämnare och tryck på Blanksteg eller Return"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr "för att dela den i sina nämnare. Stenar med primtal förstörs!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "BRÅK: för att vinna behöver du förstöra alla asteroider"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"skriv in ett tal som kan förenkla bråket och tryck på Blanksteg eller Return"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"för att dela det. Förstör bråken som inte kan förenklas mer i ett enda skott!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Välkommen till TuxMath!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Ditt uppdrag är att rädda dina"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "pingviners igloos från"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "fallande kometer."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Stoppa en komet genom att"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "skriva in svaret på matteproblemet,"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "trycka på \"blanksteg\" eller \"Enter\"."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Prova det nu!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Bra skjutet!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Om en igloo träffas av en komet,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "så smälter den. Men var lugn,"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "pingvinen är OK!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Se vad som händer:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Tryck på en tangent)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Observera svaret"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Om den blir träffad igen,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "kommer pingvinen att gå."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Tryck på en tangent)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Du kan bygga nya igloos"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "genom att stoppa bonuskometer."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Skjut den nu!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Bra jobbat!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Avsluta när du vill genom att"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "trycka \"Esc\" eller klicka på \"X\""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "i övre högra hörnet."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Gör det nu och spela sedan!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Poänglistan"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Rymdkadett"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Jägare"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Mästare"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Kommandosoldat"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Nämnare"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Bråk"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr "Du kom med på poänglistan!"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Skriv ditt namn:"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath är gratis och öppen källkod!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, 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:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "Diskutera framtiden på tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Redigera filen \"options\" i din hemkatalog"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "för att skapa anpassade spel!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Tryck på en tangent eller klicka med musen för att starta spelet."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Se README.txt för mer information"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-#, fuzzy
-msgid "Enter Server Name:"
-msgstr "Skriv ditt namn:"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-#, fuzzy
-msgid "Server Name:"
-msgstr "Skriv ditt namn:"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-#, fuzzy
-msgid "Enter your name:"
-msgstr "Skriv ditt namn:"
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Tryck på en tangent)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-#, fuzzy
-msgid "Enter a number"
-msgstr "Skriv ditt namn:"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Arbete pågår!"
@@ -554,7 +172,7 @@ msgstr "Diskutera framtiden för TuxMath på"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Hjälp"
 
@@ -792,78 +410,248 @@ msgstr "Multiplikation med positiva och negativa tal"
 msgid "Division of Positives and Negatives"
 msgstr "Division med positiva och negativa tal"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Tack till"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Huvudmeny"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Demonstration"
+msgid "More Options"
+msgstr "Fler alternativ"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
+msgid "Play Alone"
+msgstr "Spela ensam"
 
 #: data/menus/menu_strings:6
+msgid "Project Info"
+msgstr "Projektinformation"
+
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Avsluta"
+
+#~ msgid "Congratulations! You win!"
+#~ msgstr "Gratulerar! Du vann!"
+
+#~ msgid "Round"
+#~ msgstr "Omgång"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "-[Esc] för att hoppa över"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Uppdrag 1: Försiktig kadett"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "Jag är så glad att du kom!"
+
+#~ msgid "Do your best!"
+#~ msgstr "Gör ditt yttersta!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Uppdrag 2: Smart scout"
+
+#~ msgid "But you can save them!"
+#~ msgstr "Du kan rädda dem!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Uppdrag 3: Kunglig jägare"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Uppdrag 4: Empirisk mästare"
+
 #, fuzzy
-msgid "Factoroids!"
-msgstr "Nämnare"
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr "en ny attack från Divisionslandet!"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#, fuzzy
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "Det finns ingen tid att förlora. Staden"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Huvudmeny"
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Sista uppdraget: Beräknande kommandosoldat"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Uppdrag för matematikflottan"
+#~ msgid "I hope that hint helps!"
+#~ msgstr "Jag hoppas att tipset hjälper!"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Akademin för matematikträning"
+#, fuzzy
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr "Nu gäller det! Du kan stoppa dessa"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Fler alternativ"
+#~ msgid "Sorry, try again!"
+#~ msgstr "Tyvärr, försök igen!"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Uppdraget slutfört! Galaxen är säker!"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Spela ensam"
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "NÄMNARE: för att vinna behöver du förstöra alla asteroider."
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Spela arkadspel"
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr ""
+#~ "Använd piltangenterna för att svänga eller gå framåt. Sikta på en "
+#~ "asteroid,"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Spela anpassat spel"
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "skriv in en av dess nämnare och tryck på Blanksteg eller Return"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Spela med vänner"
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr "för att dela den i sina nämnare. Stenar med primtal förstörs!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Projektinformation"
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "BRÅK: för att vinna behöver du förstöra alla asteroider"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Avsluta"
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr ""
+#~ "skriv in ett tal som kan förenkla bråket och tryck på Blanksteg eller "
+#~ "Return"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "för att dela det. Förstör bråken som inte kan förenklas mer i ett enda "
+#~ "skott!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Välkommen till TuxMath!"
+
+#~ msgid "Your mission is to save your"
+#~ msgstr "Ditt uppdrag är att rädda dina"
+
+#~ msgid "penguins' igloos from the"
+#~ msgstr "pingviners igloos från"
+
+#~ msgid "falling comets."
+#~ msgstr "fallande kometer."
+
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Stoppa en komet genom att"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "skriva in svaret på matteproblemet,"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "trycka på \"blanksteg\" eller \"Enter\"."
+
+#~ msgid "Try it now!"
+#~ msgstr "Prova det nu!"
+
+#~ msgid "Good shot!"
+#~ msgstr "Bra skjutet!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Om en igloo träffas av en komet,"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "så smälter den. Men var lugn,"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "pingvinen är OK!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "Se vad som händer:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Tryck på en tangent)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Observera svaret"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Om den blir träffad igen,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "kommer pingvinen att gå."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Tryck på en tangent)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Du kan bygga nya igloos"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "genom att stoppa bonuskometer."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Skjut den nu!"
+
+#~ msgid "Great job!"
+#~ msgstr "Bra jobbat!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Avsluta när du vill genom att"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "trycka \"Esc\" eller klicka på \"X\""
+
+#~ msgid "in the upper right corner."
+#~ msgstr "i övre högra hörnet."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Gör det nu och spela sedan!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Redigera filen \"options\" i din hemkatalog"
+
+#~ msgid "to create customized game!"
+#~ msgstr "för att skapa anpassade spel!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Tryck på en tangent eller klicka med musen för att starta spelet."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Se README.txt för mer information"
+
+#, fuzzy
+#~ msgid "Enter Server Name:"
+#~ msgstr "Skriv ditt namn:"
+
+#, fuzzy
+#~ msgid "Server Name:"
+#~ msgstr "Skriv ditt namn:"
+
+#, fuzzy
+#~ msgid "Enter your name:"
+#~ msgstr "Skriv ditt namn:"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Tryck på en tangent)"
+
+#, fuzzy
+#~ msgid "Enter a number"
+#~ msgstr "Skriv ditt namn:"
+
+#~ msgid "Demo"
+#~ msgstr "Demonstration"
+
+#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Nämnare"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Uppdrag för matematikflottan"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Akademin för matematikträning"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Spela arkadspel"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Spela anpassat spel"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Spela med vänner"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "föreslå förbättringar eller bidra med programkod."
diff --git a/po/tr.gmo b/po/tr.gmo
index 6249be1..9bef224 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 364b2e5..ef42924 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -15,125 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Tebrikler! Kazandın!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Tur"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "-Atlamak için [Esc]"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "Görev Bir : Dikkatli Tertip"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "Geldiğine çok sevindim!"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "En iyisini yap!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "Görev İki: Akıllı İzci"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "Ama sen onları kurtarabilirsin!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "Görev Üç: Asil Korucu"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "Görev Dört: İmparatorluk Ası"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-#, fuzzy
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr "yeni bir saldırı başlar!"
-
-#: src/campaign.c:154
-#, fuzzy
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "Şimdi dinlenmek için zaman yok; şehrin"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "Son Görev: Hesaplama Komandosu"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "Umarım bu ipucu işine yarar!"
-
-#: src/campaign.c:165
-#, fuzzy
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "Hepsi bu! Bu saldırıları sonsuza dek"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Üzgünüm, tekrar dene!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Görev başarıyla tamamlandı. Galaksi güvenli!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -216,324 +97,66 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "Ok tuşlarını kullanarak dön ya da ileri git. Bir asteroidi hedef al,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "çarpanlarından birini yaz ve boşluk ya da enter'e "
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr "basarak çarpanlarına ayır. Asal sayılar olan kayalar yok oluyor!"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "KESİRLER: Kazanmak için tüm asteroitleri yok etmen gerekiyor."
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-"Kesiri basitleştirebilecek bir sayıyı yazıp boşluk ya da enter'e basarak onu"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-"parçalayın. Daha fazla basitleştirilemeyen kesirleri tek bir atışta yok et!"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "TuxMath'e Hoş Geldin!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Görevin penguenlerin evlerini"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "düşen kuyruklu yıldızlardan"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "korumak."
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "Kuyruklu yıldızı durdurmak için"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "matematik probleminin yanıtını yaz"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "ve 'boşluk' ya da 'enter' tuşuna bas."
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "Şimdi dene!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "İyi atış!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "Eğer bir ev kuyruklu yıldız tarafından"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "vurulursa erir. Ama merak etme :"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "içindeki penguene zarar gelmez!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "Yalnız ne olduğunu izle:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(Başlamak için bir tuşa bas)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "Yanıta dikkat et"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "Eğer ev tekrar vurulursa,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "içindeki penguen evi terk eder."
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(Hazır olunca herhangi bir tuşa basın)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "Ek kuyruklu yıldızları durdurarak"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "evlerini tamir edebilirsin."
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "Hemen vur onu!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "İyi iş!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "Her an 'Esc'e basarak ya da"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "sağ üst köşedeki 'X'e"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "tıklayarak çıkabilirsin."
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Hemen şimdi yap ve sonra oyna!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Gurur Tablosu"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Uzay Tertibi"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "İzci"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Korucu"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "As"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "Komando"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "Çarpanlar"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Kesirler"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath özgür ve açık kaynak kodlu!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "Sorunları bildirerek, iyileştirmeler önererek ya da kod yazarak"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr ""
 "tuxmath-devel at lists.sourceforge.net e-posta listesinde TuxMath'in geleceğini "
 "tartışabilirsin"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "Özelleştirilmiş oyun yaratmak için"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "ev dizinindeki 'options' dosyasını düzenle!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "Oyuna başlamak için bir tuşa basın ya da fareye tıklayın."
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "Daha fazla bilgi için README.txt dosyasına bakın"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(Hazır olunca herhangi bir tuşa basın)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Çalışmalar Sürüyor!"
@@ -550,7 +173,7 @@ msgstr "Tuxmath'in geleceğini tartışıldığı liste :"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Yardım"
 
@@ -788,78 +411,228 @@ msgstr "Pozitiflerle Negatiflerin Çarpılması"
 msgid "Division of Positives and Negatives"
 msgstr "Pozitif ve Negatiflerin Bölünmesi"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Hazırlayanlar"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "Ana Menü"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "Gösteri (Demo)"
+msgid "More Options"
+msgstr "Daha Çok Seçenek"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
+msgid "Play Alone"
+msgstr "Yalnız Oyna"
 
 #: data/menus/menu_strings:6
+msgid "Project Info"
+msgstr "Proje Bilgisi"
+
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "Çıkış"
+
+#~ msgid "Congratulations! You win!"
+#~ msgstr "Tebrikler! Kazandın!"
+
+#~ msgid "Round"
+#~ msgstr "Tur"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "-Atlamak için [Esc]"
+
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "Görev Bir : Dikkatli Tertip"
+
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "Geldiğine çok sevindim!"
+
+#~ msgid "Do your best!"
+#~ msgstr "En iyisini yap!"
+
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "Görev İki: Akıllı İzci"
+
+#~ msgid "But you can save them!"
+#~ msgstr "Ama sen onları kurtarabilirsin!"
+
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "Görev Üç: Asil Korucu"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "Görev Dört: İmparatorluk Ası"
+
 #, fuzzy
-msgid "Factoroids!"
-msgstr "Çarpanlar"
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr "yeni bir saldırı başlar!"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#, fuzzy
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "Şimdi dinlenmek için zaman yok; şehrin"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "Ana Menü"
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "Son Görev: Hesaplama Komandosu"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "Matematik Komutanlığı Donanması Görevleri"
+#~ msgid "I hope that hint helps!"
+#~ msgstr "Umarım bu ipucu işine yarar!"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Matematik Komutanlığı Eğitim Akademisi"
+#, fuzzy
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr "Hepsi bu! Bu saldırıları sonsuza dek"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "Daha Çok Seçenek"
+#~ msgid "Sorry, try again!"
+#~ msgstr "Üzgünüm, tekrar dene!"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Görev başarıyla tamamlandı. Galaksi güvenli!"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "Yalnız Oyna"
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr ""
+#~ "Ok tuşlarını kullanarak dön ya da ileri git. Bir asteroidi hedef al,"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Eğlence Oyunu Oyna"
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "çarpanlarından birini yaz ve boşluk ya da enter'e "
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Özel Oyun Oyna"
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr "basarak çarpanlarına ayır. Asal sayılar olan kayalar yok oluyor!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "Arkadaşlarla Oyna"
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "KESİRLER: Kazanmak için tüm asteroitleri yok etmen gerekiyor."
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "Proje Bilgisi"
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr ""
+#~ "Kesiri basitleştirebilecek bir sayıyı yazıp boşluk ya da enter'e basarak "
+#~ "onu"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "Çıkış"
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr ""
+#~ "parçalayın. Daha fazla basitleştirilemeyen kesirleri tek bir atışta yok "
+#~ "et!"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "TuxMath'e Hoş Geldin!"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Your mission is to save your"
+#~ msgstr "Görevin penguenlerin evlerini"
+
+#~ msgid "penguins' igloos from the"
+#~ msgstr "düşen kuyruklu yıldızlardan"
+
+#~ msgid "falling comets."
+#~ msgstr "korumak."
+
+#~ msgid "Stop a comet by typing"
+#~ msgstr "Kuyruklu yıldızı durdurmak için"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "matematik probleminin yanıtını yaz"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "ve 'boşluk' ya da 'enter' tuşuna bas."
+
+#~ msgid "Try it now!"
+#~ msgstr "Şimdi dene!"
+
+#~ msgid "Good shot!"
+#~ msgstr "İyi atış!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "Eğer bir ev kuyruklu yıldız tarafından"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "vurulursa erir. Ama merak etme :"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "içindeki penguene zarar gelmez!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "Yalnız ne olduğunu izle:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(Başlamak için bir tuşa bas)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "Yanıta dikkat et"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "Eğer ev tekrar vurulursa,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "içindeki penguen evi terk eder."
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(Hazır olunca herhangi bir tuşa basın)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "Ek kuyruklu yıldızları durdurarak"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "evlerini tamir edebilirsin."
+
+#~ msgid "Zap it now!"
+#~ msgstr "Hemen vur onu!"
+
+#~ msgid "Great job!"
+#~ msgstr "İyi iş!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "Her an 'Esc'e basarak ya da"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "sağ üst köşedeki 'X'e"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "tıklayarak çıkabilirsin."
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Hemen şimdi yap ve sonra oyna!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "Özelleştirilmiş oyun yaratmak için"
+
+#~ msgid "to create customized game!"
+#~ msgstr "ev dizinindeki 'options' dosyasını düzenle!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "Oyuna başlamak için bir tuşa basın ya da fareye tıklayın."
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "Daha fazla bilgi için README.txt dosyasına bakın"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(Hazır olunca herhangi bir tuşa basın)"
+
+#~ msgid "Demo"
+#~ msgstr "Gösteri (Demo)"
+
+#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Çarpanlar"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "Matematik Komutanlığı Donanması Görevleri"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Matematik Komutanlığı Eğitim Akademisi"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "Eğlence Oyunu Oyna"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "Özel Oyun Oyna"
+
+#~ msgid "Play With Friends"
+#~ msgstr "Arkadaşlarla Oyna"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "daha iyi olmasına yardımcı olabilirsin."
diff --git a/po/vi.po b/po/vi.po
index de8652f..0f2d8aa 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -17,122 +17,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-24 22:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr ""
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr ""
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -215,319 +99,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr ""
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr ""
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr ""
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr ""
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr ""
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr ""
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr ""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr ""
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr ""
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr ""
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr ""
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr ""
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr ""
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr ""
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr ""
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr ""
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr ""
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr ""
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr ""
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr ""
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr ""
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr ""
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr ""
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr ""
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr ""
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr ""
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "Nhà lưu niệm"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "Trinh sát"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Ace"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 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:376
+#: src/menu.c:314
 #, 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:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, 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"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr ""
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr ""
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr ""
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr ""
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr ""
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-msgid "Click when ready"
-msgstr ""
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr ""
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Đang được thực hiện!"
@@ -544,7 +173,7 @@ msgstr "Thảo luận tương lại của TuxMath tại"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "Trợ giúp"
 
@@ -780,77 +409,35 @@ msgstr ""
 msgid "Division of Positives and Negatives"
 msgstr ""
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "Lời cám ơn"
 
-#: data/menus/menu_strings:4
-msgid "Demo"
-msgstr ""
-
-#: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr ""
-
-#: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr ""
-
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
-
-#: data/menus/menu_strings:12
+#: data/menus/menu_strings:3
 msgid "Main Menu"
 msgstr "Trình đơn chính"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
-
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr ""
-
-#: data/menus/menu_strings:15
+#: data/menus/menu_strings:4
 msgid "More Options"
 msgstr "Tuỳ chọn khác"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
-
-#: data/menus/menu_strings:17
+#: data/menus/menu_strings:5
 msgid "Play Alone"
 msgstr ""
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Chơi trò chơi Arcade"
-
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "Chơi trò chơi tự chọn"
-
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
-
-#: data/menus/menu_strings:21
+#: data/menus/menu_strings:6
 msgid "Project Info"
 msgstr "Thông tin dự án"
 
-#: data/menus/menu_strings:22
+#: data/menus/menu_strings:7
 msgid "Quit"
 msgstr "Thoát"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Play Arcade Game"
+#~ msgstr "Chơi trò chơi Arcade"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Play Custom Game"
+#~ msgstr "Chơi trò chơi tự chọn"
 
 #~ msgid "Main menu"
 #~ msgstr "Trình đơn chính"
diff --git a/po/zam.po b/po/zam.po
index 10b92ec..9a8a272 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -15,122 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Luú blíl"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "Bruú"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr ""
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr ""
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr ""
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr ""
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr ""
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr ""
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr ""
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr ""
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr ""
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "Liíl taá dií ves"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "Teé loól shiint. Luú siúu yeén kuan sbhaak"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -214,329 +98,66 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
-"FACTOROIDS: Paar liíl gaán, luú naa kiin loós luú reé keé naá loó "
-"beé"
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
-"FRACCIONES: Paar liíl gaán, luú naa kiin loós luú reé keé naá loó "
-"beé"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "Vestaá diiefluú TuxMath"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "Naá kiín ruúl tree"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "los igloos de tus pinguinos"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "Beél kií de laá "
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "luhus Beél kii"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "debes teclar la respuesta correcta al problema matematico"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "Gaás \"enter\" o \"barra espaciadora\""
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "taá diif beés"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "Vesta bluú vi lil"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "si uno de los igloos es derramado por el cometa"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "Luús ha, naá sieéb luú"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "que el pinguino estara asalvo"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "GÃŒii koo bshaaÂŽk "
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "Gaás kuue paar tetél "
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "nota la respuesta"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "si el igloo es pegado por el cometa de nuevo "
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "el pinguino se va"
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "aprieta una tecla cuando estes listo "
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr " tu puedes areglar los igloos"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr " si logras parrar a los cometas de bono"
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "diis ah"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "Vaá kaá liíl lí"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "si quieres parrarel juego en cualquier momento"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "lo puedes hacer oprimiendo la tecla de ESC or la x en la pantalla"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "en la equinq derecha"
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "Liíy naál, será kiid"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "sala de fama"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "cadete espacial"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "escout"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "guardador"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "Yeég"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr ""
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr ""
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "Fracciones"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr "Taá leel"
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath es gratis y es una opcion abierta"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, 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:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "discute el futuro en tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "editar opciones del archivo del directorio principal"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "para crear un juego especialmente"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "aprieta un tecla y con tu mouse oprime la opcion de empesar el juego"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "ver README.txt para mas informacion"
-
-#: src/menu.c:526
-#, fuzzy
-msgid "How many kids are playing?"
-msgstr "Plaal kiid luú?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr ""
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-#, fuzzy
-msgid "Enter Server Name:"
-msgstr "Taá leel"
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-#, fuzzy
-msgid "Server Name:"
-msgstr "Taá leel"
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr "Taá leel"
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "aprieta una tecla cuando estes listo "
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr "Naal, Ah o yeenta %s\n"
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr "Choó kiíd neerta?"
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr "Choó kiíd será?"
-
-#: src/multiplayer.c:274
-msgid "How many rounds will you play?"
-msgstr "Plaal kiid luú?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr "Toob diif numbr"
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "Deé thus kue kue "
@@ -553,7 +174,7 @@ msgstr "para discutir el futuro de TuxMath puedes ir a"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr ""
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "ayda"
 
@@ -789,78 +410,192 @@ msgstr "Kalta men ploy numeros positivos y negativos"
 msgid "Division of Positives and Negatives"
 msgstr "lii rool men numeros positivos y negativos"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "creditos"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "menu principal"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "demostracion"
+msgid "More Options"
+msgstr "mas opciones"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
+msgid "Play Alone"
 msgstr ""
 
 #: data/menus/menu_strings:6
+msgid "Project Info"
+msgstr "informacion del projecto"
+
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "terminar"
+
+#~ msgid "Congratulations! You win!"
+#~ msgstr "Luú blíl"
+
+#~ msgid "-[Esc] to skip"
+#~ msgstr "Bruú"
+
+#~ msgid "Sorry, try again!"
+#~ msgstr "Liíl taá dií ves"
+
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "Teé loól shiint. Luú siúu yeén kuan sbhaak"
+
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr ""
+#~ "FACTOROIDS: Paar liíl gaán, luú naa kiin loós luú reé keé naá "
+#~ "loó beé"
+
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr ""
+#~ "FRACCIONES: Paar liíl gaán, luú naa kiin loós luú reé keé naá "
+#~ "loó beé"
+
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "Vestaá diiefluú TuxMath"
+
+#~ msgid "Your mission is to save your"
+#~ msgstr "Naá kiín ruúl tree"
+
+#~ msgid "penguins' igloos from the"
+#~ msgstr "los igloos de tus pinguinos"
+
+#~ msgid "falling comets."
+#~ msgstr "Beél kií de laá "
+
+#~ msgid "Stop a comet by typing"
+#~ msgstr "luhus Beél kii"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "debes teclar la respuesta correcta al problema matematico"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "Gaás \"enter\" o \"barra espaciadora\""
+
+#~ msgid "Try it now!"
+#~ msgstr "taá diif beés"
+
+#~ msgid "Good shot!"
+#~ msgstr "Vesta bluú vi lil"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "si uno de los igloos es derramado por el cometa"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "Luús ha, naá sieéb luú"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "que el pinguino estara asalvo"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "GÃŒii koo bshaaÂŽk "
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "Gaás kuue paar tetél "
+
+#~ msgid "Notice the answer"
+#~ msgstr "nota la respuesta"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "si el igloo es pegado por el cometa de nuevo "
+
+#~ msgid "penguin leaves."
+#~ msgstr "el pinguino se va"
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "aprieta una tecla cuando estes listo "
+
+#~ msgid "You can fix the igloos"
+#~ msgstr " tu puedes areglar los igloos"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr " si logras parrar a los cometas de bono"
+
+#~ msgid "Zap it now!"
+#~ msgstr "diis ah"
+
+#~ msgid "Great job!"
+#~ msgstr "Vaá kaá liíl lí"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "si quieres parrarel juego en cualquier momento"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "lo puedes hacer oprimiendo la tecla de ESC or la x en la pantalla"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "en la equinq derecha"
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "Liíy naál, será kiid"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "editar opciones del archivo del directorio principal"
+
+#~ msgid "to create customized game!"
+#~ msgstr "para crear un juego especialmente"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr ""
+#~ "aprieta un tecla y con tu mouse oprime la opcion de empesar el juego"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "ver README.txt para mas informacion"
+
 #, fuzzy
-msgid "Factoroids!"
-msgstr "Fracciones"
+#~ msgid "How many kids are playing?"
+#~ msgstr "Plaal kiid luú?"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#, fuzzy
+#~ msgid "Enter Server Name:"
+#~ msgstr "Taá leel"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "menu principal"
+#, fuzzy
+#~ msgid "Server Name:"
+#~ msgstr "Taá leel"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr ""
+#~ msgid "Enter your name:"
+#~ msgstr "Taá leel"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "Academia de entrenamiento de matematicas"
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "aprieta una tecla cuando estes listo "
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "mas opciones"
+#~ msgid "Then %s\n"
+#~ msgstr "Naal, Ah o yeenta %s\n"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Who is playing first?"
+#~ msgstr "Choó kiíd neerta?"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr ""
+#~ msgid "Who is playing next?"
+#~ msgstr "Choó kiíd será?"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "Juega el juego de arcade"
+#~ msgid "How many rounds will you play?"
+#~ msgstr "Plaal kiid luú?"
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "juega el juego hecho especialmente"
+#~ msgid "Enter a number"
+#~ msgstr "Toob diif numbr"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr ""
+#~ msgid "Demo"
+#~ msgstr "demostracion"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "informacion del projecto"
+#, fuzzy
+#~ msgid "Factoroids!"
+#~ msgstr "Fracciones"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "terminar"
+#~ msgid "Math Command Training Academy"
+#~ msgstr "Academia de entrenamiento de matematicas"
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid "Play Arcade Game"
+#~ msgstr "Juega el juego de arcade"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr ""
+#~ msgid "Play Custom Game"
+#~ msgstr "juega el juego hecho especialmente"
 
 #~ msgid "Main menu"
 #~ msgstr "menu principal"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index efdf515..e808e08 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 dff2b6c..9ddb778 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-05-07 17:05-0500\n"
+"POT-Creation-Date: 2010-05-27 00: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"
@@ -19,132 +19,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "恭喜!你赢了!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "回合"
-
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
-msgid "-[Esc] to skip"
-msgstr "按Esc键跳过"
-
-#: src/campaign.c:116
-msgid "Mission One: Careful Cadet"
-msgstr "第一个任务:认真的军校学员"
-
-#: src/campaign.c:118
-msgid "I'm so glad you've come!"
-msgstr "很高兴你来了"
-
-#: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
-"企鹅需要你的帮助!彗星从天而降,正在融化企鹅的小屋。为了保护它们的房子,需要"
-"你找到密码打败"
-
-#: src/campaign.c:122
-msgid "Do your best!"
-msgstr "尽你所能!"
-
-#: src/campaign.c:128
-msgid "Mission Two: Smart Scout"
-msgstr "第二个任务:聪明的侦察员"
-
-#: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr "干的好!因为你保护了企鹅的小屋,提升你为侦察员,监控可能的麻烦..."
-
-#: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
-"...就象正在发生的!掠夺者来了,他们正在发射新的,更狡猾的彗星来攻击企鹅!"
-
-#: src/campaign.c:133
-msgid "But you can save them!"
-msgstr "但是你可以保护他们!"
-
-#: src/campaign.c:139
-msgid "Mission Three: Royal Ranger"
-msgstr "第三个任务:皇家突击队"
-
-#: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
-"你又做到了!企鹅国王挑选你参加他的突击队,保卫城市。我们现在就送你到那儿去..."
-
-#: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
-"...哦不!现在国王自己受到来自新的彗星攻击了,这些是乘法问题!你需要更强的技能"
-"击败攻击。我们相信你能做到。加入突击队保卫城市吧!"
-
-#: src/campaign.c:149
-msgid "Mission Four: Imperial Ace"
-msgstr "第四个任务:皇家王牌飞行员"
-
-#: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
-"你做到了!国外想亲自感谢你。我们非常荣幸地带你到他的冰做的宫殿去:你将成为皇"
-"家王牌飞行员!"
-
-#: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr "但就在庆典时,一个来自除法之地的新攻击开始了!"
-
-#: src/campaign.c:154
-msgid "Now is no time for resting; the city needs your help!"
-msgstr "现在没有时间让你休息;城市需要你的帮助!"
-
-#: src/campaign.c:160
-msgid "Final Mission: Computing Commando"
-msgstr "最后任务:计算突击队"
-
-#: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
-"企鹅科学家研究后发显,所有的攻击都来自一个秘密基地,他们需要你去打赢这最后的"
-"战斗。科学家们还给你一个线索:先做乘法再做除法,然后做加法和减法。"
-
-#: src/campaign.c:163
-msgid "I hope that hint helps!"
-msgstr "希望提示能帮到你!"
-
-#: src/campaign.c:165
-msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr "就是这样!你是突击队员,你可以永远制止这些攻击,"
-
-#: src/campaign.c:229
-msgid "Sorry, try again!"
-msgstr "对不起,请再试一次!"
-
-#: src/campaign.c:236
-msgid "Mission accomplished. The galaxy is safe!"
-msgstr "任务完成。银河系安全了!"
-
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
 msgstr ""
@@ -227,321 +101,64 @@ msgstr ""
 msgid "For more information about Free Software and the GNU GPL, visit:"
 msgstr ""
 
-#: src/factoroids.c:553
-msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr "因数分解游戏:要赢的话,你得击毁所有的小行星。"
-
-#: src/factoroids.c:554 src/factoroids.c:565
-msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr "用键盘上的方向键转动或前进。瞄准一个小行星,"
-
-#: src/factoroids.c:555
-msgid "type one of its factors, and press space or return"
-msgstr "输入其中一个的系数,然后按空格或回车"
-
-#: src/factoroids.c:556
-msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr "分解成系数。带有质数的岩石会被摧毁"
-
-#: src/factoroids.c:564
-msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr "分数:要赢的话,你得消灭所有的小行星"
-
-#: src/factoroids.c:566
-msgid "type a number that can simplify the fraction, and press space or return"
-msgstr "输入可以简化分数的数,然后按空格或回车键"
-
-#: src/factoroids.c:567
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr "分解它。"
-
-#: src/game.c:1091
-msgid "Welcome to TuxMath!"
-msgstr "欢迎来到TuxMax!"
-
-#: src/game.c:1108
-msgid "Your mission is to save your"
-msgstr "你的任务是保护你的"
-
-#: src/game.c:1109
-msgid "penguins' igloos from the"
-msgstr "企鹅的小屋"
-
-#: src/game.c:1110
-msgid "falling comets."
-msgstr "正在降落的彗星。"
-
-#: src/game.c:1129
-msgid "Stop a comet by typing"
-msgstr "要制止彗星的话,按"
-
-#: src/game.c:1130
-msgid "the answer to the math problem"
-msgstr "数学问题的答案"
-
-#: src/game.c:1131
-msgid "and hitting 'space' or 'enter'."
-msgstr "按空格或回车键"
-
-#: src/game.c:1132
-msgid "Try it now!"
-msgstr "现在就试一试吧!"
-
-#: src/game.c:1140
-msgid "Good shot!"
-msgstr "打的好!"
-
-#: src/game.c:1150
-msgid "If an igloo gets hit by a comet,"
-msgstr "如果一个小屋被彗星击中的话,"
-
-#: src/game.c:1151
-msgid "it melts. But don't worry: the"
-msgstr "如果融化的话,别担心:"
-
-#: src/game.c:1152
-msgid "penguin is OK!"
-msgstr "企鹅正常!"
-
-#: src/game.c:1153
-msgid "Just watch what happens:"
-msgstr "只要观察发生了什么:"
-
-#: src/game.c:1154
-msgid "(Press a key to start)"
-msgstr "(按任意键开始)"
-
-#: src/game.c:1167
-msgid "Notice the answer"
-msgstr "注意答案"
-
-#: src/game.c:1177
-msgid "If it gets hit again, the"
-msgstr "如果再次被击中的话,"
-
-#: src/game.c:1178
-msgid "penguin leaves."
-msgstr "企鹅离开了。"
-
-#: src/game.c:1179
-msgid "(Press a key when ready)"
-msgstr "(准备好后按任意键)"
-
-#: src/game.c:1202
-msgid "You can fix the igloos"
-msgstr "你可以修复小屋"
-
-#: src/game.c:1203
-msgid "by stopping bonus comets."
-msgstr "通过停止奖励的彗星"
-
-#: src/game.c:1214
-msgid "Zap it now!"
-msgstr "现在攻击!"
-
-#: src/game.c:1220
-msgid "Great job!"
-msgstr "干的好!"
-
-#: src/game.c:1238
-msgid "Quit at any time by pressing"
-msgstr "任何时间退出,按"
-
-#: src/game.c:1239
-msgid "'Esc' or clicking the 'X'"
-msgstr "按'Esc'键或点击'X'"
-
-#: src/game.c:1240
-msgid "in the upper right corner."
-msgstr "在右上角"
-
-#: src/game.c:1241
-msgid "Do it now, and then play!"
-msgstr "现在就做,开始吧!"
-
-#: src/highscore.c:168 data/menus/menu_strings:9
+#: src/highscore.c:167
 msgid "Hall Of Fame"
 msgstr "排行榜"
 
-#: src/highscore.c:188 src/highscore.c:209 data/menus/menu_strings:27
+#: src/highscore.c:187 src/highscore.c:208
 msgid "Space Cadet"
 msgstr "太空警"
 
-#: src/highscore.c:191 data/menus/menu_strings:26
+#: src/highscore.c:190
 msgid "Scout"
 msgstr "童子军"
 
-#: src/highscore.c:194 data/menus/menu_strings:23
+#: src/highscore.c:193
 msgid "Ranger"
 msgstr "巡逻兵"
 
-#: src/highscore.c:197 data/menus/menu_strings:1
+#: src/highscore.c:196
 msgid "Ace"
 msgstr "王牌飞行员"
 
-#: src/highscore.c:200 data/menus/menu_strings:2
+#: src/highscore.c:199
 msgid "Commando"
 msgstr "突击队"
 
-#: src/highscore.c:203 data/menus/menu_strings:7
+#: src/highscore.c:202
 msgid "Factors"
 msgstr "系数"
 
-#: src/highscore.c:206 data/menus/menu_strings:8
+#: src/highscore.c:205
 msgid "Fractions"
 msgstr "分数"
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "You Are In The Hall of Fame!"
 msgstr ""
 
-#: src/highscore.c:287
+#: src/highscore.c:286
 msgid "Enter Your Name:"
 msgstr ""
 
-#: src/menu.c:375
+#: src/menu.c:313
 msgid "TuxMath is free and open-source!"
 msgstr "TuxMath 是自由软件而且是开放源代码的!"
 
-#: src/menu.c:376
+#: src/menu.c:314
 #, fuzzy
 msgid "You can help make it better."
 msgstr "你可以改进它或报告程序错误,"
 
-#: src/menu.c:377
+#: src/menu.c:315
 msgid "Suggestions, artwork, and code are all welcome!"
 msgstr ""
 
-#: src/menu.c:378
+#: src/menu.c:316
 #, fuzzy
 msgid "Discuss TuxMath at tuxmath-devel at lists.sourceforge.net"
 msgstr "讨论TuxMath: tuxmath-devel at lists.sourceforge.net"
 
-#: src/menu.c:499
-msgid "Edit 'options' file in your home directory"
-msgstr "在你的主文件夹编辑'options' 选项文件"
-
-#: src/menu.c:500
-msgid "to create customized game!"
-msgstr "创建自定义游戏!"
-
-#: src/menu.c:501
-msgid "Press a key or click your mouse to start game."
-msgstr "按任意键或点击鼠标开始游戏。"
-
-#: src/menu.c:502
-msgid "See README.txt for more information"
-msgstr "查看 README.txt 文件以获得更多信息"
-
-#: src/menu.c:526
-msgid "How many kids are playing?"
-msgstr "参加游戏的小朋友数量?"
-
-#: src/menu.c:527
-msgid "(Between 2 and 4 players)"
-msgstr "(2到4个玩家)"
-
-#: src/menu.c:589
-msgid "The server is already running"
-msgstr ""
-
-#: src/menu.c:594
-msgid "Enter Server Name:"
-msgstr ""
-
-#: src/menu.c:594
-msgid "(limit 50 characters)"
-msgstr ""
-
-#: src/menu.c:608
-msgid "Click or press key to select server lesson file"
-msgstr ""
-
-#: src/menu.c:637
-msgid "Server Name:"
-msgstr ""
-
-#: src/menu.c:639
-msgid "Selected Lesson:"
-msgstr ""
-
-#: src/menu.c:654 src/menu.c:701
-msgid "Sorry, this version built without network support"
-msgstr ""
-
-#: src/menu.c:655 src/menu.c:702
-#, c-format
-msgid "Sorry, this version built without network support.\n"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Detecting servers"
-msgstr ""
-
-#: src/menu.c:665
-msgid "Please wait"
-msgstr ""
-
-#: src/menu.c:671
-#, c-format
-msgid "Connected to server: %s"
-msgstr ""
-
-#: src/menu.c:672 src/multiplayer.c:258 src/multiplayer.c:260
-msgid "Enter your name:"
-msgstr ""
-
-#: src/menu.c:674
-#, fuzzy
-msgid "Click when ready"
-msgstr "(准备好后按任意键)"
-
-#: src/menu.c:676
-msgid "Waiting for other players"
-msgstr ""
-
-#: src/menu.c:689
-msgid "Sorry, game already in progress."
-msgstr ""
-
-#: src/menu.c:690
-#, c-format
-msgid "Sorry, game already in progress.\n"
-msgstr ""
-
-#: src/menu.c:696
-msgid "Sorry, no server could be found."
-msgstr ""
-
-#: src/menu.c:697
-#, c-format
-msgid "Sorry, no server could be found.\n"
-msgstr ""
-
-#: src/multiplayer.c:183
-#, c-format
-msgid "Then %s\n"
-msgstr ""
-
-#: src/multiplayer.c:258
-msgid "Who is playing first?"
-msgstr ""
-
-#: src/multiplayer.c:260
-msgid "Who is playing next?"
-msgstr ""
-
-#: src/multiplayer.c:274
-#, fuzzy
-msgid "How many rounds will you play?"
-msgstr "参加游戏的小朋友数量?"
-
-#: src/multiplayer.c:274
-msgid "Enter a number"
-msgstr ""
-
 #: src/titlescreen.c:478
 msgid "Work In Progress!"
 msgstr "运行中"
@@ -558,7 +175,7 @@ msgstr "讨论TuxMath:"
 msgid "tuxmath-devel at lists.sourceforge.net"
 msgstr "tuxmath-devel at lists.sourceforge.net"
 
-#: src/tuxmath.c:54 data/menus/menu_strings:10
+#: src/tuxhistory.c:54 data/menus/menu_strings:2
 msgid "Help"
 msgstr "帮助"
 
@@ -796,77 +413,288 @@ msgstr "正负数乘法"
 msgid "Division of Positives and Negatives"
 msgstr "正负数除法"
 
-#: data/menus/menu_strings:3
+#: data/menus/menu_strings:1
 msgid "Credits"
 msgstr "贡献者"
 
+#: data/menus/menu_strings:3
+msgid "Main Menu"
+msgstr "主菜单"
+
 #: data/menus/menu_strings:4
-msgid "Demo"
-msgstr "演示"
+msgid "More Options"
+msgstr "更多选项"
 
 #: data/menus/menu_strings:5
-msgid "Elimination"
-msgstr "消减"
+msgid "Play Alone"
+msgstr "自己玩"
 
 #: data/menus/menu_strings:6
-msgid "Factoroids!"
-msgstr "因数分解!"
+msgid "Project Info"
+msgstr "工程信息"
 
-#: data/menus/menu_strings:11
-msgid "Join Game"
-msgstr ""
+#: data/menus/menu_strings:7
+msgid "Quit"
+msgstr "退出"
 
-#: data/menus/menu_strings:12
-msgid "Main Menu"
-msgstr "主菜单"
+#~ msgid "Congratulations! You win!"
+#~ msgstr "恭喜!你赢了!"
+
+#~ msgid "Round"
+#~ msgstr "回合"
 
-#: data/menus/menu_strings:13
-msgid "Math Command Fleet Missions"
-msgstr "数学命令舰队任务"
+#~ msgid "-[Esc] to skip"
+#~ msgstr "按Esc键跳过"
 
-#: data/menus/menu_strings:14
-msgid "Math Command Training Academy"
-msgstr "数学运算练习"
+#~ msgid "Mission One: Careful Cadet"
+#~ msgstr "第一个任务:认真的军校学员"
 
-#: data/menus/menu_strings:15
-msgid "More Options"
-msgstr "更多选项"
+#~ msgid "I'm so glad you've come!"
+#~ msgstr "很高兴你来了"
+
+#~ msgid ""
+#~ "The penguins need your help! Comets are falling from the sky, and are "
+#~ "melting the penguins' igloos. To save their homes, we need you to find "
+#~ "the secret code that will zap each comet."
+#~ msgstr ""
+#~ "企鹅需要你的帮助!彗星从天而降,正在融化企鹅的小屋。为了保护它们的房子,需"
+#~ "要你找到密码打败"
 
-#: data/menus/menu_strings:16
-msgid "Network Game"
-msgstr ""
+#~ msgid "Do your best!"
+#~ msgstr "尽你所能!"
 
-#: data/menus/menu_strings:17
-msgid "Play Alone"
-msgstr "自己玩"
+#~ msgid "Mission Two: Smart Scout"
+#~ msgstr "第二个任务:聪明的侦察员"
 
-#: data/menus/menu_strings:18
-msgid "Play Arcade Game"
-msgstr "街机游戏"
+#~ msgid ""
+#~ "Great job! Since you saved the penguins' homes, we are promoting you to "
+#~ "Scout. Scouts are good for keeping an eye out for trouble..."
+#~ msgstr "干的好!因为你保护了企鹅的小屋,提升你为侦察员,监控可能的麻烦..."
 
-#: data/menus/menu_strings:19
-msgid "Play Custom Game"
-msgstr "自定义游戏"
+#~ msgid ""
+#~ "...like what's happening right now! The TakeAways have come, and they're "
+#~ "sending new, trickier comets against the penguins!"
+#~ msgstr ""
+#~ "...就象正在发生的!掠夺者来了,他们正在发射新的,更狡猾的彗星来攻击企鹅!"
 
-#: data/menus/menu_strings:20
-msgid "Play With Friends"
-msgstr "和朋友一起玩"
+#~ msgid "But you can save them!"
+#~ msgstr "但是你可以保护他们!"
 
-#: data/menus/menu_strings:21
-msgid "Project Info"
-msgstr "工程信息"
+#~ msgid "Mission Three: Royal Ranger"
+#~ msgstr "第三个任务:皇家突击队"
 
-#: data/menus/menu_strings:22
-msgid "Quit"
-msgstr "退出"
+#~ msgid ""
+#~ "You've done it again! The Penguin Emperor has chosen you to join his team "
+#~ "of Rangers that help protect the city.  We're sending you there now..."
+#~ msgstr ""
+#~ "你又做到了!企鹅国王挑选你参加他的突击队,保卫城市。我们现在就送你到那儿"
+#~ "去..."
 
-#: data/menus/menu_strings:24
-msgid "Run Server"
-msgstr ""
+#~ msgid ""
+#~ "...oh no! Now the Emperor himself is under attack, from new types of "
+#~ "comets: these problems are multiplying! To fight these, you need great "
+#~ "skill. We think you can do it. Join the Rangers and help save the city!"
+#~ msgstr ""
+#~ "...哦不!现在国王自己受到来自新的彗星攻击了,这些是乘法问题!你需要更强的"
+#~ "技能击败攻击。我们相信你能做到。加入突击队保卫城市吧!"
+
+#~ msgid "Mission Four: Imperial Ace"
+#~ msgstr "第四个任务:皇家王牌飞行员"
+
+#~ msgid ""
+#~ "You did it! The Emperor wants to thank you in person. We are taking you "
+#~ "to his ice palace for a great honor: you will become the Imperial Ace!"
+#~ msgstr ""
+#~ "你做到了!国外想亲自感谢你。我们非常荣幸地带你到他的冰做的宫殿去:你将成为"
+#~ "皇家王牌飞行员!"
+
+#~ msgid ""
+#~ "But right in the middle of the ceremony, a new attack from the land of "
+#~ "Division starts!"
+#~ msgstr "但就在庆典时,一个来自除法之地的新攻击开始了!"
+
+#~ msgid "Now is no time for resting; the city needs your help!"
+#~ msgstr "现在没有时间让你休息;城市需要你的帮助!"
+
+#~ msgid "Final Mission: Computing Commando"
+#~ msgstr "最后任务:计算突击队"
+
+#~ msgid ""
+#~ "Penguin scientists have learned that all these attacks are coming from a "
+#~ "secret base, and they need you to go fight the final battle. They also "
+#~ "give you this clue: first do multiplication and division, and then do "
+#~ "addition and subtraction."
+#~ msgstr ""
+#~ "企鹅科学家研究后发显,所有的攻击都来自一个秘密基地,他们需要你去打赢这最后"
+#~ "的战斗。科学家们还给你一个线索:先做乘法再做除法,然后做加法和减法。"
+
+#~ msgid "I hope that hint helps!"
+#~ msgstr "希望提示能帮到你!"
+
+#~ msgid "This is it! You can stop these attacks forever, Commando!"
+#~ msgstr "就是这样!你是突击队员,你可以永远制止这些攻击,"
+
+#~ msgid "Sorry, try again!"
+#~ msgstr "对不起,请再试一次!"
+
+#~ msgid "Mission accomplished. The galaxy is safe!"
+#~ msgstr "任务完成。银河系安全了!"
+
+#~ msgid "FACTOROIDS: to win, you need destroy all the asteroids."
+#~ msgstr "因数分解游戏:要赢的话,你得击毁所有的小行星。"
+
+#~ msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
+#~ msgstr "用键盘上的方向键转动或前进。瞄准一个小行星,"
+
+#~ msgid "type one of its factors, and press space or return"
+#~ msgstr "输入其中一个的系数,然后按空格或回车"
+
+#~ msgid ""
+#~ "to split it into its factors.  Rocks with prime numbers are destroyed!"
+#~ msgstr "分解成系数。带有质数的岩石会被摧毁"
+
+#~ msgid "FRACTIONS: to win, you need destroy all the asteroids"
+#~ msgstr "分数:要赢的话,你得消灭所有的小行星"
+
+#~ msgid ""
+#~ "type a number that can simplify the fraction, and press space or return"
+#~ msgstr "输入可以简化分数的数,然后按空格或回车键"
+
+#~ msgid ""
+#~ "to split it.  Destroy fractions that can not be further simplified in a "
+#~ "single shot!"
+#~ msgstr "分解它。"
+
+#~ msgid "Welcome to TuxMath!"
+#~ msgstr "欢迎来到TuxMax!"
+
+#~ msgid "Your mission is to save your"
+#~ msgstr "你的任务是保护你的"
+
+#~ msgid "penguins' igloos from the"
+#~ msgstr "企鹅的小屋"
+
+#~ msgid "falling comets."
+#~ msgstr "正在降落的彗星。"
+
+#~ msgid "Stop a comet by typing"
+#~ msgstr "要制止彗星的话,按"
+
+#~ msgid "the answer to the math problem"
+#~ msgstr "数学问题的答案"
+
+#~ msgid "and hitting 'space' or 'enter'."
+#~ msgstr "按空格或回车键"
+
+#~ msgid "Try it now!"
+#~ msgstr "现在就试一试吧!"
+
+#~ msgid "Good shot!"
+#~ msgstr "打的好!"
+
+#~ msgid "If an igloo gets hit by a comet,"
+#~ msgstr "如果一个小屋被彗星击中的话,"
+
+#~ msgid "it melts. But don't worry: the"
+#~ msgstr "如果融化的话,别担心:"
+
+#~ msgid "penguin is OK!"
+#~ msgstr "企鹅正常!"
+
+#~ msgid "Just watch what happens:"
+#~ msgstr "只要观察发生了什么:"
+
+#~ msgid "(Press a key to start)"
+#~ msgstr "(按任意键开始)"
+
+#~ msgid "Notice the answer"
+#~ msgstr "注意答案"
+
+#~ msgid "If it gets hit again, the"
+#~ msgstr "如果再次被击中的话,"
+
+#~ msgid "penguin leaves."
+#~ msgstr "企鹅离开了。"
+
+#~ msgid "(Press a key when ready)"
+#~ msgstr "(准备好后按任意键)"
+
+#~ msgid "You can fix the igloos"
+#~ msgstr "你可以修复小屋"
+
+#~ msgid "by stopping bonus comets."
+#~ msgstr "通过停止奖励的彗星"
+
+#~ msgid "Zap it now!"
+#~ msgstr "现在攻击!"
+
+#~ msgid "Great job!"
+#~ msgstr "干的好!"
+
+#~ msgid "Quit at any time by pressing"
+#~ msgstr "任何时间退出,按"
+
+#~ msgid "'Esc' or clicking the 'X'"
+#~ msgstr "按'Esc'键或点击'X'"
+
+#~ msgid "in the upper right corner."
+#~ msgstr "在右上角"
+
+#~ msgid "Do it now, and then play!"
+#~ msgstr "现在就做,开始吧!"
+
+#~ msgid "Edit 'options' file in your home directory"
+#~ msgstr "在你的主文件夹编辑'options' 选项文件"
+
+#~ msgid "to create customized game!"
+#~ msgstr "创建自定义游戏!"
+
+#~ msgid "Press a key or click your mouse to start game."
+#~ msgstr "按任意键或点击鼠标开始游戏。"
+
+#~ msgid "See README.txt for more information"
+#~ msgstr "查看 README.txt 文件以获得更多信息"
+
+#~ msgid "How many kids are playing?"
+#~ msgstr "参加游戏的小朋友数量?"
+
+#~ msgid "(Between 2 and 4 players)"
+#~ msgstr "(2到4个玩家)"
+
+#, fuzzy
+#~ msgid "Click when ready"
+#~ msgstr "(准备好后按任意键)"
+
+#, fuzzy
+#~ msgid "How many rounds will you play?"
+#~ msgstr "参加游戏的小朋友数量?"
+
+#~ msgid "Demo"
+#~ msgstr "演示"
+
+#~ msgid "Elimination"
+#~ msgstr "消减"
+
+#~ msgid "Factoroids!"
+#~ msgstr "因数分解!"
+
+#~ msgid "Math Command Fleet Missions"
+#~ msgstr "数学命令舰队任务"
+
+#~ msgid "Math Command Training Academy"
+#~ msgstr "数学运算练习"
+
+#~ msgid "Play Arcade Game"
+#~ msgstr "街机游戏"
+
+#~ msgid "Play Custom Game"
+#~ msgstr "自定义游戏"
+
+#~ msgid "Play With Friends"
+#~ msgstr "和朋友一起玩"
 
-#: data/menus/menu_strings:25
-msgid "Score Sweep"
-msgstr "消除得分"
+#~ msgid "Score Sweep"
+#~ msgstr "消除得分"
 
 #~ msgid "suggesting improvements, or adding code."
 #~ msgstr "提出改进建议或增加代码。"

-- 
tuxhistory - Educational history game



More information about the Tux4kids-commits mailing list