Commit 33e777cc authored by David Bruce's avatar David Bruce

cleanup/fix of internal wchar_t <--> utf8 conversion wrapper functions, now...

cleanup/fix of internal wchar_t <--> utf8 conversion wrapper functions, now using GNU iconv, redundant code removed.



git-svn-id: svn://svn.debian.org/svn/tux4kids/tuxtype/trunk@875 47d30e19-490b-0410-9d18-e851f4e465b3
parent e3567f92
08 Feb 2009
[ David Bruce <davidstuartbruce@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@gmail.com> ]
......
./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
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@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@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,73 +16,20 @@ msgstr ""
"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 @@ msgstr "Edit Word Lists"
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 @@ msgstr ""
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,6 +114,40 @@ msgstr "this feature is not ready yet"
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"
......
......@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@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@redhat.com>\n"
"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
......@@ -15,70 +15,18 @@ msgstr ""
"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"
......@@ -91,6 +39,10 @@ msgstr "শব্দৰ তালিকা সম্পাদন কৰক"
msgid "Comet Zap"
msgstr "Comet Zap"
#: src/titlescreen.c:96
msgid "Medium"
msgstr "মাধ্যম"
#: src/titlescreen.c:96
msgid "Pilot"
msgstr "পাইলট"
......@@ -103,6 +55,10 @@ msgstr ""
msgid "Lessons"
msgstr "পাঠ"
#: src/titlescreen.c:97
msgid "Hard"
msgstr "কঠোৰ"
#: src/titlescreen.c:97
msgid "Ace"
msgstr "Ace"
......@@ -147,6 +103,39 @@ msgstr "এই গুণ এতিয়া প্ৰস্তুত নহয়"
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 "অভ্যাস"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@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@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,74 +16,19 @@ msgstr ""
"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/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"
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Caiguda de peixos"
# 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 @@ msgstr "Editar les llistes de paraules"
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 @@ msgstr ""
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,6 +112,42 @@ msgstr "Encara no implementat"
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"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@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@zstenis.com>\n"
"Language-Team: czech <cs@li.org>\n"
......@@ -19,85 +19,20 @@ msgstr ""
"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/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/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Vodopád ryb"
#
#: 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"
......@@ -113,6 +48,11 @@ msgstr "Uprav seznamy slov"
msgid "Comet Zap"
msgstr "Sestřelování komet"
#
#: src/titlescreen.c:96
msgid "Medium"
msgstr "Střední"
#
#: src/titlescreen.c:96
msgid "Pilot"
......@@ -127,6 +67,11 @@ msgstr ""
msgid "Lessons"
msgstr "Lekce"
#
#: src/titlescreen.c:97
msgid "Hard"
msgstr "Těžká"
#
#: src/titlescreen.c:97
msgid "Ace"
......@@ -182,6 +127,50 @@ msgstr "Tato vlastnost ještě nefunguje"
msgid "Discuss the future of TuxTyping at"
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"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@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@ofir.dk>\n"
"Language-Team: Danish\n"
......@@ -16,72 +16,19 @@ msgstr ""
"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/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"
#: src/titlescreen.c:95
msgid "Fish Cascade"
msgstr "Fiskeregn"
# 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 @@ msgstr "Redigér ordlister"
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 @@ msgstr ""
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,6 +111,40 @@ msgstr "Denne feature er ikke klar endnu"
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"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"</