[Tux4kids-commits] r667 - in tuxtype/trunk: po src

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Sat Aug 23 01:37:52 UTC 2008


Author: dbruce-guest
Date: 2008-08-23 01:37:51 +0000 (Sat, 23 Aug 2008)
New Revision: 667

Modified:
   tuxtype/trunk/po/ar.po
   tuxtype/trunk/po/ca.po
   tuxtype/trunk/po/cs.po
   tuxtype/trunk/po/da.po
   tuxtype/trunk/po/de.po
   tuxtype/trunk/po/el.po
   tuxtype/trunk/po/en at boldquot.po
   tuxtype/trunk/po/en at quot.po
   tuxtype/trunk/po/en_GB.po
   tuxtype/trunk/po/es.po
   tuxtype/trunk/po/eu.po
   tuxtype/trunk/po/fr.po
   tuxtype/trunk/po/it.po
   tuxtype/trunk/po/ja.po
   tuxtype/trunk/po/lt.po
   tuxtype/trunk/po/ml.gmo
   tuxtype/trunk/po/ml.po
   tuxtype/trunk/po/nb.po
   tuxtype/trunk/po/ne.po
   tuxtype/trunk/po/nl.po
   tuxtype/trunk/po/nn.po
   tuxtype/trunk/po/pt.po
   tuxtype/trunk/po/ru.po
   tuxtype/trunk/po/sv.po
   tuxtype/trunk/po/sw.po
   tuxtype/trunk/po/tuxtype.pot
   tuxtype/trunk/po/wo.po
   tuxtype/trunk/src/SDL_extras.c
   tuxtype/trunk/src/alphabet.c
   tuxtype/trunk/src/main.c
   tuxtype/trunk/src/playgame.c
   tuxtype/trunk/src/practice.c
Log:
Changed ConvertToUTF8() to use GNU libiconv instead of Unicode, Inc.'s ConvertUTF32toUTF8()
(and now it works!)



Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/ar.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "A[qarh"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "G3ank"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "@ovg"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Tanta."
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hard"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practice"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Congratulations"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/ca.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,49 +42,49 @@
 msgid "Press space bar to return to game"
 msgstr "Premeu 'espai' per tornar al joc"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nivell"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Vides"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Peix"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Fàcil"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mitg"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difícil"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practicar"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "L'enhorabona!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/cs.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2007-11-10 16:36+0100\n"
 "Last-Translator: JardaK <krejci at zstenis.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -49,56 +49,56 @@
 msgstr "Stiskni mezerník pro návrat do hry"
 
 #
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Úroveň"
 
 #
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Životy"
 
 #
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Ryba"
 
 #
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Snadná"
 
 #
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Střední"
 
 #
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Těžká"
 
 #
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Procvičování"
 
 #
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Gratuluji"
 
 #
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Ach jo!"
 
 #
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "Skvělé!"
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/da.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2003-05-08 17:58+0200\n"
 "Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
 "Language-Team: Danish\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Tryk på mellemrumstasten for at spille videre"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Niveau"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fisk"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Let"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mellem"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hård"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Øv dig!"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Tillykke!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Åh nej!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/de.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2003-06-14 19:00+0000\n"
 "Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
 "Language-Team: German\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Drücke die Leertaste um weiterzuspielen"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Runde"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Leben"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fisch"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Einfach"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Schwer"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Fingerübung"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh Nein!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/el.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Επίπεδο"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Ζωές"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Ψάρια"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "1. Εύκολο"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "2. Κανονικό"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "3. Δύσκολο"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Εξάσκηση"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Ωχ! Όχι"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "Μπράβο!"
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/en at boldquot.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -31,8 +31,8 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
-"PO-Revision-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
+"PO-Revision-Date: 2008-08-21 17:45-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -64,47 +64,47 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Level"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Lives"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fish"
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Easy"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hard"
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practice"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Congratulations"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "Great!"
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr "Next letter "
 

Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/en at quot.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -28,8 +28,8 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
-"PO-Revision-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
+"PO-Revision-Date: 2008-08-21 17:45-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -61,47 +61,47 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Level"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Lives"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fish"
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Easy"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hard"
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practice"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Congratulations"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "Great!"
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr "Next letter "
 

Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/en_GB.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,47 +40,47 @@
 msgid "Press space bar to return to game"
 msgstr ""
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr ""
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr ""
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr ""
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr ""
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr ""
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr ""
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/es.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2007-09-16 19:00+0000\n"
 "Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
 "Language-Team: Spanish\n"
@@ -39,49 +39,49 @@
 msgid "Press space bar to return to game"
 msgstr "Pulsa la barra espaciadora para regresar al juego"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nivel"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Vidas"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Pescado"
 
 # niveles para juego de cascada:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medio"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difícil"
 
 # Cosas generales
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practicar"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "¡Felicidades!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "¡Oh, no!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/eu.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Maila"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Bizitzak"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Arraina"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Erreza"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Ertaina"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Gaitza"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Trebakuntza"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Zorionak"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oi ez!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/fr.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,49 +42,49 @@
 msgid "Press space bar to return to game"
 msgstr "taper la touche espace pour jouer"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Niveau"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Vies"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Poissons"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Facile"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Fort"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Pratique"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Flicitations"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh Non!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/it.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "premi SPAZIO per ritornare al gioco"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Livello"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Vite"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Pesci"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Facile"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medio"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difficile"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Pratica"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Congratulazioni"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh No! Prova di nuovo..."
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/ja.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,47 +39,47 @@
 msgid "Press space bar to return to game"
 msgstr ""
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr ""
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr ""
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr ""
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr ""
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr ""
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr ""
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/lt.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2004-10-20\n"
 "Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "lygis"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Meškerių:"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Žuvų:"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lengvas"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Sunkus"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Pirštų pratimai"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Sveikiname!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Deja..."
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/ml.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
@@ -41,47 +41,47 @@
 msgid "Press space bar to return to game"
 msgstr "കളിയില്‍ തിരിച്ചെത്താന്‍ സ്പെയ്സ് കീ അടിക്കുക"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "തട്ട്"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "ആയുസ്സ്"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "മത്സ്യം"
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "എളുപ്പം"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "ഇടത്തരം"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "ബുദ്ധിമുട്ടുള്ളത്"
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "പരിശീലനം"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "കൊള്ളാലോ!!!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "അയ്യോ!.."
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "അഭിനന്ദനങ്ങള്‍!"
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr "അടുത്തത് :"
 

Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/nb.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2005-10-20 21:24+0200\n"
 "Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -41,47 +41,47 @@
 msgid "Press space bar to return to game"
 msgstr "Trykk mellomrom for å gå tilbake til spillet."
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nivå"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fisk"
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lett"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Middels"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Vanskelig"
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Øving"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Gratulerer!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Uff!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/ne.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -44,57 +44,57 @@
 msgstr "खेलमा फर्कन स्पेस बार  थिच्नुहोस । "
 
 #
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "श्रेणी"
 
 #
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "जिवनहरु"
 
 #
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "माछा"
 
 #
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "सजिलो"
 
 #
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "मध्यम"
 
 #
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "कठिन"
 
 #
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "प्रशिक्षण"
 
 #
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "तपाइलाई बधाई छ!!!"
 
 #
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "हेत्तेरिका!.."
 
 #
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "उत्तम अति उत्तम ‍!"
 
 #
-#: src/practice.c:756
+#: src/practice.c:774
 #, fuzzy
 msgid "Next letter "
 msgstr "आगामी अक्षर"

Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/nl.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,49 +42,49 @@
 msgid "Press space bar to return to game"
 msgstr "terug naar het spel? druk op spatiebalk"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Level"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Levens"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Vissen"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Gemakkelijk"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Moeilijker"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Echt Moeilijk"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Vingeroefeningen"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Gefeliciteerd !"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Oh Nee!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/nn.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2005-02-12 13:13+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -40,47 +40,47 @@
 msgid "Press space bar to return to game"
 msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nivå"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fisk"
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lett"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Middels"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Vanskeleg"
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Øving"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Gratulerer!"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Uff!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/pt.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2007-02-07 16:08+0000\n"
 "Last-Translator: Hudson G M Figueredo <kynder at pquilinux.org>\n"
 "Language-Team:  <pt at li.org>\n"
@@ -39,49 +39,49 @@
 msgid "Press space bar to return to game"
 msgstr "Pressione a barra de espaço para voltar ao jogo"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nível"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Vidas"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Peixes"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Médio"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difícil"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Praticar"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Parabéns"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Ah não!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/ru.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,47 +40,47 @@
 msgid "Press space bar to return to game"
 msgstr "Нажмите пробел для возврата к игре"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Уровень"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Жизней"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Рыб"
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Легкий"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Средний"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Сложный"
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Практика"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Поздравляем"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "О, нет!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/sv.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype2 1.5.1\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2003-07-23 17:44+0200\n"
 "Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -39,49 +39,49 @@
 msgid "Press space bar to return to game"
 msgstr "Tryck mellanslag för att fortsätta spela"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nivå"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Fisk"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lätt"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mellan"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Svårt"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Övning"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Gratulerar"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Åh nej!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/sw.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,49 +40,49 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Nivel"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Vidas"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Peces"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Rahisi"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Ngumu"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Ngumu zaidi"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Jifunze"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Shukran"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Ahhhh"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/tuxtype.pot	2008-08-23 01:37:51 UTC (rev 667)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,47 +39,47 @@
 msgid "Press space bar to return to game"
 msgstr ""
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr ""
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr ""
 
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr ""
 
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr ""
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr ""
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr ""
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/po/wo.po	2008-08-23 01:37:51 UTC (rev 667)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"POT-Creation-Date: 2008-08-21 17:45-0500\n"
 "PO-Revision-Date: 2007-09-25 09:50-0000\n"
 "Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
 "org>\n"
@@ -41,49 +41,49 @@
 msgid "Press space bar to return to game"
 msgstr "Bësal banqaasu teqale ngir fo"
 
-#: src/playgame.c:1017
+#: src/playgame.c:1019
 msgid "Level"
 msgstr "Tollu tollu"
 
-#: src/playgame.c:1018
+#: src/playgame.c:1020
 msgid "Lives"
 msgstr "Dund yi"
 
-#: src/playgame.c:1019
+#: src/playgame.c:1021
 msgid "Fish"
 msgstr "Jën yi"
 
 # levels for Cascade game:
-#: src/playgame.c:1021 src/titlescreen.c:91
+#: src/playgame.c:1023 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Yomb"
 
-#: src/playgame.c:1022 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Ci diggante bi"
 
-#: src/playgame.c:1023 src/titlescreen.c:93
+#: src/playgame.c:1025 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Dëgër"
 
 # general stuff
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1026 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Jëf ji"
 
-#: src/playgame.c:1035
+#: src/playgame.c:1037
 msgid "Congratulations"
 msgstr "Waaw góor"
 
-#: src/playgame.c:1039
+#: src/playgame.c:1041
 msgid "Oh No!"
 msgstr "Déedéet!"
 
-#: src/practice.c:470
+#: src/practice.c:471
 msgid "Great!"
 msgstr "Ndokkale!"
 
-#: src/practice.c:756
+#: src/practice.c:774
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/src/SDL_extras.c
===================================================================
--- tuxtype/trunk/src/SDL_extras.c	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/src/SDL_extras.c	2008-08-23 01:37:51 UTC (rev 667)
@@ -323,6 +323,7 @@
 #ifdef HAVE_LIBSDL_PANGO
 
 SDLPango_Context *context = NULL;
+
 void init_SDLPango_Context()
 {
    if((context =  SDLPango_CreateContext_GivenFontDesc(settings.theme_font_name))==NULL)

Modified: tuxtype/trunk/src/alphabet.c
===================================================================
--- tuxtype/trunk/src/alphabet.c	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/src/alphabet.c	2008-08-23 01:37:51 UTC (rev 667)
@@ -1112,24 +1112,39 @@
   return wcslen(wide_word);
 }
 
+
+/* Now this uses GNU iconv and works correctly!   */
+/* This probably could be simplified - not certain */
+/* we have to copy into and out of the buffers     */
+
 /******************To be used for savekeyboard*************/
 /***Converts wchar_t string to char string*****************/
-int ConvertToUTF8(wchar_t* wide_word, char* UTF8_word)
+int ConvertToUTF8(wchar_t* wide_word, unsigned char* UTF8_word)
 {
   int i = 0;
-  ConversionResult result;
   UTF8 temp_UTF8[FNLEN];
   UTF32 temp_UTF32[FNLEN];
 
-  UTF8* UTF8_Start = temp_UTF8;
-  UTF8* UTF8_End = &temp_UTF8[FNLEN-1];
-  const UTF32* UTF32_Start = temp_UTF32;
-  const UTF32* UTF32_End = &temp_UTF32[FNLEN-1];
-
+  UTF8* UTF8_Start = &temp_UTF8[0];
+  UTF8* UTF8_End = &temp_UTF8[FNLEN - 1];
+  const UTF32* UTF32_Start = &temp_UTF32[0];
+  const UTF32* UTF32_End = &temp_UTF32[FNLEN - 1];
+  
+  iconv_t conv_descr;
+  size_t bytes_converted;
+  size_t in_length = (size_t)FNLEN;
+  size_t out_length = (size_t)FNLEN;
   wcsncpy(temp_UTF32, wide_word, FNLEN);
 
-  ConvertUTF32toUTF8(&UTF32_Start, UTF32_End, &UTF8_Start, UTF8_End, 0);
+  DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): wide_word = %S\n", wide_word);}
+  DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): temp_UTF32 = %S\n", temp_UTF32);}
 
+  conv_descr = iconv_open ("UTF-8", "UTF-32");
+  bytes_converted = iconv(conv_descr,
+                          &UTF32_Start, &in_length,
+                          &UTF8_Start, &out_length);
+  iconv_close(conv_descr);
+
   UTF8_word[0] = 0;
 
   while ((i < FNLEN) && (temp_UTF8[i] != 0))
@@ -1140,20 +1155,22 @@
 
   if (i >= FNLEN)
   {
-    fprintf(stderr, "convert_from_UTF8(): buffer overflow\n");
+    fprintf(stderr, "ConvertToUTF8(): buffer overflow\n");
     return -1;
   }
   else  //need terminating null:
   {
-	for(i;i<FNLEN;i++)
-	    UTF8_word[i] = 0;
+    UTF8_word[i] = '\0';
   }
 
-  DEBUGCODE {fprintf(stderr, "UTF8_word = %s\n", UTF8_word);}
+  DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): UTF8_word = %s\n", UTF8_word);}
+  DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): temp_UTF8 = %s\n", temp_UTF8);}
 
   return strlen(UTF8_word);
 }
 
+
+
 /******************************************************************/
 int map_keys(wchar_t wide_char,kbd_char* keyboard_entry)
 {

Modified: tuxtype/trunk/src/main.c
===================================================================
--- tuxtype/trunk/src/main.c	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/src/main.c	2008-08-23 01:37:51 UTC (rev 667)
@@ -132,9 +132,11 @@
 
   LibInit(lib_flags); /* calls SDL_Init(), TTF_Init(), some other settings */
   GraphicsInit(); /* calls SDL_SetVideoMode(), a few others     */
+
   #ifdef HAVE_LIBSDL_PANGO
   init_SDLPango_Context();
   #endif
+
   if (settings.sys_sound)
   {
     Mix_VolumeMusic(settings.mus_volume);

Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/src/playgame.c	2008-08-23 01:37:51 UTC (rev 667)
@@ -282,8 +282,10 @@
             if (event.key.keysym.sym == SDLK_F10)
               SwitchScreenMode();
 
-            if (event.key.keysym.sym == SDLK_F12) 
+            if (event.key.keysym.sym == SDLK_F12)
+            {
 //              SNOW_toggle();
+            }
 
             if (event.key.keysym.sym == SDLK_ESCAPE)
             {

Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c	2008-08-22 13:00:59 UTC (rev 666)
+++ tuxtype/trunk/src/practice.c	2008-08-23 01:37:51 UTC (rev 667)
@@ -33,6 +33,7 @@
 static SDL_Surface* hand[11] = {NULL};
 static SDL_Rect hand_loc, letter_loc,keyboard_loc;
 static TTF_Font* font = NULL;
+
 static wchar_t phrase[255][FNLEN];
 
 static Mix_Chunk* wrong = NULL;
@@ -632,6 +633,11 @@
   int wp = 0, i = 0, c = 0, z = 0;
   char fn[FNLEN];
 
+  int old_debug_on = settings.debug_on;
+  settings.debug_on = 1;
+
+  LOG("Entering get_phrase()\n");
+
   /* If we didn't receive a phrase get the first one from the file...*/
   if (wcsncmp((wchar_t*)"", phr, 40) == 0)
   {
@@ -711,6 +717,9 @@
       }
     }
   }
+
+  settings.debug_on = old_debug_on;
+
   LOG("Leaving get_phrase()\n");
   return(wp);
 }
@@ -722,14 +731,23 @@
 	letter_loc.x = x;
 	letter_loc.y = y;
 	//font = LoadFont(settings.theme_font_name, 30);
-	DEBUGCODE { printf("\n\n\nEntering print_at with : %S\n",pphrase); }
+	DEBUGCODE {
+                    printf("\n\n\nEntering print_at with : %S\n",pphrase);
+                    printf("wrap = %d\t wsclen() = %d\n", wrap, wcslen(pphrase));
+                  }
+
+
 	if ( wrap == wcslen(pphrase) ){
+                LOG("Wrap not needed\n");
+
 		tmp = BlackOutline_w(pphrase, font, &white, wrap);
 		letter_loc.w = tmp->w+5;
 		letter_loc.h = tmp->h+5;
 		SDL_BlitSurface(tmp, NULL, screen, &letter_loc);
 		SDL_FreeSurface(tmp);
 	}else{
+                LOG("Line length exceeded - wrap required\n");
+
 		tmp = BlackOutline_w(pphrase, font, &white, wrap+1);
 		letter_loc.w = tmp->w+5;
 		letter_loc.h = tmp->h+5;




More information about the Tux4kids-commits mailing list