[Tux4kids-commits] r875 - in tuxtype/trunk: doc po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Mon Feb 9 13:21:09 UTC 2009
Author: dbruce-guest
Date: 2009-02-09 13:21:08 +0000 (Mon, 09 Feb 2009)
New Revision: 875
Added:
tuxtype/trunk/src/convert_utf.c
tuxtype/trunk/src/convert_utf.h
Removed:
tuxtype/trunk/src/ConvertUTF.c
tuxtype/trunk/src/ConvertUTF.h
Modified:
tuxtype/trunk/doc/ChangeLog
tuxtype/trunk/po/POTFILES.in
tuxtype/trunk/po/ar.po
tuxtype/trunk/po/as.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/gu.po
tuxtype/trunk/po/hi.po
tuxtype/trunk/po/it.po
tuxtype/trunk/po/ja.po
tuxtype/trunk/po/kn.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/or.po
tuxtype/trunk/po/pt.po
tuxtype/trunk/po/ru.po
tuxtype/trunk/po/sv.po
tuxtype/trunk/po/sw.po
tuxtype/trunk/po/ta.po
tuxtype/trunk/po/te.po
tuxtype/trunk/po/tr.po
tuxtype/trunk/po/tuxtype.pot
tuxtype/trunk/po/wo.po
tuxtype/trunk/src/Makefile.am
tuxtype/trunk/src/SDL_extras.c
tuxtype/trunk/src/alphabet.c
tuxtype/trunk/src/funcs.h
tuxtype/trunk/src/globals.h
tuxtype/trunk/src/practice.c
tuxtype/trunk/src/titlescreen.c
Log:
cleanup/fix of internal wchar_t <--> utf8 conversion wrapper functions, now using GNU iconv, redundant code removed.
Modified: tuxtype/trunk/doc/ChangeLog
===================================================================
--- tuxtype/trunk/doc/ChangeLog 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/doc/ChangeLog 2009-02-09 13:21:08 UTC (rev 875)
@@ -1,3 +1,11 @@
+08 Feb 2009
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - cleanup of wchar_t <--> UTF-8 conversion wrapper functions. These are now
+ based on GNU iconv and are in their own file, convert_utf.h/c. They now
+ take a length parameter for safety against buffer overflows. The Unicode, Inc.
+ implementations in ConvertUTF.h/c have been removed.
+
+
03 Feb 2009 - svn revision 856
Version 1.7.3
[ David Bruce <davidstuartbruce at gmail.com> ]
Modified: tuxtype/trunk/po/POTFILES.in
===================================================================
--- tuxtype/trunk/po/POTFILES.in 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/POTFILES.in 2009-02-09 13:21:08 UTC (rev 875)
@@ -1,15 +1,4 @@
-./src/ConvertUTF.c
-./src/alphabet.c
-./src/audio.c
-./src/laser.c
./src/loaders.c
./src/main.c
-./src/options.c
-./src/pause.c
-./src/playgame.c
./src/practice.c
-./src/scripting.c
-./src/setup.c
-./src/snow.c
-./src/theme.c
./src/titlescreen.c
Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ar.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,73 +16,20 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "@ovg"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Sound Effects Volume"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Music Volume"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Sound & Music Disabled"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Paused!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Press escape again to return to menu"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Press space bar to return to game"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "A[qarh"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "G3ank"
-
-# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Tanta."
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Medium"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Hard"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Practice"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Congratulations"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh No!"
-
#: src/titlescreen.c:95
#, fuzzy
msgid "Fish Cascade"
msgstr "Da-Yri dara'"
+# levels for Cascade game:
+#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Tanta."
+
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -97,6 +44,10 @@
msgid "Comet Zap"
msgstr "Comet Zap"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Medium"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -110,6 +61,10 @@
msgid "Lessons"
msgstr ""
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Hard"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -159,7 +114,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Discuss the future of TuxTyping at"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Sound Effects Volume"
+
+#~ msgid "Music Volume"
+#~ msgstr "Music Volume"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Sound & Music Disabled"
+
+#~ msgid "Paused!"
+#~ msgstr "Paused!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Press escape again to return to menu"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Press space bar to return to game"
+
+#~ msgid "Level"
+#~ msgstr "A[qarh"
+
+#~ msgid "Lives"
+#~ msgstr "G3ank"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Practice"
+
+#~ msgid "Congratulations"
+#~ msgstr "Congratulations"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oh No!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Practice"
Modified: tuxtype/trunk/po/as.po
===================================================================
--- tuxtype/trunk/po/as.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/as.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -5,7 +5,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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-22 12:36+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
"Language-Team: American English <kde-i18n-doc at lists.kde.org>\n"
@@ -15,71 +15,19 @@
"X-Generator: KAider 0.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fish"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ধ্বনিৰ ফলাফল উচ্চতা"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "সঙ্গিতৰ ধ্বনিৰ উচ্চতা"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ধ্বনি & সঙ্গিত নিষ্ক্ৰীয়"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "ৰখোৱা হ'ল!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "তালিকালৈ ঘূৰি যাবলৈ পুনঃ escape টিপক"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "খেললৈ ঘূৰি যাবলৈ space bar টিপক"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "স্তৰ"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "জীৱন"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "সহজ"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "মাধ্যম"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "কঠোৰ"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "অভ্যাস"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "অভিনন্দন"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "অঃ নহয়!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Fish Cascade"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "সহজ"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Space Cadet"
@@ -92,6 +40,10 @@
msgstr "Comet Zap"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "মাধ্যম"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "পাইলট"
@@ -104,6 +56,10 @@
msgstr "পাঠ"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "কঠোৰ"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Ace"
@@ -147,6 +103,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping ৰ গুণৰ আলোচনা ইয়াত কৰক"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ধ্বনিৰ ফলাফল উচ্চতা"
+
+#~ msgid "Music Volume"
+#~ msgstr "সঙ্গিতৰ ধ্বনিৰ উচ্চতা"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ধ্বনি & সঙ্গিত নিষ্ক্ৰীয়"
+
+#~ msgid "Paused!"
+#~ msgstr "ৰখোৱা হ'ল!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "তালিকালৈ ঘূৰি যাবলৈ পুনঃ escape টিপক"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "খেললৈ ঘূৰি যাবলৈ space bar টিপক"
+
+#~ msgid "Level"
+#~ msgstr "স্তৰ"
+
+#~ msgid "Lives"
+#~ msgstr "জীৱন"
+
+#~ msgid "Practice"
+#~ msgstr "অভ্যাস"
+
+#~ msgid "Congratulations"
+#~ msgstr "অভিনন্দন"
+
+#~ msgid "Oh No!"
+#~ msgstr "অঃ নহয়!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "অভ্যাস"
Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ca.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,74 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Peix"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Volum dels efectes de só"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Caiguda de peixos"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Volum de la música"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "S'ha inhabilitat el só i la música"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "En pausa!"
-
-#: src/pause.c:318
-#, fuzzy
-msgid "Press escape again to return to menu"
-msgstr "Torneu a prèmer escape per tornar al menú"
-
-#: src/pause.c:327
-#, fuzzy
-msgid "Press space bar to return to game"
-msgstr "Premeu 'espai' per tornar al joc"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nivell"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Vides"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Fàcil"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Mitg"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Difícil"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Practicar"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "L'enhorabona!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh No!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Caiguda de peixos"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -98,6 +43,10 @@
msgid "Comet Zap"
msgstr "Caiguda de meteorits"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Mitg"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -111,6 +60,10 @@
msgid "Lessons"
msgstr "Llissons"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Difícil"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -159,7 +112,43 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Podeu parlar sobre el futur de TuxTyping a"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Volum dels efectes de só"
+
+#~ msgid "Music Volume"
+#~ msgstr "Volum de la música"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "S'ha inhabilitat el só i la música"
+
+#~ msgid "Paused!"
+#~ msgstr "En pausa!"
+
+#, fuzzy
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Torneu a prèmer escape per tornar al menú"
+
+#, fuzzy
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Premeu 'espai' per tornar al joc"
+
+#~ msgid "Level"
+#~ msgstr "Nivell"
+
+#~ msgid "Lives"
+#~ msgstr "Vides"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Practicar"
+
+#~ msgid "Congratulations"
+#~ msgstr "L'enhorabona!"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oh No!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Practicar"
Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/cs.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -19,87 +19,22 @@
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Ryba"
#
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Hlasitost zvuku "
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Vodopád ryb"
#
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Hlasitost hudby"
-
-#
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Vypnout hudbu a zvuk"
-
-#
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pauza!"
-
-#
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Stiskni klávesu Esc pro návrat do menu"
-
-#
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Stiskni mezerník pro návrat do hry"
-
-#
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Úroveň"
-
-#
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Životy"
-
-#
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Snadná"
#
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Střední"
-
-#
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Těžká"
-
-#
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Procvičování"
-
-#
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Gratuluji"
-
-#
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Ach jo!"
-
-#
#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Vodopád ryb"
-
-#
-#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Nováček"
@@ -115,6 +50,11 @@
#
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Střední"
+
+#
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Pilot"
@@ -129,6 +69,11 @@
#
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Těžká"
+
+#
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Eso"
@@ -183,6 +128,50 @@
msgstr "Diskutuj o budoucnosti TuxTyping na"
#
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Hlasitost zvuku "
+
+#
+#~ msgid "Music Volume"
+#~ msgstr "Hlasitost hudby"
+
+#
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Vypnout hudbu a zvuk"
+
+#
+#~ msgid "Paused!"
+#~ msgstr "Pauza!"
+
+#
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Stiskni klávesu Esc pro návrat do menu"
+
+#
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Stiskni mezerník pro návrat do hry"
+
+#
+#~ msgid "Level"
+#~ msgstr "Úroveň"
+
+#
+#~ msgid "Lives"
+#~ msgstr "Životy"
+
+#
+#~ msgid "Practice"
+#~ msgstr "Procvičování"
+
+#
+#~ msgid "Congratulations"
+#~ msgstr "Gratuluji"
+
+#
+#~ msgid "Oh No!"
+#~ msgstr "Ach jo!"
+
+#
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Procvičování"
Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/da.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2003-05-08 17:58+0200\n"
"Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
"Language-Team: Danish\n"
@@ -16,72 +16,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fisk"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Lydeffekternes styrke"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Fiskeregn"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Musikkens styrke"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Lyd og musik slået fra"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pause!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Tryk escape igen for at komme tilbage til menuen"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Tryk på mellemrumstasten for at spille videre"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Niveau"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Liv"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Let"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Mellem"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Hård"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Øv dig!"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Tillykke!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Åh nej!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Fiskeregn"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Plaf kometer"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Mellem"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Lektioner"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Hård"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutér TuxTypings fremtid på"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Lydeffekternes styrke"
+
+#~ msgid "Music Volume"
+#~ msgstr "Musikkens styrke"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Lyd og musik slået fra"
+
+#~ msgid "Paused!"
+#~ msgstr "Pause!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Tryk escape igen for at komme tilbage til menuen"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Tryk på mellemrumstasten for at spille videre"
+
+#~ msgid "Level"
+#~ msgstr "Niveau"
+
+#~ msgid "Lives"
+#~ msgstr "Liv"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Øv dig!"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tillykke!"
+
+#~ msgid "Oh No!"
+#~ msgstr "Åh nej!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Øv dig!"
Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/de.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2003-06-14 19:00+0000\n"
"Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
"Language-Team: German\n"
@@ -16,72 +16,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fisch"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Lautstärke Soundeffekte"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Fischregen"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Lautstärke Musik"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Musik & Klänge aus"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pause!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Drücke Escape um zum Menü zurückzukehren"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Drücke die Leertaste um weiterzuspielen"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Runde"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Leben"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Einfach"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Mittel"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Schwer"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Fingerübung"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Herzlichen Glückwunsch!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh Nein!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Fischregen"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Kometenabwehr"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Mittel"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Lektionen"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Schwer"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutiere die Zukunft von TuxTyping auf"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Lautstärke Soundeffekte"
+
+#~ msgid "Music Volume"
+#~ msgstr "Lautstärke Musik"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Musik & Klänge aus"
+
+#~ msgid "Paused!"
+#~ msgstr "Pause!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Drücke Escape um zum Menü zurückzukehren"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Drücke die Leertaste um weiterzuspielen"
+
+#~ msgid "Level"
+#~ msgstr "Runde"
+
+#~ msgid "Lives"
+#~ msgstr "Leben"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Fingerübung"
+
+#~ msgid "Congratulations"
+#~ msgstr "Herzlichen Glückwunsch!"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oh Nein!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Fingerübung"
Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/el.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,72 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Ψάρια"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Ένταση Ηχητικών Εφφέ"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Φάε τα Ψαράκια"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Ένταση Ήχου"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Χωρίς Ήχο και Μουσική"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Πάυση"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Πάτα ξανά το Esc για να γυρίσεις στις επιλογές"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Επίπεδο"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Ζωές"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "1. Εύκολο"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "2. Κανονικό"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "3. Δύσκολο"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Εξάσκηση"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Συγχαρητήρια"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Ωχ! Όχι"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Φάε τα Ψαράκια"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Κομήτες"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "2. Κανονικό"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Μαθήματα"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "3. Δύσκολο"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Σχόλια για το TuxTyping"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Ένταση Ηχητικών Εφφέ"
+
+#~ msgid "Music Volume"
+#~ msgstr "Ένταση Ήχου"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Χωρίς Ήχο και Μουσική"
+
+#~ msgid "Paused!"
+#~ msgstr "Πάυση"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Πάτα ξανά το Esc για να γυρίσεις στις επιλογές"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
+
+#~ msgid "Level"
+#~ msgstr "Επίπεδο"
+
+#~ msgid "Lives"
+#~ msgstr "Ζωές"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Εξάσκηση"
+
+#~ msgid "Congratulations"
+#~ msgstr "Συγχαρητήρια"
+
+#~ msgid "Oh No!"
+#~ msgstr "Ωχ! Όχι"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Εξάσκηση"
Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/en at boldquot.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxtype 1.7.3\n"
+"Project-Id-Version: tuxtype 1.7.4\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
-"PO-Revision-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
+"PO-Revision-Date: 2009-02-08 19:09-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -40,71 +40,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fish"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Sound Effects Volume"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Music Volume"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Sound & Music Disabled"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Paused!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Press escape again to return to menu"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Press space bar to return to game"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Level"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Lives"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Easy"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Medium"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Hard"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Practice"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Congratulations"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh No!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Fish Cascade"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Easy"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Space Cadet"
@@ -117,6 +65,10 @@
msgstr "Comet Zap"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Medium"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Pilot"
@@ -129,6 +81,10 @@
msgstr "Lessons"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Hard"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Ace"
Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/en at quot.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxtype 1.7.3\n"
+"Project-Id-Version: tuxtype 1.7.4\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
-"PO-Revision-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
+"PO-Revision-Date: 2009-02-08 19:09-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -37,71 +37,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fish"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Sound Effects Volume"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Music Volume"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Sound & Music Disabled"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Paused!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Press escape again to return to menu"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Press space bar to return to game"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Level"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Lives"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Easy"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Medium"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Hard"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Practice"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Congratulations"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh No!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Fish Cascade"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Easy"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Space Cadet"
@@ -114,6 +62,10 @@
msgstr "Comet Zap"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Medium"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Pilot"
@@ -126,6 +78,10 @@
msgstr "Lessons"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Hard"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Ace"
Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/en_GB.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,71 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr ""
-#: src/pause.c:279
-msgid "Sound Effects Volume"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
msgstr ""
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr ""
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr ""
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr ""
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr ""
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr ""
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr ""
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr ""
-
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr ""
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr ""
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr ""
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr ""
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr ""
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr ""
-
#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr ""
-
-#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr ""
@@ -93,6 +41,10 @@
msgstr ""
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr ""
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr ""
@@ -105,6 +57,10 @@
msgstr ""
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr ""
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr ""
Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/es.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -8,79 +8,26 @@
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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2007-09-16 19:00+0000\n"
"Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Pescado"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Volumen de los Efectos de Sonido"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Cascada de Pescado"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Volumen de la Música"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Deshabilitar Sonido y Música"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "¡Pausa!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Pulsa Esc para regresar al menú"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Pulsa la barra espaciadora para regresar al juego"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nivel"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Vidas"
-
# niveles para juego de cascada:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Medio"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Difícil"
-
-# Cosas generales
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Practicar"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "¡Felicidades!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "¡Oh, no!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Cascada de Pescado"
-
# "Cadete de espacio" es nivel 1 en zapea cometa
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -95,6 +42,10 @@
msgid "Comet Zap"
msgstr "Cometas"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Medio"
+
# "Piloto" es nivel 2 en zapea cometas
#: src/titlescreen.c:96
msgid "Pilot"
@@ -108,6 +59,10 @@
msgid "Lessons"
msgstr "Lecciones"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Difícil"
+
# "As" es nivel 3 en zapea cometas
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Charlar del futuro de TuxTyping en"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Volumen de los Efectos de Sonido"
+
+#~ msgid "Music Volume"
+#~ msgstr "Volumen de la Música"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Deshabilitar Sonido y Música"
+
+#~ msgid "Paused!"
+#~ msgstr "¡Pausa!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Pulsa Esc para regresar al menú"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Pulsa la barra espaciadora para regresar al juego"
+
+#~ msgid "Level"
+#~ msgstr "Nivel"
+
+#~ msgid "Lives"
+#~ msgstr "Vidas"
+
# Cosas generales
+#~ msgid "Practice"
+#~ msgstr "Practicar"
+
+#~ msgid "Congratulations"
+#~ msgstr "¡Felicidades!"
+
+#~ msgid "Oh No!"
+#~ msgstr "¡Oh, no!"
+
+# Cosas generales
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Practicar"
Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/eu.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,72 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Arraina"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Soinu efektuen bolumena"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Arrainak goitik-behera"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Musikaren bolumena"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Soinua eta musika ezgaiturik"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Geldirik!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Sakatu berriz eskape menura itzultzeko"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Maila"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Bizitzak"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Erreza"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Ertaina"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Gaitza"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Trebakuntza"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Zorionak"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oi ez!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Arrainak goitik-behera"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Kometen suntsipena"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Ertaina"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Ikasgaiak"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Gaitza"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping-en etorkizunaz aritu honekin:"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Soinu efektuen bolumena"
+
+#~ msgid "Music Volume"
+#~ msgstr "Musikaren bolumena"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Soinua eta musika ezgaiturik"
+
+#~ msgid "Paused!"
+#~ msgstr "Geldirik!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Sakatu berriz eskape menura itzultzeko"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
+
+#~ msgid "Level"
+#~ msgstr "Maila"
+
+#~ msgid "Lives"
+#~ msgstr "Bizitzak"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Trebakuntza"
+
+#~ msgid "Congratulations"
+#~ msgstr "Zorionak"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oi ez!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Trebakuntza"
Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/fr.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,74 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Poissons"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Volume des Effets de Son"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Cascade de Poissons"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Volume de la Musique"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Son & Musique teints"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pause!"
-
-#: src/pause.c:318
-#, fuzzy
-msgid "Press escape again to return to menu"
-msgstr "appuyez encore sur escape pour retourner au menu"
-
-#: src/pause.c:327
-#, fuzzy
-msgid "Press space bar to return to game"
-msgstr "taper la touche espace pour jouer"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Niveau"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Vies"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Moyen"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Fort"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Pratique"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Flicitations"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh Non!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Cascade de Poissons"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -98,6 +43,10 @@
msgid "Comet Zap"
msgstr "Destruction de Comtes"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Moyen"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -111,6 +60,10 @@
msgid "Lessons"
msgstr "Leons"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Fort"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -159,7 +112,43 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Parler du futur de TuxTyping a"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Volume des Effets de Son"
+
+#~ msgid "Music Volume"
+#~ msgstr "Volume de la Musique"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Son & Musique teints"
+
+#~ msgid "Paused!"
+#~ msgstr "Pause!"
+
+#, fuzzy
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "appuyez encore sur escape pour retourner au menu"
+
+#, fuzzy
+#~ msgid "Press space bar to return to game"
+#~ msgstr "taper la touche espace pour jouer"
+
+#~ msgid "Level"
+#~ msgstr "Niveau"
+
+#~ msgid "Lives"
+#~ msgstr "Vies"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Pratique"
+
+#~ msgid "Congratulations"
+#~ msgstr "Flicitations"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oh Non!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Pratique"
Modified: tuxtype/trunk/po/gu.po
===================================================================
--- tuxtype/trunk/po/gu.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/gu.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-28 16:17+0530\n"
"Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
"Language-Team: Gujarati\n"
@@ -16,71 +16,19 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "માછલી"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "સાઉન્ડને અસર કરતુ વોલ્યુમ"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "સંગીત વોલ્યુમ"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "સાઉન્ડ અને સંગીત નિષ્ક્રિય થયેલ છે"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "થોભેલ છે!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "મેનુ ને પાછુ લાવવા માટે ફરીથી escape ને દબાવો"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "રમતને પાછુ લાવવા માટે space પટ્ટીને દબાવો"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "સ્તર"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "જીવો"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "સરળ"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "માધ્યમ"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "સખત"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "પ્રયાસ"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "અભિનંદન"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "અરે નહિં!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "માછલી પાણીનાં ધોધમાં"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "સરળ"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "જગ્યા કેડેટ"
@@ -93,6 +41,10 @@
msgstr "ધૂમકેતુ ને મારવો"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "માધ્યમ"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "પાઇલોટ"
@@ -105,6 +57,10 @@
msgstr "પાઠો"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "સખત"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "એક્કો"
@@ -148,6 +104,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping ને ભવિષ્યમાં ચર્ચા કરો"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "સાઉન્ડને અસર કરતુ વોલ્યુમ"
+
+#~ msgid "Music Volume"
+#~ msgstr "સંગીત વોલ્યુમ"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "સાઉન્ડ અને સંગીત નિષ્ક્રિય થયેલ છે"
+
+#~ msgid "Paused!"
+#~ msgstr "થોભેલ છે!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "મેનુ ને પાછુ લાવવા માટે ફરીથી escape ને દબાવો"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "રમતને પાછુ લાવવા માટે space પટ્ટીને દબાવો"
+
+#~ msgid "Level"
+#~ msgstr "સ્તર"
+
+#~ msgid "Lives"
+#~ msgstr "જીવો"
+
+#~ msgid "Practice"
+#~ msgstr "પ્રયાસ"
+
+#~ msgid "Congratulations"
+#~ msgstr "અભિનંદન"
+
+#~ msgid "Oh No!"
+#~ msgstr "અરે નહિં!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "પ્રયાસ"
Modified: tuxtype/trunk/po/hi.po
===================================================================
--- tuxtype/trunk/po/hi.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/hi.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-28 16:08+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
"Language-Team: Hindi <hindi.sf.net>\n"
@@ -20,71 +20,19 @@
"\n"
"\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "मछली"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "आवाज प्रभाव "
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "संगीत आवाज"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "आवाज व संगीत निष्क्रियकृत"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "ठहरा हुआ!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "मेन्यू में वापस जाने के लिए escape फिर दबाएँ"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "खेल में वापस जाने के लिए स्थान पट्टी दबाएँ"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "स्तर"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "जीवनदान"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "आसान"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "थोड़ा कठिन"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "कठिन"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "अभ्यास"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "बधाई"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "अरे नहीं!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "प्रपाती मछली"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "आसान"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "स्पेस कैडेट"
@@ -97,6 +45,10 @@
msgstr "पुच्छल तारा पकड़ें"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "थोड़ा कठिन"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "पाइलट"
@@ -109,6 +61,10 @@
msgstr "पाठ"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "कठिन"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "एक्का"
@@ -152,6 +108,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "टक्स टाइपिंग के भविष्य के बारे में यहाँ चर्चा करें"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "आवाज प्रभाव "
+
+#~ msgid "Music Volume"
+#~ msgstr "संगीत आवाज"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "आवाज व संगीत निष्क्रियकृत"
+
+#~ msgid "Paused!"
+#~ msgstr "ठहरा हुआ!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "मेन्यू में वापस जाने के लिए escape फिर दबाएँ"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "खेल में वापस जाने के लिए स्थान पट्टी दबाएँ"
+
+#~ msgid "Level"
+#~ msgstr "स्तर"
+
+#~ msgid "Lives"
+#~ msgstr "जीवनदान"
+
+#~ msgid "Practice"
+#~ msgstr "अभ्यास"
+
+#~ msgid "Congratulations"
+#~ msgstr "बधाई"
+
+#~ msgid "Oh No!"
+#~ msgstr "अरे नहीं!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "अभ्यास"
Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/it.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,72 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Pesci"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Volume effetti sonori"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Pioggia di pesci"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Volume musica"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Effetti sonori e musica disabilitati"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "In pausa"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "premi di nuovo ESC per ritornare al menù"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "premi SPAZIO per ritornare al gioco"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Livello"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Vite"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Medio"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Difficile"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Pratica"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Congratulazioni"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh No! Prova di nuovo..."
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Pioggia di pesci"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Disintegratore di comete"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Medio"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Lezioni"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Difficile"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Discuti del futuro di TuxTyping su:"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Volume effetti sonori"
+
+#~ msgid "Music Volume"
+#~ msgstr "Volume musica"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Effetti sonori e musica disabilitati"
+
+#~ msgid "Paused!"
+#~ msgstr "In pausa"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "premi di nuovo ESC per ritornare al menù"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "premi SPAZIO per ritornare al gioco"
+
+#~ msgid "Level"
+#~ msgstr "Livello"
+
+#~ msgid "Lives"
+#~ msgstr "Vite"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Pratica"
+
+#~ msgid "Congratulations"
+#~ msgstr "Congratulazioni"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oh No! Prova di nuovo..."
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Pratica"
Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ja.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -15,71 +15,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr ""
-#: src/pause.c:279
-msgid "Sound Effects Volume"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
msgstr ""
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr ""
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr ""
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr ""
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr ""
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr ""
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr ""
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr ""
-
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr ""
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr ""
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr ""
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr ""
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr ""
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr ""
-
#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr ""
-
-#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr ""
@@ -92,6 +40,10 @@
msgstr ""
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr ""
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr ""
@@ -104,6 +56,10 @@
msgstr ""
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr ""
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr ""
Modified: tuxtype/trunk/po/kn.po
===================================================================
--- tuxtype/trunk/po/kn.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/kn.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-27 13:58+0530\n"
"Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
"Language-Team: Kannada <en at li.org>\n"
@@ -16,71 +16,19 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "ಮೀನು"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ಶಬ್ಧ ಪರಿಣಾಮಗಳ ವಾಲ್ಯೂಮ್"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "ಸಂಗೀತದ ವಾಲ್ಯೂಮ್"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ಶಬ್ಧ ಹಾಗು ಸಂಗೀತವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "ತಾತ್ಕಾಲಿಕ ಸ್ಥಗಿತ!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "ಮೆನುವಿಗೆ ಹಿಂತಿರುಗಲು ಎಸ್ಕೇಪನ್ನು ಒತ್ತಿ"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "ಆಟಕ್ಕೆ ಹಿಂತಿರುಗಲು ಸ್ಪೇಸ್ ಬಾರನ್ನು ಒತ್ತಿ"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "ಮಟ್ಟ"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "ಜೀವಗಳು"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "ಸುಲಭ"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "ಮಧ್ಯಮ"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "ಕಷ್ಟಕರ"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "ತರಬೇತಿ"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "ಶುಭಾಶಯಗಳು"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "ಒಹ್ ಇಲ್ಲ!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "ಮೀನಿನ ಕ್ಯಾಸ್ಕೇಡ್"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "ಸುಲಭ"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "ಸ್ಪೇಸ್ ಕ್ಯಾಡೆಟ್"
@@ -93,6 +41,10 @@
msgstr "ಧೂಮಕೇತು ಧಾಳಿ"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "ಮಧ್ಯಮ"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "ಪೈಲೆಟ್"
@@ -105,6 +57,10 @@
msgstr "ಪಾಠಗಳು"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "ಕಷ್ಟಕರ"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "ಏಸ್"
@@ -148,6 +104,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping ನ ಮುಂದಿನ ಭವಿಷ್ಯವನ್ನು ಇಲ್ಲಿ ಚರ್ಚಿಸಿ"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ಶಬ್ಧ ಪರಿಣಾಮಗಳ ವಾಲ್ಯೂಮ್"
+
+#~ msgid "Music Volume"
+#~ msgstr "ಸಂಗೀತದ ವಾಲ್ಯೂಮ್"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ಶಬ್ಧ ಹಾಗು ಸಂಗೀತವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
+
+#~ msgid "Paused!"
+#~ msgstr "ತಾತ್ಕಾಲಿಕ ಸ್ಥಗಿತ!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "ಮೆನುವಿಗೆ ಹಿಂತಿರುಗಲು ಎಸ್ಕೇಪನ್ನು ಒತ್ತಿ"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "ಆಟಕ್ಕೆ ಹಿಂತಿರುಗಲು ಸ್ಪೇಸ್ ಬಾರನ್ನು ಒತ್ತಿ"
+
+#~ msgid "Level"
+#~ msgstr "ಮಟ್ಟ"
+
+#~ msgid "Lives"
+#~ msgstr "ಜೀವಗಳು"
+
+#~ msgid "Practice"
+#~ msgstr "ತರಬೇತಿ"
+
+#~ msgid "Congratulations"
+#~ msgstr "ಶುಭಾಶಯಗಳು"
+
+#~ msgid "Oh No!"
+#~ msgstr "ಒಹ್ ಇಲ್ಲ!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "ತರಬೇತಿ"
Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/lt.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
@@ -16,72 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Žuvų:"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Signalų garsumas"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Žuvų lietus"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Muzikos garsumas"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Garsas išjungtas"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pertrauka!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Jei norite grįžti į meniu, paspauskite grįžimo klavišą"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "lygis"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Meškerių:"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Lengvas"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Vidutinis"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Sunkus"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Pirštų pratimai"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Sveikiname!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Deja..."
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Žuvų lietus"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Kometų lietus"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Vidutinis"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Pamokos (dar nėra)"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Sunkus"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskusijos apie \"Tux Typing\" vyksta adresu:"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Signalų garsumas"
+
+#~ msgid "Music Volume"
+#~ msgstr "Muzikos garsumas"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Garsas išjungtas"
+
+#~ msgid "Paused!"
+#~ msgstr "Pertrauka!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Jei norite grįžti į meniu, paspauskite grįžimo klavišą"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
+
+#~ msgid "Level"
+#~ msgstr "lygis"
+
+#~ msgid "Lives"
+#~ msgstr "Meškerių:"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Pirštų pratimai"
+
+#~ msgid "Congratulations"
+#~ msgstr "Sveikiname!"
+
+#~ msgid "Oh No!"
+#~ msgstr "Deja..."
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Pirštų pratimai"
Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ml.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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-"
@@ -17,71 +17,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "മത്സ്യം"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ശബ്ദം"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "പാട്ടിന്റെ ശബ്ദം"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ശബ്ദം പാട്ട് ഇല്ല"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "തടസ്സം"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "പുറത്തോട്ടുപോകാന് വീണ്ടും Esc കീ അമര്ത്തുക"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "കളിയില് തിരിച്ചെത്താന് സ്പെയ്സ് കീ അടിക്കുക"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "തട്ട്"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "ആയുസ്സ്"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "എളുപ്പം"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "ഇടത്തരം"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "ബുദ്ധിമുട്ടുള്ളത്"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "പരിശീലനം"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "കൊള്ളാലോ!!!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "അയ്യോ!.."
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "വീഴുന്ന മത്സ്യങ്ങള്"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "എളുപ്പം"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "ആകാശ പറവകള് "
@@ -94,6 +42,10 @@
msgstr "വാല് നക്ഷത്രത്തെ പിടിക്കുക"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "ഇടത്തരം"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "ആദ്യ പരിശീലനം"
@@ -106,6 +58,10 @@
msgstr "പാഠങ്ങള്"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "ബുദ്ധിമുട്ടുള്ളത്"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "എയ്സ്"
@@ -149,6 +105,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "ടക്സ് ടൈപ്പിന്റെ ഭാവി ചര്ച്ചചെയ്യാനായി ഇവിടെ പോകുക"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ശബ്ദം"
+
+#~ msgid "Music Volume"
+#~ msgstr "പാട്ടിന്റെ ശബ്ദം"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ശബ്ദം പാട്ട് ഇല്ല"
+
+#~ msgid "Paused!"
+#~ msgstr "തടസ്സം"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "പുറത്തോട്ടുപോകാന് വീണ്ടും Esc കീ അമര്ത്തുക"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "കളിയില് തിരിച്ചെത്താന് സ്പെയ്സ് കീ അടിക്കുക"
+
+#~ msgid "Level"
+#~ msgstr "തട്ട്"
+
+#~ msgid "Lives"
+#~ msgstr "ആയുസ്സ്"
+
+#~ msgid "Practice"
+#~ msgstr "പരിശീലനം"
+
+#~ msgid "Congratulations"
+#~ msgstr "കൊള്ളാലോ!!!"
+
+#~ msgid "Oh No!"
+#~ msgstr "അയ്യോ!.."
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "പരിശീലനം"
Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/nb.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -17,71 +17,19 @@
"X-Generator: KBabel 1.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fisk"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Lydeffekter"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Musikk"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Lyd og musikk avslått"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pause!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Trykk «Escape» for å gå tilbake til hovedmenyen."
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Trykk mellomrom for å gå tilbake til spillet."
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nivå"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Liv"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Lett"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Middels"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Vanskelig"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Øving"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Gratulerer!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Uff!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Fiskefall"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Lett"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Nybegynner"
@@ -94,6 +42,10 @@
msgstr "Kometknusing"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Middels"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Erfaren"
@@ -106,6 +58,10 @@
msgstr "Opplæring"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Vanskelig"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Profesjonell"
@@ -149,6 +105,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Lydeffekter"
+
+#~ msgid "Music Volume"
+#~ msgstr "Musikk"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Lyd og musikk avslått"
+
+#~ msgid "Paused!"
+#~ msgstr "Pause!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Trykk «Escape» for å gå tilbake til hovedmenyen."
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Trykk mellomrom for å gå tilbake til spillet."
+
+#~ msgid "Level"
+#~ msgstr "Nivå"
+
+#~ msgid "Lives"
+#~ msgstr "Liv"
+
+#~ msgid "Practice"
+#~ msgstr "Øving"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerer!"
+
+#~ msgid "Oh No!"
+#~ msgstr "Uff!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Øving"
Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ne.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -17,84 +17,22 @@
"Content-Transfer-Encoding: 8bit\n"
#
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "माछा"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ध्वनिको मात्राको असर"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "संगितको मात्रा"
-
#
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ध्वनि र संगित निष्क्रिय गर्नूहोस ।"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "माछा क्यास्केड "
#
-#: src/pause.c:309
-msgid "Paused!"
-msgstr " केहि बेर रोक्नुहोस ।"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "मेनुमा फर्कन इस्केप बटन थिच्नुहोस ।"
-
-#
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "खेलमा फर्कन स्पेस बार थिच्नुहोस । "
-
-#
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "श्रेणी"
-
-#
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "जिवनहरु"
-
-#
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "सजिलो"
#
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "मध्यम"
-
-#
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "कठिन"
-
-#
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "प्रशिक्षण"
-
-#
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "तपाइलाई बधाई छ!!!"
-
-#
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "हेत्तेरिका!.."
-
-#
#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "माछा क्यास्केड "
-
-#
-#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr " स्पेस क्याडेट"
@@ -110,6 +48,11 @@
#
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "मध्यम"
+
+#
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "पाइलट"
@@ -124,6 +67,11 @@
#
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "कठिन"
+
+#
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "एस"
@@ -177,7 +125,48 @@
msgid "Discuss the future of TuxTyping at"
msgstr " टक्शटाइप को भविष्य बारेमा छलफल गर्नुहोस ।"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ध्वनिको मात्राको असर"
+
+#~ msgid "Music Volume"
+#~ msgstr "संगितको मात्रा"
+
#
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ध्वनि र संगित निष्क्रिय गर्नूहोस ।"
+
+#
+#~ msgid "Paused!"
+#~ msgstr " केहि बेर रोक्नुहोस ।"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "मेनुमा फर्कन इस्केप बटन थिच्नुहोस ।"
+
+#
+#~ msgid "Press space bar to return to game"
+#~ msgstr "खेलमा फर्कन स्पेस बार थिच्नुहोस । "
+
+#
+#~ msgid "Level"
+#~ msgstr "श्रेणी"
+
+#
+#~ msgid "Lives"
+#~ msgstr "जिवनहरु"
+
+#
+#~ msgid "Practice"
+#~ msgstr "प्रशिक्षण"
+
+#
+#~ msgid "Congratulations"
+#~ msgstr "तपाइलाई बधाई छ!!!"
+
+#
+#~ msgid "Oh No!"
+#~ msgstr "हेत्तेरिका!.."
+
+#
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "प्रशिक्षण"
Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/nl.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,74 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Vissen"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Geluidseffect-volume"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Vallende Vissen"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Muziek-volume"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Geluid & Muziek Uitgeschakeld"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pauze!"
-
-#: src/pause.c:318
-#, fuzzy
-msgid "Press escape again to return to menu"
-msgstr "terug naar het menu? druk op escape"
-
-#: src/pause.c:327
-#, fuzzy
-msgid "Press space bar to return to game"
-msgstr "terug naar het spel? druk op spatiebalk"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Level"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Levens"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Gemakkelijk"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Moeilijker"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Echt Moeilijk"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Vingeroefeningen"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Gefeliciteerd !"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oh Nee!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Vallende Vissen"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -98,6 +43,10 @@
msgid "Comet Zap"
msgstr "Inslaande Kometen"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Moeilijker"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -111,6 +60,10 @@
msgid "Lessons"
msgstr "Lessen"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Echt Moeilijk"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -159,7 +112,43 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Bespreek de toekomst van TuxTyping op"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Geluidseffect-volume"
+
+#~ msgid "Music Volume"
+#~ msgstr "Muziek-volume"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Geluid & Muziek Uitgeschakeld"
+
+#~ msgid "Paused!"
+#~ msgstr "Pauze!"
+
+#, fuzzy
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "terug naar het menu? druk op escape"
+
+#, fuzzy
+#~ msgid "Press space bar to return to game"
+#~ msgstr "terug naar het spel? druk op spatiebalk"
+
+#~ msgid "Level"
+#~ msgstr "Level"
+
+#~ msgid "Lives"
+#~ msgstr "Levens"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Vingeroefeningen"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gefeliciteerd !"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oh Nee!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Vingeroefeningen"
Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/nn.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,71 +16,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.9.1\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fisk"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Lydeffektar"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Musikk"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Lyd og musikk avslått"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pause!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Trykk «Escape» for å gå tilbake til hovudmenyen."
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nivå"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Liv"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Lett"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Middels"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Vanskeleg"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Øving"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Gratulerer!"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Uff!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Fiskefall"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Lett"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Nybegynnar"
@@ -93,6 +41,10 @@
msgstr "Kometknusing"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Middels"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Erfaren"
@@ -105,6 +57,10 @@
msgstr "Opplæring"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Vanskeleg"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Profesjonell"
@@ -149,6 +105,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Lydeffektar"
+
+#~ msgid "Music Volume"
+#~ msgstr "Musikk"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Lyd og musikk avslått"
+
+#~ msgid "Paused!"
+#~ msgstr "Pause!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Trykk «Escape» for å gå tilbake til hovudmenyen."
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
+
+#~ msgid "Level"
+#~ msgstr "Nivå"
+
+#~ msgid "Lives"
+#~ msgstr "Liv"
+
+#~ msgid "Practice"
+#~ msgstr "Øving"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerer!"
+
+#~ msgid "Oh No!"
+#~ msgstr "Uff!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Øving"
Modified: tuxtype/trunk/po/or.po
===================================================================
--- tuxtype/trunk/po/or.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/or.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-27 17:56+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
"Language-Team: Oriya\n"
@@ -17,71 +17,19 @@
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "ମାଛ"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ଧ୍ୱନୀ ପ୍ରଭାବର ତିବ୍ରତା"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "ସଙ୍ଗୀତ ପ୍ରବଳତା"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ଧ୍ୱନୀ ଏବଂ ସଙ୍ଗୀତ ନିଷ୍କ୍ରିୟ ହୋଇଯାଇଛି"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "ବିରତି!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "ତାଲିକାକୁ ଫେରିବା ପାଇଁ escapeକୁ ପୁଣିଥରେ ଦବାନ୍ତୁ"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "ଖେଳକୁ ଫେରିବା ପାଇଁ space bar ଦବାନ୍ତୁ"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "ସ୍ତର"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "ଜୀବନଗୁଡ଼ିକ"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "ସହଜ"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "ମଧ୍ଯମ"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "କଠିନ"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "ଅଭ୍ୟାସ"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "ଅଭିନନ୍ଦନ"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "ହେ ଭଗବାନ!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "ମାଛ ସୋପାନୀ"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "ସହଜ"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "ମହାକାଶ ଛାତ୍ରସୈନିକ"
@@ -94,6 +42,10 @@
msgstr "Comet Zap"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "ମଧ୍ଯମ"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "ଚାଳକ"
@@ -106,6 +58,10 @@
msgstr "ଶିକ୍ଷା"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "କଠିନ"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "ଉତ୍କୃଷ୍ଟ"
@@ -149,6 +105,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "ରେ TuxTyping ର ଭବିଷ୍ୟତ ଆଲୋଚନା କରନ୍ତୁ"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ଧ୍ୱନୀ ପ୍ରଭାବର ତିବ୍ରତା"
+
+#~ msgid "Music Volume"
+#~ msgstr "ସଙ୍ଗୀତ ପ୍ରବଳତା"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ଧ୍ୱନୀ ଏବଂ ସଙ୍ଗୀତ ନିଷ୍କ୍ରିୟ ହୋଇଯାଇଛି"
+
+#~ msgid "Paused!"
+#~ msgstr "ବିରତି!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "ତାଲିକାକୁ ଫେରିବା ପାଇଁ escapeକୁ ପୁଣିଥରେ ଦବାନ୍ତୁ"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "ଖେଳକୁ ଫେରିବା ପାଇଁ space bar ଦବାନ୍ତୁ"
+
+#~ msgid "Level"
+#~ msgstr "ସ୍ତର"
+
+#~ msgid "Lives"
+#~ msgstr "ଜୀବନଗୁଡ଼ିକ"
+
+#~ msgid "Practice"
+#~ msgstr "ଅଭ୍ୟାସ"
+
+#~ msgid "Congratulations"
+#~ msgstr "ଅଭିନନ୍ଦନ"
+
+#~ msgid "Oh No!"
+#~ msgstr "ହେ ଭଗବାନ!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "ଅଭ୍ୟାସ"
Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/pt.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -15,72 +15,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Peixes"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Volume dos efeitos de som"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Cascata de peixes"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Volume da música"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "O som e a música foram desabilitados."
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Parado!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Tecle ESC novamente para voltar ao Menu"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Pressione a barra de espaço para voltar ao jogo"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nível"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Vidas"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Médio"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Difícil"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Praticar"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Parabéns"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Ah não!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Cascata de peixes"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -95,6 +42,10 @@
msgid "Comet Zap"
msgstr "Destruidor de cometas"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Médio"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -108,6 +59,10 @@
msgid "Lessons"
msgstr "Lições"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Difícil"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -156,7 +111,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Discuta o futuro do TuxType em"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Volume dos efeitos de som"
+
+#~ msgid "Music Volume"
+#~ msgstr "Volume da música"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "O som e a música foram desabilitados."
+
+#~ msgid "Paused!"
+#~ msgstr "Parado!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Tecle ESC novamente para voltar ao Menu"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Pressione a barra de espaço para voltar ao jogo"
+
+#~ msgid "Level"
+#~ msgstr "Nível"
+
+#~ msgid "Lives"
+#~ msgstr "Vidas"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Praticar"
+
+#~ msgid "Congratulations"
+#~ msgstr "Parabéns"
+
+#~ msgid "Oh No!"
+#~ msgstr "Ah não!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Praticar"
Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ru.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,71 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Рыб"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Громкость звуковых эффектов"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Громкость музыки"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Звуки & Музыка отключены"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Пауза!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Нажмите еще раз escape для возврата в меню"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Нажмите пробел для возврата к игре"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Уровень"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Жизней"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Легкий"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Средний"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Сложный"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Практика"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Поздравляем"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "О, нет!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Каскад рыб"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Легкий"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Космический кадет"
@@ -93,6 +41,10 @@
msgstr "Падение комет"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Средний"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Пилот"
@@ -105,6 +57,10 @@
msgstr "Уроки"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Сложный"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "Ас"
@@ -148,6 +104,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Обсудите будущее TuxTyping на"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Громкость звуковых эффектов"
+
+#~ msgid "Music Volume"
+#~ msgstr "Громкость музыки"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Звуки & Музыка отключены"
+
+#~ msgid "Paused!"
+#~ msgstr "Пауза!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Нажмите еще раз escape для возврата в меню"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Нажмите пробел для возврата к игре"
+
+#~ msgid "Level"
+#~ msgstr "Уровень"
+
+#~ msgid "Lives"
+#~ msgstr "Жизней"
+
+#~ msgid "Practice"
+#~ msgstr "Практика"
+
+#~ msgid "Congratulations"
+#~ msgstr "Поздравляем"
+
+#~ msgid "Oh No!"
+#~ msgstr "О, нет!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Практика"
Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/sv.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxtype2\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-12-02 19:51+0100\n"
"Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,72 +15,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Fisk"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Ljudeffektvolym"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Fiskregn"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Musikvolym"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Ljud och musik avaktiverade"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Pausat!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Tryck escape igen för att komma tillbaka till menyn"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Tryck mellanslag för att fortsätta spela"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nivå"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Liv"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Lätt"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Mellan"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Svårt"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Övning"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Gratulerar"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Åh nej!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Fiskregn"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -95,6 +42,10 @@
msgid "Comet Zap"
msgstr "Pricka kometer"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Mellan"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -108,6 +59,10 @@
msgid "Lessons"
msgstr "Lektioner"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Svårt"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -155,7 +110,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutera TyxeTypes framtid på"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Ljudeffektvolym"
+
+#~ msgid "Music Volume"
+#~ msgstr "Musikvolym"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Ljud och musik avaktiverade"
+
+#~ msgid "Paused!"
+#~ msgstr "Pausat!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Tryck escape igen för att komma tillbaka till menyn"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Tryck mellanslag för att fortsätta spela"
+
+#~ msgid "Level"
+#~ msgstr "Nivå"
+
+#~ msgid "Lives"
+#~ msgstr "Liv"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Övning"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerar"
+
+#~ msgid "Oh No!"
+#~ msgstr "Åh nej!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Övning"
Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/sw.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -16,72 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Peces"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Sound Effects Volume"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Samaki zinaanguka"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Music Volume"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Sauti na ngoma imekatwa"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Tuliza kwaq dakika moja"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Finya escape ndio uridi"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Press space bar to return to game"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Nivel"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Vidas"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Rahisi"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Ngumu"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Ngumu zaidi"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Jifunze"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Shukran"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Ahhhh"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Samaki zinaanguka"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -96,6 +43,10 @@
msgid "Comet Zap"
msgstr "Vita vya nyota"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Ngumu"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -109,6 +60,10 @@
msgid "Lessons"
msgstr "Madarasa"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Ngumu zaidi"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -157,7 +112,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Toa maoni yako kuhusu TuxTyping"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Sound Effects Volume"
+
+#~ msgid "Music Volume"
+#~ msgstr "Music Volume"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Sauti na ngoma imekatwa"
+
+#~ msgid "Paused!"
+#~ msgstr "Tuliza kwaq dakika moja"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Finya escape ndio uridi"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Press space bar to return to game"
+
+#~ msgid "Level"
+#~ msgstr "Nivel"
+
+#~ msgid "Lives"
+#~ msgstr "Vidas"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Jifunze"
+
+#~ msgid "Congratulations"
+#~ msgstr "Shukran"
+
+#~ msgid "Oh No!"
+#~ msgstr "Ahhhh"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Jifunze"
Modified: tuxtype/trunk/po/ta.po
===================================================================
--- tuxtype/trunk/po/ta.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/ta.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-22 12:41+0530\n"
"Last-Translator: Felix I <ifelix25 at gmail.com>, 2008\n"
"Language-Team: <en at li.org>\n"
@@ -15,71 +15,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "ஃபிஷ்"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ஒலி விளைவுகளின் ஒலிஅளவு"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "இசை ஒலிஅளவு"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ஒலி & இசை செயல்நீக்கப்பட்டது"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "இடைநிறுத்தப்பட்டது!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "மெனுவுக்கு செல்ல மீண்டும் escape ஐ அழுத்தவும்"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "விளையாட்டுக்கு செல்ல space barஐ அழுத்தவும்"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "நிலை"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "லைவ்ஸ்"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "எளியது"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "நடுத்தரம்"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "கடினம்"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "பயிற்சி"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "வாழ்த்துக்கள்"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "இல்லை!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "ஃபிஷ் கேஸ்கேட்"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "எளியது"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "ஸ்பேஸ் கேடெட்"
@@ -92,6 +40,10 @@
msgstr "கமெட் ஸெப்"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "நடுத்தரம்"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "பைலட்"
@@ -104,6 +56,10 @@
msgstr "பாடங்கள்"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "கடினம்"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "ஏஸ்"
@@ -147,6 +103,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping எதிர்கால திட்டத்தை இங்கு விவாதிக்கவும்"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ஒலி விளைவுகளின் ஒலிஅளவு"
+
+#~ msgid "Music Volume"
+#~ msgstr "இசை ஒலிஅளவு"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ஒலி & இசை செயல்நீக்கப்பட்டது"
+
+#~ msgid "Paused!"
+#~ msgstr "இடைநிறுத்தப்பட்டது!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "மெனுவுக்கு செல்ல மீண்டும் escape ஐ அழுத்தவும்"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "விளையாட்டுக்கு செல்ல space barஐ அழுத்தவும்"
+
+#~ msgid "Level"
+#~ msgstr "நிலை"
+
+#~ msgid "Lives"
+#~ msgstr "லைவ்ஸ்"
+
+#~ msgid "Practice"
+#~ msgstr "பயிற்சி"
+
+#~ msgid "Congratulations"
+#~ msgstr "வாழ்த்துக்கள்"
+
+#~ msgid "Oh No!"
+#~ msgstr "இல்லை!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "பயிற்சி"
Modified: tuxtype/trunk/po/te.po
===================================================================
--- tuxtype/trunk/po/te.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/te.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-08-28 17:58+0530\n"
"Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
"Language-Team: Telugu <en at li.org>\n"
@@ -17,71 +17,19 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "చాప"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "ధ్వని ప్రభావాల శబ్ధం"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "సంగీతపు శబ్ధం"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "ధ్వని & సంగీతం అచేతనంచేయబడింది"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "నిలువరించు!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "ప్రధాన మెనూకు తిరిగివ్రాయుటకు ఎస్కేప్ను వత్తండి"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "ఆటకు తిరిగివచ్చుటకు స్పేస్బార్ను వత్తండి"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "స్థాయి"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "అవకాశాలు"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "తేలికైన"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "మధ్యతరగతి"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "కష్టమైన"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "సాధన"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "అభినందనలు"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "ఒహ్ కాదు!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "చాప నీటిగుంట"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "తేలికైన"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "వింహగ పక్షులు"
@@ -94,6 +42,10 @@
msgstr "కామెట్ జాప్"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "మధ్యతరగతి"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "చోదకుడు(పైలెట్)"
@@ -106,6 +58,10 @@
msgstr "పాఠములు"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "కష్టమైన"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "ఏస్"
@@ -149,6 +105,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping యొక్క భవిష్యత్తు యిక్కడ చర్చించండి"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "ధ్వని ప్రభావాల శబ్ధం"
+
+#~ msgid "Music Volume"
+#~ msgstr "సంగీతపు శబ్ధం"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "ధ్వని & సంగీతం అచేతనంచేయబడింది"
+
+#~ msgid "Paused!"
+#~ msgstr "నిలువరించు!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "ప్రధాన మెనూకు తిరిగివ్రాయుటకు ఎస్కేప్ను వత్తండి"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "ఆటకు తిరిగివచ్చుటకు స్పేస్బార్ను వత్తండి"
+
+#~ msgid "Level"
+#~ msgstr "స్థాయి"
+
+#~ msgid "Lives"
+#~ msgstr "అవకాశాలు"
+
+#~ msgid "Practice"
+#~ msgstr "సాధన"
+
+#~ msgid "Congratulations"
+#~ msgstr "అభినందనలు"
+
+#~ msgid "Oh No!"
+#~ msgstr "ఒహ్ కాదు!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "సాధన"
Modified: tuxtype/trunk/po/tr.po
===================================================================
--- tuxtype/trunk/po/tr.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/tr.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2008-12-11 15:08+0200\n"
"Last-Translator: Doruk Fisek <dfisek at fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -15,71 +15,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Balık"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Ses Efektleri Ses Düzeyi"
-
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Müzik Ses Düzeyi"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Ses & Müzik Kapalı"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Duraklatıldı!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Menüye dönmek için tekrar esc'ye basın"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Oyuna dönmek için boşluk tuşuna basın"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Düzey"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Yaşamlar"
-
-#: src/playgame.c:1119 src/titlescreen.c:95
-msgid "Easy"
-msgstr "Kolay"
-
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Orta"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Zor"
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Alıştırma"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Tebrikler"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Oo Hayır!"
-
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Balık Çağlayanı"
#: src/titlescreen.c:95
+msgid "Easy"
+msgstr "Kolay"
+
+#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr "Uzay Tertibi"
@@ -92,6 +40,10 @@
msgstr "Kuyruklu Yıldız Vur"
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Orta"
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr "Pilot"
@@ -104,6 +56,10 @@
msgstr "Dersler"
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Zor"
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr "As"
@@ -147,6 +103,39 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Tuxtyping'in geleceğinin tartışıldığı liste :"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Ses Efektleri Ses Düzeyi"
+
+#~ msgid "Music Volume"
+#~ msgstr "Müzik Ses Düzeyi"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Ses & Müzik Kapalı"
+
+#~ msgid "Paused!"
+#~ msgstr "Duraklatıldı!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Menüye dönmek için tekrar esc'ye basın"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Oyuna dönmek için boşluk tuşuna basın"
+
+#~ msgid "Level"
+#~ msgstr "Düzey"
+
+#~ msgid "Lives"
+#~ msgstr "Yaşamlar"
+
+#~ msgid "Practice"
+#~ msgstr "Alıştırma"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tebrikler"
+
+#~ msgid "Oh No!"
+#~ msgstr "Oo Hayır!"
+
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Alıştırma"
Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/tuxtype.pot 2009-02-09 13:21:08 UTC (rev 875)
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: tuxtype 1.7.3\n"
+"Project-Id-Version: tuxtype 1.7.4\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\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"
@@ -15,71 +15,19 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr ""
-#: src/pause.c:279
-msgid "Sound Effects Volume"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
msgstr ""
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr ""
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr ""
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr ""
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr ""
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr ""
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr ""
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr ""
-
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr ""
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr ""
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr ""
-
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr ""
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr ""
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr ""
-
#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr ""
-
-#: src/titlescreen.c:95
msgid "Space Cadet"
msgstr ""
@@ -92,6 +40,10 @@
msgstr ""
#: src/titlescreen.c:96
+msgid "Medium"
+msgstr ""
+
+#: src/titlescreen.c:96
msgid "Pilot"
msgstr ""
@@ -104,6 +56,10 @@
msgstr ""
#: src/titlescreen.c:97
+msgid "Hard"
+msgstr ""
+
+#: src/titlescreen.c:97
msgid "Ace"
msgstr ""
Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/po/wo.po 2009-02-09 13:21:08 UTC (rev 875)
@@ -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: 2009-02-03 06:51-0600\n"
+"POT-Creation-Date: 2009-02-08 19:09-0600\n"
"PO-Revision-Date: 2007-09-25 09:50-0000\n"
"Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
"org>\n"
@@ -17,72 +17,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:88 src/main.c:150 src/playgame.c:1117
+#: src/loaders.c:88 src/main.c:150
msgid "Fish"
msgstr "Jën yi"
-#: src/pause.c:279
-msgid "Sound Effects Volume"
-msgstr "Dayo tooke riir gi"
+#: src/titlescreen.c:95
+msgid "Fish Cascade"
+msgstr "Jën yu tegloo"
-#: src/pause.c:288
-msgid "Music Volume"
-msgstr "Dayo Musik bi"
-
-#: src/pause.c:299
-msgid "Sound & Music Disabled"
-msgstr "Riir & Musik fey nañu"
-
-#: src/pause.c:309
-msgid "Paused!"
-msgstr "Tekkeeral!"
-
-#: src/pause.c:318
-msgid "Press escape again to return to menu"
-msgstr "Bësaatal ci skep ngir dellu ci njël li"
-
-#: src/pause.c:327
-msgid "Press space bar to return to game"
-msgstr "Bësal banqaasu teqale ngir fo"
-
-#: src/playgame.c:1115
-msgid "Level"
-msgstr "Tollu tollu"
-
-#: src/playgame.c:1116
-msgid "Lives"
-msgstr "Dund yi"
-
# levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:95
+#: src/titlescreen.c:95
msgid "Easy"
msgstr "Yomb"
-#: src/playgame.c:1120 src/titlescreen.c:96
-msgid "Medium"
-msgstr "Ci diggante bi"
-
-#: src/playgame.c:1121 src/titlescreen.c:97
-msgid "Hard"
-msgstr "Dëgër"
-
-# general stuff
-#: src/playgame.c:1122
-msgid "Practice"
-msgstr "Jëf ji"
-
-#: src/playgame.c:1133
-msgid "Congratulations"
-msgstr "Waaw góor"
-
-#: src/playgame.c:1137
-msgid "Oh No!"
-msgstr "Déedéet!"
-
-#: src/titlescreen.c:95
-msgid "Fish Cascade"
-msgstr "Jën yu tegloo"
-
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:95
msgid "Space Cadet"
@@ -97,6 +44,10 @@
msgid "Comet Zap"
msgstr "Neenal biddeew yi"
+#: src/titlescreen.c:96
+msgid "Medium"
+msgstr "Ci diggante bi"
+
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:96
msgid "Pilot"
@@ -110,6 +61,10 @@
msgid "Lessons"
msgstr "Njàng"
+#: src/titlescreen.c:97
+msgid "Hard"
+msgstr "Dëgër"
+
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:97
msgid "Ace"
@@ -158,7 +113,41 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Wax ci ëlëgu TuxTyping ak"
+#~ msgid "Sound Effects Volume"
+#~ msgstr "Dayo tooke riir gi"
+
+#~ msgid "Music Volume"
+#~ msgstr "Dayo Musik bi"
+
+#~ msgid "Sound & Music Disabled"
+#~ msgstr "Riir & Musik fey nañu"
+
+#~ msgid "Paused!"
+#~ msgstr "Tekkeeral!"
+
+#~ msgid "Press escape again to return to menu"
+#~ msgstr "Bësaatal ci skep ngir dellu ci njël li"
+
+#~ msgid "Press space bar to return to game"
+#~ msgstr "Bësal banqaasu teqale ngir fo"
+
+#~ msgid "Level"
+#~ msgstr "Tollu tollu"
+
+#~ msgid "Lives"
+#~ msgstr "Dund yi"
+
# general stuff
+#~ msgid "Practice"
+#~ msgstr "Jëf ji"
+
+#~ msgid "Congratulations"
+#~ msgstr "Waaw góor"
+
+#~ msgid "Oh No!"
+#~ msgstr "Déedéet!"
+
+# general stuff
#, fuzzy
#~ msgid "Phrase Practice"
#~ msgstr "Jëf ji"
Deleted: tuxtype/trunk/src/ConvertUTF.c
===================================================================
--- tuxtype/trunk/src/ConvertUTF.c 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/ConvertUTF.c 2009-02-09 13:21:08 UTC (rev 875)
@@ -1,539 +0,0 @@
-/*
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/* ---------------------------------------------------------------------
-
- Conversions between UTF32, UTF-16, and UTF-8. Source code file.
- Author: Mark E. Davis, 1994.
- Rev History: Rick McGowan, fixes & updates May 2001.
- Sept 2001: fixed const & error conditions per
- mods suggested by S. Parent & A. Lillich.
- June 2002: Tim Dodd added detection and handling of incomplete
- source sequences, enhanced error detection, added casts
- to eliminate compiler warnings.
- July 2003: slight mods to back out aggressive FFFE detection.
- Jan 2004: updated switches in from-UTF8 conversions.
- Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
-
- See the header file "ConvertUTF.h" for complete documentation.
-
------------------------------------------------------------------------- */
-
-
-#include "ConvertUTF.h"
-#ifdef CVTUTF_DEBUG
-#include <stdio.h>
-#endif
-
-static const int halfShift = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-#define UNI_SUR_HIGH_START (UTF32)0xD800
-#define UNI_SUR_HIGH_END (UTF32)0xDBFF
-#define UNI_SUR_LOW_START (UTF32)0xDC00
-#define UNI_SUR_LOW_END (UTF32)0xDFFF
-#define false 0
-#define true 1
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF32toUTF16 (
- const UTF32** sourceStart, const UTF32* sourceEnd,
- UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
- ConversionResult result = conversionOK;
- const UTF32* source = *sourceStart;
- UTF16* target = *targetStart;
- while (source < sourceEnd) {
- UTF32 ch;
- if (target >= targetEnd) {
- result = targetExhausted; break;
- }
- ch = *source++;
- if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
- /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
- if (flags == strictConversion) {
- --source; /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- } else {
- *target++ = UNI_REPLACEMENT_CHAR;
- }
- } else {
- *target++ = (UTF16)ch; /* normal case */
- }
- } else if (ch > UNI_MAX_LEGAL_UTF32) {
- if (flags == strictConversion) {
- result = sourceIllegal;
- } else {
- *target++ = UNI_REPLACEMENT_CHAR;
- }
- } else {
- /* target is a character in range 0xFFFF - 0x10FFFF. */
- if (target + 1 >= targetEnd) {
- --source; /* Back up source pointer! */
- result = targetExhausted; break;
- }
- ch -= halfBase;
- *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
- *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
- }
- }
- *sourceStart = source;
- *targetStart = target;
- return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF16toUTF32 (
- const UTF16** sourceStart, const UTF16* sourceEnd,
- UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
- ConversionResult result = conversionOK;
- const UTF16* source = *sourceStart;
- UTF32* target = *targetStart;
- UTF32 ch, ch2;
- while (source < sourceEnd) {
- const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
- ch = *source++;
- /* If we have a surrogate pair, convert to UTF32 first. */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
- /* If the 16 bits following the high surrogate are in the source buffer... */
- if (source < sourceEnd) {
- ch2 = *source;
- /* If it's a low surrogate, convert to UTF32. */
- if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
- ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
- + (ch2 - UNI_SUR_LOW_START) + halfBase;
- ++source;
- } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
- --source; /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- }
- } else { /* We don't have the 16 bits following the high surrogate. */
- --source; /* return to the high surrogate */
- result = sourceExhausted;
- break;
- }
- } else if (flags == strictConversion) {
- /* UTF-16 surrogate values are illegal in UTF-32 */
- if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
- --source; /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- }
- }
- if (target >= targetEnd) {
- source = oldSource; /* Back up source pointer! */
- result = targetExhausted; break;
- }
- *target++ = ch;
- }
- *sourceStart = source;
- *targetStart = target;
-#ifdef CVTUTF_DEBUG
-if (result == sourceIllegal) {
- fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
- fflush(stderr);
-}
-#endif
- return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow. There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/* --------------------------------------------------------------------- */
-
-/* The interface converts a whole buffer to avoid function-call overhead.
- * Constants have been gathered. Loops & conditionals have been removed as
- * much as possible for efficiency, in favor of drop-through switches.
- * (See "Note A" at the bottom of the file for equivalent code.)
- * If your compiler supports it, the "isLegalUTF8" call can be turned
- * into an inline function.
- */
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF16toUTF8 (
- const UTF16** sourceStart, const UTF16* sourceEnd,
- UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
- ConversionResult result = conversionOK;
- const UTF16* source = *sourceStart;
- UTF8* target = *targetStart;
- while (source < sourceEnd) {
- UTF32 ch;
- unsigned short bytesToWrite = 0;
- const UTF32 byteMask = 0xBF;
- const UTF32 byteMark = 0x80;
- const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
- ch = *source++;
- /* If we have a surrogate pair, convert to UTF32 first. */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
- /* If the 16 bits following the high surrogate are in the source buffer... */
- if (source < sourceEnd) {
- UTF32 ch2 = *source;
- /* If it's a low surrogate, convert to UTF32. */
- if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
- ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
- + (ch2 - UNI_SUR_LOW_START) + halfBase;
- ++source;
- } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
- --source; /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- }
- } else { /* We don't have the 16 bits following the high surrogate. */
- --source; /* return to the high surrogate */
- result = sourceExhausted;
- break;
- }
- } else if (flags == strictConversion) {
- /* UTF-16 surrogate values are illegal in UTF-32 */
- if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
- --source; /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- }
- }
- /* Figure out how many bytes the result will require */
- if (ch < (UTF32)0x80) { bytesToWrite = 1;
- } else if (ch < (UTF32)0x800) { bytesToWrite = 2;
- } else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
- } else if (ch < (UTF32)0x110000) { bytesToWrite = 4;
- } else { bytesToWrite = 3;
- ch = UNI_REPLACEMENT_CHAR;
- }
-
- target += bytesToWrite;
- if (target > targetEnd) {
- source = oldSource; /* Back up source pointer! */
- target -= bytesToWrite; result = targetExhausted; break;
- }
- switch (bytesToWrite) { /* note: everything falls through. */
- case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
- case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
- case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
- case 1: *--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
- }
- target += bytesToWrite;
- }
- *sourceStart = source;
- *targetStart = target;
- return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- * length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns false. The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-
-static Boolean isLegalUTF8(const UTF8 *source, int length) {
- UTF8 a;
- const UTF8 *srcptr = source+length;
- switch (length) {
- default: return false;
- /* Everything else falls through when "true"... */
- case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
- case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
- case 2: if ((a = (*--srcptr)) > 0xBF) return false;
-
- switch (*source) {
- /* no fall-through in this inner switch */
- case 0xE0: if (a < 0xA0) return false; break;
- case 0xED: if (a > 0x9F) return false; break;
- case 0xF0: if (a < 0x90) return false; break;
- case 0xF4: if (a > 0x8F) return false; break;
- default: if (a < 0x80) return false;
- }
-
- case 1: if (*source >= 0x80 && *source < 0xC2) return false;
- }
- if (*source > 0xF4) return false;
- return true;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Exported function to return whether a UTF-8 sequence is legal or not.
- * This is not used here; it's just exported.
- */
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
- int length = trailingBytesForUTF8[*source]+1;
- if (source+length > sourceEnd) {
- return false;
- }
- return isLegalUTF8(source, length);
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF8toUTF16 (
- const UTF8** sourceStart, const UTF8* sourceEnd,
- UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
- ConversionResult result = conversionOK;
- const UTF8* source = *sourceStart;
- UTF16* target = *targetStart;
- while (source < sourceEnd) {
- UTF32 ch = 0;
- unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
- if (source + extraBytesToRead >= sourceEnd) {
- result = sourceExhausted; break;
- }
- /* Do this check whether lenient or strict */
- if (! isLegalUTF8(source, extraBytesToRead+1)) {
- result = sourceIllegal;
- break;
- }
- /*
- * The cases all fall through. See "Note A" below.
- */
- switch (extraBytesToRead) {
- case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
- case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
- case 3: ch += *source++; ch <<= 6;
- case 2: ch += *source++; ch <<= 6;
- case 1: ch += *source++; ch <<= 6;
- case 0: ch += *source++;
- }
- ch -= offsetsFromUTF8[extraBytesToRead];
-
- if (target >= targetEnd) {
- source -= (extraBytesToRead+1); /* Back up source pointer! */
- result = targetExhausted; break;
- }
- if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
- /* UTF-16 surrogate values are illegal in UTF-32 */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
- if (flags == strictConversion) {
- source -= (extraBytesToRead+1); /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- } else {
- *target++ = UNI_REPLACEMENT_CHAR;
- }
- } else {
- *target++ = (UTF16)ch; /* normal case */
- }
- } else if (ch > UNI_MAX_UTF16) {
- if (flags == strictConversion) {
- result = sourceIllegal;
- source -= (extraBytesToRead+1); /* return to the start */
- break; /* Bail out; shouldn't continue */
- } else {
- *target++ = UNI_REPLACEMENT_CHAR;
- }
- } else {
- /* target is a character in range 0xFFFF - 0x10FFFF. */
- if (target + 1 >= targetEnd) {
- source -= (extraBytesToRead+1); /* Back up source pointer! */
- result = targetExhausted; break;
- }
- ch -= halfBase;
- *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
- *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
- }
- }
- *sourceStart = source;
- *targetStart = target;
- return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF32toUTF8 (
- const UTF32** sourceStart, const UTF32* sourceEnd,
- UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
- ConversionResult result = conversionOK;
- const UTF32* source = *sourceStart;
- UTF8* target = *targetStart;
- while (source < sourceEnd) {
- UTF32 ch;
- unsigned short bytesToWrite = 0;
- const UTF32 byteMask = 0xBF;
- const UTF32 byteMark = 0x80;
- ch = *source++;
- if (flags == strictConversion ) {
- /* UTF-16 surrogate values are illegal in UTF-32 */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
- --source; /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- }
- }
- /*
- * Figure out how many bytes the result will require. Turn any
- * illegally large UTF32 things (> Plane 17) into replacement chars.
- */
- if (ch < (UTF32)0x80) { bytesToWrite = 1;
- } else if (ch < (UTF32)0x800) { bytesToWrite = 2;
- } else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
- } else if (ch <= UNI_MAX_LEGAL_UTF32) { bytesToWrite = 4;
- } else { bytesToWrite = 3;
- ch = UNI_REPLACEMENT_CHAR;
- result = sourceIllegal;
- }
-
- target += bytesToWrite;
- if (target > targetEnd) {
- --source; /* Back up source pointer! */
- target -= bytesToWrite; result = targetExhausted; break;
- }
- switch (bytesToWrite) { /* note: everything falls through. */
- case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
- case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
- case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
- case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
- }
- target += bytesToWrite;
- }
- *sourceStart = source;
- *targetStart = target;
- return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF8toUTF32 (
- const UTF8** sourceStart, const UTF8* sourceEnd,
- UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
- ConversionResult result = conversionOK;
- const UTF8* source = *sourceStart;
- UTF32* target = *targetStart;
- while (source < sourceEnd) {
- UTF32 ch = 0;
- unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
- if (source + extraBytesToRead >= sourceEnd) {
- result = sourceExhausted; break;
- }
- /* Do this check whether lenient or strict */
- if (! isLegalUTF8(source, extraBytesToRead+1)) {
- result = sourceIllegal;
- break;
- }
- /*
- * The cases all fall through. See "Note A" below.
- */
- switch (extraBytesToRead) {
- case 5: ch += *source++; ch <<= 6;
- case 4: ch += *source++; ch <<= 6;
- case 3: ch += *source++; ch <<= 6;
- case 2: ch += *source++; ch <<= 6;
- case 1: ch += *source++; ch <<= 6;
- case 0: ch += *source++;
- }
- ch -= offsetsFromUTF8[extraBytesToRead];
-
- if (target >= targetEnd) {
- source -= (extraBytesToRead+1); /* Back up the source pointer! */
- result = targetExhausted; break;
- }
- if (ch <= UNI_MAX_LEGAL_UTF32) {
- /*
- * UTF-16 surrogate values are illegal in UTF-32, and anything
- * over Plane 17 (> 0x10FFFF) is illegal.
- */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
- if (flags == strictConversion) {
- source -= (extraBytesToRead+1); /* return to the illegal value itself */
- result = sourceIllegal;
- break;
- } else {
- *target++ = UNI_REPLACEMENT_CHAR;
- }
- } else {
- *target++ = ch;
- }
- } else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
- result = sourceIllegal;
- *target++ = UNI_REPLACEMENT_CHAR;
- }
- }
- *sourceStart = source;
- *targetStart = target;
- return result;
-}
-
-/* ---------------------------------------------------------------------
-
- Note A.
- The fall-through switches in UTF-8 reading code save a
- temp variable, some decrements & conditionals. The switches
- are equivalent to the following loop:
- {
- int tmpBytesToRead = extraBytesToRead+1;
- do {
- ch += *source++;
- --tmpBytesToRead;
- if (tmpBytesToRead) ch <<= 6;
- } while (tmpBytesToRead > 0);
- }
- In UTF-8 writing code, the switches on "bytesToWrite" are
- similarly unrolled loops.
-
- --------------------------------------------------------------------- */
Deleted: tuxtype/trunk/src/ConvertUTF.h
===================================================================
--- tuxtype/trunk/src/ConvertUTF.h 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/ConvertUTF.h 2009-02-09 13:21:08 UTC (rev 875)
@@ -1,149 +0,0 @@
-/*
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/* ---------------------------------------------------------------------
-
- Conversions between UTF32, UTF-16, and UTF-8. Header file.
-
- Several funtions are included here, forming a complete set of
- conversions between the three formats. UTF-7 is not included
- here, but is handled in a separate source file.
-
- Each of these routines takes pointers to input buffers and output
- buffers. The input buffers are const.
-
- Each routine converts the text between *sourceStart and sourceEnd,
- putting the result into the buffer between *targetStart and
- targetEnd. Note: the end pointers are *after* the last item: e.g.
- *(sourceEnd - 1) is the last item.
-
- The return result indicates whether the conversion was successful,
- and if not, whether the problem was in the source or target buffers.
- (Only the first encountered problem is indicated.)
-
- After the conversion, *sourceStart and *targetStart are both
- updated to point to the end of last text successfully converted in
- the respective buffers.
-
- Input parameters:
- sourceStart - pointer to a pointer to the source buffer.
- The contents of this are modified on return so that
- it points at the next thing to be converted.
- targetStart - similarly, pointer to pointer to the target buffer.
- sourceEnd, targetEnd - respectively pointers to the ends of the
- two buffers, for overflow checking only.
-
- These conversion functions take a ConversionFlags argument. When this
- flag is set to strict, both irregular sequences and isolated surrogates
- will cause an error. When the flag is set to lenient, both irregular
- sequences and isolated surrogates are converted.
-
- Whether the flag is strict or lenient, all illegal sequences will cause
- an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
- or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
- must check for illegal sequences.
-
- When the flag is set to lenient, characters over 0x10FFFF are converted
- to the replacement character; otherwise (when the flag is set to strict)
- they constitute an error.
-
- Output parameters:
- The value "sourceIllegal" is returned from some routines if the input
- sequence is malformed. When "sourceIllegal" is returned, the source
- value will point to the illegal value that caused the problem. E.g.,
- in UTF-8 when a sequence is malformed, it points to the start of the
- malformed sequence.
-
- Author: Mark E. Davis, 1994.
- Rev History: Rick McGowan, fixes & updates May 2001.
- Fixes & updates, Sept 2001.
-
------------------------------------------------------------------------- */
-
-/* ---------------------------------------------------------------------
- The following 4 definitions are compiler-specific.
- The C standard does not guarantee that wchar_t has at least
- 16 bits, so wchar_t is no less portable than unsigned short!
- All should be unsigned values to avoid sign extension during
- bit mask & shift operations.
------------------------------------------------------------------------- */
-
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
-typedef unsigned char Boolean; /* 0 or 1 */
-
-/* Some fundamental constants */
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-typedef enum {
- conversionOK, /* conversion successful */
- sourceExhausted, /* partial character in source, but hit end */
- targetExhausted, /* insuff. room in target for conversion */
- sourceIllegal /* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
- strictConversion = 0,
- lenientConversion
-} ConversionFlags;
-
-/* This is for C++ and does no harm in C */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ConversionResult ConvertUTF8toUTF16 (
- const UTF8** sourceStart, const UTF8* sourceEnd,
- UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF16toUTF8 (
- const UTF16** sourceStart, const UTF16* sourceEnd,
- UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF8toUTF32 (
- const UTF8** sourceStart, const UTF8* sourceEnd,
- UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF32toUTF8 (
- const UTF32** sourceStart, const UTF32* sourceEnd,
- UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF16toUTF32 (
- const UTF16** sourceStart, const UTF16* sourceEnd,
- UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF32toUTF16 (
- const UTF32** sourceStart, const UTF32* sourceEnd,
- UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
-
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* --------------------------------------------------------------------- */
Modified: tuxtype/trunk/src/Makefile.am
===================================================================
--- tuxtype/trunk/src/Makefile.am 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/Makefile.am 2009-02-09 13:21:08 UTC (rev 875)
@@ -43,7 +43,7 @@
SDL_extras.c \
pixels.c \
pause.c \
- ConvertUTF.c \
+ convert_utf.c \
options.c \
iconv_string.c \
mysetenv.c
@@ -61,7 +61,7 @@
scripting.h \
SDL_extras.h \
snow.h \
- ConvertUTF.h \
+ convert_utf.h \
iconv_string.h \
gettext.h \
compiler.h \
Modified: tuxtype/trunk/src/SDL_extras.c
===================================================================
--- tuxtype/trunk/src/SDL_extras.c 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/SDL_extras.c 2009-02-09 13:21:08 UTC (rev 875)
@@ -11,6 +11,7 @@
*/
#include <math.h>
+#include "convert_utf.h"
#include "SDL_extras.h"
#include "globals.h"
#include "pixels.h"
@@ -583,8 +584,8 @@
fprintf(stderr, "In BlackOutline_w() - input wchar_t string is: %S\n", wchar_tmp);
}
- i = ConvertToUTF8(wchar_tmp, tmp);
- tmp[i] = 0;
+ i = ConvertToUTF8(wchar_tmp, tmp, 1024);
+ //tmp[i] = 0;
DEBUGCODE
{
Modified: tuxtype/trunk/src/alphabet.c
===================================================================
--- tuxtype/trunk/src/alphabet.c 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/alphabet.c 2009-02-09 13:21:08 UTC (rev 875)
@@ -1,6 +1,6 @@
/***************************************************************************
alphabet.c
- - description: Init SDL
+
-------------------
begin : Jan 6 2003
copyright : (C) 2003 by Jesse Andrews
@@ -21,9 +21,7 @@
/* Needed to convert UTF-8 under Windows because we don't have glibc: */
-#include "ConvertUTF.h"
-#include "iconv_string.h"
-#include <iconv.h>
+#include "convert_utf.h"
#include "globals.h"
#include "funcs.h"
@@ -152,7 +150,7 @@
fscanf( f, "%[^\n]\n", str);
/* Convert to wcs from UTF-8, if needed; */
//mbstowcs(wide_str, str, strlen(str) + 1);
- ConvertFromUTF8(wide_str, str);
+ ConvertFromUTF8(wide_str, str, 255);
/* Line must have 3 chars (if more, rest are ignored) */
/* Format is: FINGER|Char e.g "3|d" */
@@ -531,7 +529,7 @@
/* NOTE need to add one to length arg so terminating '\0' gets added: */
//length = mbstowcs(temp_wide_word, temp_word, strlen(temp_word) + 1);
- length = ConvertFromUTF8(temp_wide_word, temp_word);
+ length = ConvertFromUTF8(temp_wide_word, temp_word, FNLEN);
DOUT(length);
if (length == -1) /* Means invalid UTF-8 sequence or conversion failed */
@@ -751,113 +749,11 @@
return 1;
}
-/* FIXME should be able to use iconv() for this one but have not */
-/* gotten it to work properly - staying with Unicode Inc. */
-/* implementation for now.
-/* FIXME this doesn't take into account the difference in wchar_t */
-/* between Windows (16 bits) and the rest of the world (32 bits) */
-/* This function just tidies up all the ptr args needed for */
-/* ConvertUTF8toUTF32() from Unicode, Inc. into a neat wrapper. */
-/* It returns -1 on error, otherwise returns the length of the */
-/* converted, null-terminated wchar_t* string now stored in the */
-/* location of the 'wide_word' pointer. */
-int ConvertFromUTF8(wchar_t* wide_word, const char* UTF8_word)
-{
- int i = 0;
- ConversionResult result;
- UTF8 temp_UTF8[FNLEN];
- UTF32 temp_UTF32[FNLEN];
- const UTF8* UTF8_Start = temp_UTF8;
- const UTF8* UTF8_End = &temp_UTF8[FNLEN-1];
- UTF32* UTF32_Start = temp_UTF32;
- UTF32* UTF32_End = &temp_UTF32[FNLEN-1];
- strncpy(temp_UTF8, UTF8_word, FNLEN);
-
- ConvertUTF8toUTF32(&UTF8_Start, UTF8_End,
- &UTF32_Start, UTF32_End, 0);
-
- wide_word[0] = '\0';
-
- while ((i < FNLEN) && (temp_UTF32[i] != '\0'))
- {
- wide_word[i] = temp_UTF32[i];
- i++;
- }
-
- if (i >= FNLEN)
- {
- fprintf(stderr, "convert_from_UTF8(): buffer overflow\n");
- return -1;
- }
- else //need terminating null:
- {
- wide_word[i] = '\0';
- }
-
- DEBUGCODE {fprintf(stderr, "wide_word = %ls\t", wide_word);}
- DEBUGCODE {fprintf(stderr, "wcslen(wide_word) = %d\n", wcslen(wide_word));}
-
- 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(const wchar_t* wide_word, char* UTF8_word)
-{
- int i = 0;
- char temp_UTF8[1024];
- /* NOTE we need this because iconv_open() needs a char**. We can't */
- /* just pass "&temp_UTF8" because "temp_UTF8" is really a shorthand */
- /* for "&temp_UTF8[0]", not its own memory location, so it doesn't */
- /* have its own address. We ought to be able to do this directly into */
- /* into the argument UTF8_word string, but so far have had errors. */
- char* UTF8_Start = temp_UTF8;
-
- iconv_t conv_descr;
- size_t bytes_converted;
- size_t in_length = (size_t)1024;
- size_t out_length = (size_t)1024;
-
- DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): wide_word = %S\n", wide_word);}
-
- /* NOTE although we *should* be just able to pass "wchar_t" as the in_type, */
- /* iconv_open() segfaults on Windows if this is done - grrr.... */
-#ifdef WIN32
- DEBUGCODE {fprintf(stderr, "WIN32, using UTF-16LE for wchar_t\n");}
- conv_descr = iconv_open("UTF-8", "UTF-16LE");
-#else
- DEBUGCODE {fprintf(stderr, "Using wchar_t for wchar_t\n");}
- conv_descr = iconv_open("UTF-8", "wchar_t");
-#endif
-
- bytes_converted = iconv(conv_descr,
- &wide_word, &in_length,
-// &UTF8_word, &out_length);
- &UTF8_Start, &out_length);
- LOG("completed iconv()\n");
-
- iconv_close(conv_descr);
-
- strncpy(UTF8_word, temp_UTF8, 256);
-
- 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)
+int map_keys(wchar_t wide_char, kbd_char* keyboard_entry)
{
switch(wide_char)
{
@@ -1343,7 +1239,7 @@
{
tmp[0]=keyboard_list[i].unicode_value;
/**********fprintf(fp,"%d|%C\n",keyboard_list[i].finger,keyboard_list[i].unicode_value); doesnt work, so the unicode value is converted into a char string*/
- ConvertToUTF8(tmp, buf);
+ ConvertToUTF8(tmp, buf, FNLEN);
if(keyboard_list[i].finger==-1)
{
fprintf(fp,"%s\n",buf);
@@ -1419,7 +1315,7 @@
int i = 0;
wchar_t wchar_buf[MAX_UNICODES];
- ConvertFromUTF8(wchar_buf, UTF8_str);
+ ConvertFromUTF8(wchar_buf, UTF8_str, MAX_UNICODES);
/* FNLEN is max length of phrase (I think) */
while (wchar_buf[i] != '\0' && i < FNLEN)
Added: tuxtype/trunk/src/convert_utf.c
===================================================================
--- tuxtype/trunk/src/convert_utf.c (rev 0)
+++ tuxtype/trunk/src/convert_utf.c 2009-02-09 13:21:08 UTC (rev 875)
@@ -0,0 +1,130 @@
+/***************************************************************************
+ convert_utf.c
+
+ -------------------
+ begin : Feb 08 2009
+ copyright : (C) 2009 by David Bruce
+ email : davidstuartbruce at gmail.com
+
+ This file contains simple wrapper functions for converting wchar_t and
+ UTF-8 strings using the GNU iconv library.
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "convert_utf.h"
+#include "globals.h"
+
+#include <iconv.h>
+
+#define UTF_BUF_LENGTH 1024
+
+/* GNU iconv()-based implementation: */
+
+int ConvertFromUTF8(wchar_t* wide_word, const char* UTF8_word, int max_length)
+{
+ wchar_t temp_wchar[UTF_BUF_LENGTH];
+ wchar_t* wchar_start = temp_wchar;
+
+ iconv_t conv_descr;
+ size_t bytes_converted;
+ size_t in_length = (size_t)UTF_BUF_LENGTH;
+ size_t out_length = (size_t)UTF_BUF_LENGTH;
+
+ if(max_length > UTF_BUF_LENGTH)
+ {
+ fprintf(stderr, "ConvertFromUTF8() - error - requested string length %d exceeds buffer length %d\n",
+ max_length, UTF_BUF_LENGTH);
+ return 0;
+ }
+
+ DEBUGCODE {fprintf(stderr, "ConvertFromUTF8(): UTF8_word = %s\n", UTF8_word);}
+
+ /* NOTE although we *should* be just able to pass "wchar_t" as the out_type, */
+ /* iconv_open() segfaults on Windows if this is done - grrr.... */
+#ifdef WIN32
+ DEBUGCODE {fprintf(stderr, "WIN32, using UTF-16LE for wchar_t\n");}
+ conv_descr = iconv_open("UTF-16LE", "UTF-8");
+#else
+ DEBUGCODE {fprintf(stderr, "Using wchar_t for wchar_t\n");}
+ conv_descr = iconv_open("wchar_t", "UTF-8");
+#endif
+
+ bytes_converted = iconv(conv_descr,
+ &UTF8_word, &in_length,
+ &wchar_start, &out_length);
+ LOG("completed iconv()\n");
+
+ iconv_close(conv_descr);
+
+ wcsncpy(wide_word, temp_wchar, max_length);
+
+ DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): wide_word = %S\n", wide_word);}
+ DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): temp_wchar = %S\n", temp_wchar);}
+
+ 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(const wchar_t* wide_word, char* UTF8_word, int max_length)
+{
+ char temp_UTF8[UTF_BUF_LENGTH];
+ /* NOTE we need this because iconv_open() needs a char**. We can't */
+ /* just pass "&temp_UTF8" because "temp_UTF8" is really a shorthand */
+ /* for "&temp_UTF8[0]", not its own memory location, so it doesn't */
+ /* have its own address. We ought to be able to do this directly into */
+ /* into the argument UTF8_word string, but so far have had errors. */
+ char* UTF8_Start = temp_UTF8;
+
+ iconv_t conv_descr;
+ size_t bytes_converted;
+ size_t in_length = (size_t)UTF_BUF_LENGTH;
+ size_t out_length = (size_t)UTF_BUF_LENGTH;
+
+ DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): wide_word = %S\n", wide_word);}
+
+ if(max_length > UTF_BUF_LENGTH)
+ {
+ fprintf(stderr, "ConvertToUTF8() - error - requested string length %d exceeds buffer length %d\n",
+ max_length, UTF_BUF_LENGTH);
+ return 0;
+ }
+
+ /* NOTE although we *should* be just able to pass "wchar_t" as the in_type, */
+ /* iconv_open() segfaults on Windows if this is done - grrr.... */
+#ifdef WIN32
+ DEBUGCODE {fprintf(stderr, "WIN32, using UTF-16LE for wchar_t\n");}
+ conv_descr = iconv_open("UTF-8", "UTF-16LE");
+#else
+ DEBUGCODE {fprintf(stderr, "Using wchar_t for wchar_t\n");}
+ conv_descr = iconv_open("UTF-8", "wchar_t");
+#endif
+
+ bytes_converted = iconv(conv_descr,
+ &wide_word, &in_length,
+// &UTF8_word, &out_length);
+ &UTF8_Start, &out_length);
+ LOG("completed iconv()\n");
+
+ iconv_close(conv_descr);
+
+ strncpy(UTF8_word, temp_UTF8, max_length);
+
+ DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): UTF8_word = %s\n", UTF8_word);}
+ DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): temp_UTF8 = %s\n", temp_UTF8);}
+
+ return strlen(UTF8_word);
+}
Added: tuxtype/trunk/src/convert_utf.h
===================================================================
--- tuxtype/trunk/src/convert_utf.h (rev 0)
+++ tuxtype/trunk/src/convert_utf.h 2009-02-09 13:21:08 UTC (rev 875)
@@ -0,0 +1,27 @@
+//
+// C Interface: convert_utf
+//
+// Description: header file for simple wrapper functions to convert
+// wchar_t and utf8 strings using GNU iconv().
+//
+//
+// Author: David Bruce <davidstuartbruce at gmail.com>, (C) 2009
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#ifndef CONVERT_UTF_H
+#define CONVERT_UTF_H
+
+#include <wchar.h>
+
+/* NOTE the "max_length" parameter should generally be the size of the output */
+/* buffer. It must be at least one greater than the length of the return string */
+/* so that the string can be null-terminated. */
+/* Also, "max_length" must be no greater than the buffer length used internally */
+/* in these functions (i.e. UTF_BUF_LENGTH, currently 1024) */
+
+int ConvertFromUTF8(wchar_t* wide_word, const char* UTF8_word, int max_length);
+int ConvertToUTF8(const wchar_t* wide_word, char* UTF8_word, int max_length);
+
+#endif
\ No newline at end of file
Modified: tuxtype/trunk/src/funcs.h
===================================================================
--- tuxtype/trunk/src/funcs.h 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/funcs.h 2009-02-09 13:21:08 UTC (rev 875)
@@ -29,8 +29,6 @@
/* (still in alphabet.c:) */
int CheckNeededGlyphs(void);
void ClearWordList(void);
-int ConvertFromUTF8(wchar_t* wide_word, const char* UTF8_word);
-int ConvertToUTF8(const wchar_t* wide_word, char* UTF8_word);
void FreeLetters(void);
int GenerateWordList(const char* wordFn);
void GenCharListFromString(const unsigned char* UTF8_str);
Modified: tuxtype/trunk/src/globals.h
===================================================================
--- tuxtype/trunk/src/globals.h 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/globals.h 2009-02-09 13:21:08 UTC (rev 875)
@@ -19,7 +19,7 @@
#define to_upper(c) (((c) >= 'a' && (c) <= 'z') ? (c) -32 : (c))
#define COL2RGB( col ) SDL_MapRGB( screen->format, col->r, col->g, col->b )
-#define FNLEN 200
+#define FNLEN 256
#define RES_X 640
#define RES_Y 480
Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/practice.c 2009-02-09 13:21:08 UTC (rev 875)
@@ -24,7 +24,7 @@
#include "globals.h"
#include "funcs.h"
#include "SDL_extras.h"
-#include "ConvertUTF.h"
+#include "convert_utf.h"
#define MAX_PHRASES 256
#define MAX_PHRASE_LENGTH 256
@@ -1281,7 +1281,7 @@
while (!feof(fp) && num_phrases <= MAX_PHRASES)
{
fscanf(fp, "%[^\n]\n", buf);
- ConvertFromUTF8(phrases[num_phrases], buf);
+ ConvertFromUTF8(phrases[num_phrases], buf, MAX_PHRASE_LENGTH);
DEBUGCODE {printf("phrase %d:\t%S\n", num_phrases, phrases[num_phrases]);}
num_phrases++;
}
@@ -1368,7 +1368,7 @@
DEBUGCODE{ fprintf(stderr, "buf = %S\n", buf);}
/* Need to convert to UTF8 because couldn't get UNICODE version to work: */
- ConvertToUTF8(buf, UTF8buf);
+ ConvertToUTF8(buf, UTF8buf, MAX_PHRASE_LENGTH);
/* Now check width of string: */
if (-1 == TTF_SizeUTF8(font, UTF8buf, &test_w, NULL))
{
Modified: tuxtype/trunk/src/titlescreen.c
===================================================================
--- tuxtype/trunk/src/titlescreen.c 2009-02-07 06:33:29 UTC (rev 874)
+++ tuxtype/trunk/src/titlescreen.c 2009-02-09 13:21:08 UTC (rev 875)
@@ -21,7 +21,7 @@
#include "funcs.h"
#include "titlescreen.h"
#include "SDL_extras.h"
-#include "ConvertUTF.h"
+#include "convert_utf.h"
/* --- media for menus --- */
@@ -1898,14 +1898,14 @@
if (event.key.keysym.sym == SDLK_BACKSPACE)
{
font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
- len = ConvertFromUTF8(temp, editWordW[loc]);
+ len = ConvertFromUTF8(temp, editWordW[loc], FNLEN);
temp[len - 1] = temp[len];
- len = ConvertToUTF8(temp, editWordW[loc]);
+ len = ConvertToUTF8(temp, editWordW[loc], FNLEN);
titles[loc] = BlackOutline(editWordW[loc], font, &white );
- len = ConvertFromUTF8(temp, editWordY[loc]);
+ len = ConvertFromUTF8(temp, editWordY[loc], FNLEN);
temp[len - 2] = temp[len - 1];
temp[len - 1] = temp[len];
- len = ConvertToUTF8(temp, editWordY[loc]);
+ len = ConvertToUTF8(temp, editWordY[loc], FNLEN);
select[loc] = BlackOutline(editWordY[loc], font, &yellow);
TTF_CloseFont(font);
font = NULL;
@@ -1961,21 +1961,23 @@
case SDLK_LCTRL:
i=0;
break;
+ default: // ignore any other keys
+ {}
}
if(i)
{
font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
- len = ConvertFromUTF8(temp, editWordW[loc]);
+ len = ConvertFromUTF8(temp, editWordW[loc], FNLEN);
temp[len] = event.key.keysym.unicode;
temp[len + 1] = 0;
- ConvertToUTF8(temp,editWordW[loc]);
+ ConvertToUTF8(temp,editWordW[loc], FNLEN);
titles[loc] = BlackOutline(editWordW[loc], font, &white );
- len = ConvertFromUTF8(temp,editWordY[loc]);
+ len = ConvertFromUTF8(temp,editWordY[loc], FNLEN);
temp[len + 1]=0;
temp[len] = temp[len-1];
temp[len - 1] = event.key.keysym.unicode;
- ConvertToUTF8(temp,editWordY[loc]);
+ ConvertToUTF8(temp,editWordY[loc], FNLEN);
select[loc] = BlackOutline(editWordY[loc], font, &yellow);
TTF_CloseFont(font);
font = NULL;
More information about the Tux4kids-commits
mailing list