[Tux4kids-commits] r758 - in tuxtype/trunk: data po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Tue Sep 23 12:16:44 UTC 2008
Author: dbruce-guest
Date: 2008-09-23 12:16:42 +0000 (Tue, 23 Sep 2008)
New Revision: 758
Modified:
tuxtype/trunk/data/keyboard.lst
tuxtype/trunk/data/phrases.txt
tuxtype/trunk/po/POTFILES.in
tuxtype/trunk/po/ar.po
tuxtype/trunk/po/ca.po
tuxtype/trunk/po/cs.po
tuxtype/trunk/po/da.po
tuxtype/trunk/po/de.po
tuxtype/trunk/po/el.po
tuxtype/trunk/po/en at boldquot.po
tuxtype/trunk/po/en at quot.po
tuxtype/trunk/po/en_GB.po
tuxtype/trunk/po/es.po
tuxtype/trunk/po/eu.po
tuxtype/trunk/po/fr.po
tuxtype/trunk/po/it.po
tuxtype/trunk/po/ja.po
tuxtype/trunk/po/lt.po
tuxtype/trunk/po/ml.gmo
tuxtype/trunk/po/ml.po
tuxtype/trunk/po/nb.po
tuxtype/trunk/po/ne.po
tuxtype/trunk/po/nl.po
tuxtype/trunk/po/nn.po
tuxtype/trunk/po/pt.po
tuxtype/trunk/po/ru.po
tuxtype/trunk/po/sv.po
tuxtype/trunk/po/sw.po
tuxtype/trunk/po/tuxtype.pot
tuxtype/trunk/po/wo.po
tuxtype/trunk/src/SDL_extras.c
tuxtype/trunk/src/alphabet.c
tuxtype/trunk/src/playgame.c
tuxtype/trunk/src/practice.c
Log:
continued overhaul of practice.c - better fullscreen, line wraps, support for multiple phrases
Modified: tuxtype/trunk/data/keyboard.lst
===================================================================
--- tuxtype/trunk/data/keyboard.lst 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/data/keyboard.lst 2008-09-23 12:16:42 UTC (rev 758)
@@ -67,4 +67,19 @@
0|0
7|,
8|.
+9|-
+9|_
+9|=
+9|+
+9|\
+9||
+9|[
+9|{
+9|]
+9|}
9|;
+9|:
+9|'
+9|"
+9|/
+9|?
Modified: tuxtype/trunk/data/phrases.txt
===================================================================
--- tuxtype/trunk/data/phrases.txt 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/data/phrases.txt 2008-09-23 12:16:42 UTC (rev 758)
@@ -1 +1,15 @@
-The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog
+Jackdaws love my big sphinx of quartz
+Once upon a midnight dreary,
+While I pondered, weak and weary,
+O'er many a quaint and curious volume
+Of forgotten lore.
+As I nodded, nearly napping,
+Suddenly there came a rapping,
+As of someone gently tapping,
+Tapping at my chamber door.
+'Tis a visitor, I muttered.
+Only this, and nothing more.
+This above all, to thine own self be true.
+And it will follow, as the night the day,
+Thou canst not then be false to any man.
\ No newline at end of file
Modified: tuxtype/trunk/po/POTFILES.in
===================================================================
--- tuxtype/trunk/po/POTFILES.in 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/POTFILES.in 2008-09-23 12:16:42 UTC (rev 758)
@@ -1,7 +1,6 @@
./src/ConvertUTF.c
./src/alphabet.c
./src/audio.c
-./src/gettext.c
./src/laser.c
./src/loaders.c
./src/main.c
Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/ar.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,126 +40,126 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "A[qarh"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "G3ank"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "@ovg"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Tanta."
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Hard"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
#, fuzzy
msgid "Fish Cascade"
msgstr "Da-Yri dara'"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Edit Word Lists"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Comet Zap"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr ""
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Ace"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Options"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instructions"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Commander"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Setup Language"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "qa.ix tovrs cal"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Main Menu"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
#, fuzzy
msgid "Work In Progress!"
msgstr "Work in Progress!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "this feature is not ready yet"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Discuss the future of TuxTyping at"
Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/ca.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,124 +42,124 @@
msgid "Press space bar to return to game"
msgstr "Premeu 'espai' per tornar al joc"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nivell"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Vides"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Peix"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Fàcil"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Mitg"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "L'enhorabona!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Caiguda de peixos"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Cadet"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Editar les llistes de paraules"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Caiguda de meteorits"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Llissons"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "As"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Opcions"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instruccions"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Comandant"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Configuració de l'idioma"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Sortir"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Menu principal"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Encara en progres!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "Encara no implementat"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Podeu parlar sobre el futur de TuxTyping a"
Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/cs.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2007-11-10 16:36+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -49,141 +49,141 @@
msgstr "Stiskni mezerník pro návrat do hry"
#
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Úroveň"
#
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Životy"
#
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Ryba"
#
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Snadná"
#
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Střední"
#
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Těžká"
#
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Procvičování"
#
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Gratuluji"
#
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Ach jo!"
#
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "Skvělé!"
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
#
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Vodopád ryb"
#
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Nováček"
#
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Uprav seznamy slov"
#
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Sestřelování komet"
#
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lekce"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Eso"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Info o projektu"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Možnosti"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instrukce"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Kapitán"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Vyber jazyk"
#
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Ukončit"
#
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Hlavní menu"
#
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Ve výstavbě!"
#
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Tato vlastnost ještě nefunguje"
#
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutuj o budoucnosti TuxTyping na"
Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/da.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2003-05-08 17:58+0200\n"
"Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
"Language-Team: Danish\n"
@@ -40,123 +40,123 @@
msgid "Press space bar to return to game"
msgstr "Tryk på mellemrumstasten for at spille videre"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Let"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Mellem"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Hård"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Øv dig!"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Tillykke!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Åh nej!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskeregn"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Begynder"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Redigér ordlister"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Plaf kometer"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Trænet"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lektioner"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Meget erfaren"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Indstilling"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instruktioner"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Uovertruffen"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Vælg sprog"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Afslut"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Hovedmenu"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Der arbejdes på sagen!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Denne feature er ikke klar endnu"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutér TuxTypings fremtid på"
Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/de.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2003-06-14 19:00+0000\n"
"Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
"Language-Team: German\n"
@@ -40,123 +40,123 @@
msgid "Press space bar to return to game"
msgstr "Drücke die Leertaste um weiterzuspielen"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Runde"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Leben"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fisch"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Einfach"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Mittel"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Schwer"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Fingerübung"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Herzlichen Glückwunsch!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh Nein!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fischregen"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Anfänger"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Wortlisten bearbeiten"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Kometenabwehr"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lektionen"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "As"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Optionen"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Anleitung"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Unbesiegbar"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Sprache einstellen"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Ende"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Hauptmenü"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "In Arbeit!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Diese Option ist noch nicht fertig"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutiere die Zukunft von TuxTyping auf"
Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/el.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,123 +40,123 @@
msgid "Press space bar to return to game"
msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Επίπεδο"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Ζωές"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Ψάρια"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "1. Εύκολο"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "2. Κανονικό"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "3. Δύσκολο"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Εξάσκηση"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Συγχαρητήρια"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Ωχ! Όχι"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "Μπράβο!"
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Φάε τα Ψαράκια"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "1. Μαθητευόμενος"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Διόρθωσε τις Λίστες Λέξεων"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Κομήτες"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "2. Πιλότος"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Μαθήματα"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "3. Άσσος"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Πληροφορίες προγράμματος"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Επιλογές"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Οδηγίες"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "4. Βετεράνος"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Ρύθμιση Γλώσσας"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Τέλος"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Βασικό Μενού"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Εργασία σε εξέλιξη"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Αυτό το κομμάτι δεν είναι ακόμη έτοιμο"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Σχόλια για το TuxTyping"
Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/en at boldquot.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -31,8 +31,8 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.6.0\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
-"PO-Revision-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
+"PO-Revision-Date: 2008-09-22 21:17-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -64,114 +64,114 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "Great!"
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr "Next letter "
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fish Cascade"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Edit Word Lists"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Comet Zap"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lessons"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Ace"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Project Info"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Options"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instructions"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Commander"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Setup Language"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Quit"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Main Menu"
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Discuss the future of TuxTyping at"
Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/en at quot.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -28,8 +28,8 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.6.0\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
-"PO-Revision-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
+"PO-Revision-Date: 2008-09-22 21:17-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -61,114 +61,114 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "Great!"
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr "Next letter "
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fish Cascade"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Edit Word Lists"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Comet Zap"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lessons"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Ace"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Project Info"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Options"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instructions"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Commander"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Setup Language"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Quit"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Main Menu"
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Work In Progress!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "This feature is not ready yet"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Discuss the future of TuxTyping at"
Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/en_GB.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,114 +40,114 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr ""
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr ""
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr ""
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr ""
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr ""
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr ""
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr ""
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr ""
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr ""
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr ""
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr ""
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr ""
Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/es.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2007-09-16 19:00+0000\n"
"Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
"Language-Team: Spanish\n"
@@ -39,124 +39,124 @@
msgid "Press space bar to return to game"
msgstr "Pulsa la barra espaciadora para regresar al juego"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Pescado"
# niveles para juego de cascada:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Difícil"
# Cosas generales
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "¡Felicidades!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "¡Oh, no!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Cascada de Pescado"
# "Cadete de espacio" es nivel 1 en zapea cometa
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Cadete Espacial"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Revisar las listas de palabras"
# Tipos de juegos
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Cometas"
# "Piloto" es nivel 2 en zapea cometas
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Piloto"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lecciones"
# "As" es nivel 3 en zapea cometas
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "As"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Opciones"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instrucciones"
# "Commandante" es nivel 4 en zapea cometas
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Comandante"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Idioma"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Salir"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Menú Principal"
# work Cosas que estan abajo de construccion.
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "¡Trabajo en Curso!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "Esta función no esta lista todavía"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Charlar del futuro de TuxTyping en"
Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/eu.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,123 +40,123 @@
msgid "Press space bar to return to game"
msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Maila"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Bizitzak"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Arraina"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Erreza"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Ertaina"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Gaitza"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Trebakuntza"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Zorionak"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oi ez!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Arrainak goitik-behera"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Espazioko mutil-txikia"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Editatu hitz zerrendak"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Kometen suntsipena"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilotua"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Ikasgaiak"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Puntarengoa"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Aukerak"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instrukzioak"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Komandantea"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Konfiguratu hizkuntza"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Itxi"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Menu nagusia"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Lanean dihardugu!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Ezaugarri hau ez dago prest oraindik"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping-en etorkizunaz aritu honekin:"
Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/fr.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,124 +42,124 @@
msgid "Press space bar to return to game"
msgstr "taper la touche espace pour jouer"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Vies"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Poissons"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Moyen"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Fort"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Pratique"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Flicitations"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh Non!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Cascade de Poissons"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Cadet de l'espace"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Editer la Liste de Mots"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Destruction de Comtes"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilote"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Leons"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "As de l'espace"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Options"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instructions"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Commandant"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Rgler la langue"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Quitter"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Menu Principal"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "En cours de construction!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "Cette fonctionnalit n'est pas termine"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Parler du futur de TuxTyping a"
Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/it.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,123 +40,123 @@
msgid "Press space bar to return to game"
msgstr "premi SPAZIO per ritornare al gioco"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Livello"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Vite"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Pesci"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Difficile"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Pratica"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Congratulazioni"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh No! Prova di nuovo..."
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Pioggia di pesci"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Principiante"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Modifica la lista delle parole"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Disintegratore di comete"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilota"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lezioni"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Pilota provetto"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Opzioni"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Istruzioni"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Comandante"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Modifica lingua"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Esci"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Menù principale"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Lavori in corso!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Questa caratteristica non è ancora supportata..."
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Discuti del futuro di TuxTyping su:"
Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/ja.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,114 +39,114 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr ""
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr ""
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr ""
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr ""
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr ""
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr ""
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr ""
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr ""
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr ""
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr ""
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr ""
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr ""
Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/lt.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
@@ -40,123 +40,123 @@
msgid "Press space bar to return to game"
msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "lygis"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Meškerių:"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Žuvų:"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Lengvas"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Vidutinis"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Sunkus"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Pirštų pratimai"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Sveikiname!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Deja..."
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Žuvų lietus"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Naujokas"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Modifikuoti žodžių sąrašus"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Kometų lietus"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Patyręs"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Pamokos (dar nėra)"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Asas"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Apie \"Tuxtype\" (anglų k.)"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Nuostatos"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Nurodymai (dar nėra)"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Nenugalimas"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Kalbos parinkimas"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Baigti"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Pagrindinis meniu"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Ši programos dalis dar daroma!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Kol kas ji dar nebaigta"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskusijos apie \"Tux Typing\" vyksta adresu:"
Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/ml.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
@@ -41,115 +41,115 @@
msgid "Press space bar to return to game"
msgstr "കളിയില് തിരിച്ചെത്താന് സ്പെയ്സ് കീ അടിക്കുക"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "തട്ട്"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "ആയുസ്സ്"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "മത്സ്യം"
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "എളുപ്പം"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "ഇടത്തരം"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "ബുദ്ധിമുട്ടുള്ളത്"
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "പരിശീലനം"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "കൊള്ളാലോ!!!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "അയ്യോ!.."
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "അഭിനന്ദനങ്ങള്!"
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr "അടുത്തത് :"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "വീഴുന്ന മത്സ്യങ്ങള്"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "ആകാശ പറവകള് "
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "വാക്കുകളുടെ ശേഖരം"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "വാല് നക്ഷത്രത്തെ പിടിക്കുക"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "ആദ്യ പരിശീലനം"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "പാഠങ്ങള്"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "എയ്സ്"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "കളിയുടെ വിവരങ്ങള്"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "ഐച്ഛികങ്ങള്"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "നിര്ദ്ദേശങ്ങള് "
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "കമാന്ഡര്"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "ഭാഷ മാറ്റുക"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "പുറത്തു കടക്കുക"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "പ്രധാന മെനു"
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "പണി നടക്കുന്നുണ്ടല്ലോ"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "ഇത് ഇതുവരെ ശരിയാക്കിയിട്ടില്ല."
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "ടക്സ് ടൈപ്പിന്റെ ഭാവി ചര്ച്ചചെയ്യാനായി ഇവിടെ പോകുക"
Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/nb.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2005-10-20 21:24+0200\n"
"Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -41,115 +41,115 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomrom for å gå tilbake til spillet."
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Vanskelig"
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Uff!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskefall"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Nybegynner"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Rediger ordliste"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Kometknusing"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Erfaren"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Opplæring"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Profesjonell"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Oppsett"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Hjelp"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Ekspert"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Språk"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar ennå."
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/ne.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -44,143 +44,143 @@
msgstr "खेलमा फर्कन स्पेस बार थिच्नुहोस । "
#
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "श्रेणी"
#
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "जिवनहरु"
#
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "माछा"
#
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "सजिलो"
#
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "मध्यम"
#
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "कठिन"
#
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "प्रशिक्षण"
#
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "तपाइलाई बधाई छ!!!"
#
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "हेत्तेरिका!.."
#
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "उत्तम अति उत्तम !"
#
-#: src/practice.c:774
+#: src/practice.c:1160
#, fuzzy
msgid "Next letter "
msgstr "आगामी अक्षर"
#
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "माछा क्यास्केड "
#
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr " स्पेस क्याडेट"
#
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "शब्द शुचिहरुलाई सम्पादन गर्नुहोस ।"
#
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "कमेट ज्याप"
#
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "पाइलट"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "पाठ्यक्रमहरु"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "एस"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "परियोजनाको बारेमा"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "विकल्पहरु"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "निर्देशनहरु "
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "कमान्डर"
#
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "भाषा समाबिष्ट गर्नुहोस ।"
#
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "बन्द गर्नुहोस ।"
#
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "मुख्य मेनु"
#
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "काम हुदैछ!!!!!!!!"
#
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "यो सुबिधा अहिले उपलब्ध हुनसक्दैन!!!!"
#
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr " टक्शटाइप को भविष्य बारेमा छलफल गर्नुहोस ।"
Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/nl.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,124 +42,124 @@
msgid "Press space bar to return to game"
msgstr "terug naar het spel? druk op spatiebalk"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Levens"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Vissen"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Gemakkelijk"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Moeilijker"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Echt Moeilijk"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Vingeroefeningen"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Gefeliciteerd !"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Oh Nee!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Vallende Vissen"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Leerling-vlieger"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Bewerk de woordenlijsten"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Inslaande Kometen"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Ruimtepiloot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lessen"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Luitenant-Meteoor"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Opties"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instructies"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Opperbevelhebber"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Taal instellen"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Stoppen"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Hoofdmenu"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Werk In Uitvoering!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "dit onderdeel is nog niet klaar"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Bespreek de toekomst van TuxTyping op"
Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/nn.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2005-02-12 13:13+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -40,116 +40,116 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Vanskeleg"
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Uff!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskefall"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Nybegynnar"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Rediger ordliste"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Kometknusing"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Erfaren"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Opplæring"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Profesjonell"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Oppsett"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Hjelp"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Ekspert"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Språk"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikkje klar enno."
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/pt.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2007-02-07 16:08+0000\n"
"Last-Translator: Hudson G M Figueredo <kynder at pquilinux.org>\n"
"Language-Team: <pt at li.org>\n"
@@ -39,124 +39,124 @@
msgid "Press space bar to return to game"
msgstr "Pressione a barra de espaço para voltar ao jogo"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nível"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Peixes"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Médio"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Praticar"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Parabéns"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Ah não!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Cascata de peixes"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Cadete espacial"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Editar as listas de palavras"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Destruidor de cometas"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Piloto"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lições"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Super piloto"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Opções"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instruções"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Comandante"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Configurar lingua"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Sair"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Menu principal"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Trabalho em progresso!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "essa caracteristica ainda não está pronta"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Discuta o futuro do TuxType em"
Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/ru.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,114 +40,114 @@
msgid "Press space bar to return to game"
msgstr "Нажмите пробел для возврата к игре"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Уровень"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Жизней"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Рыб"
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Легкий"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Средний"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Сложный"
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Практика"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Поздравляем"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "О, нет!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Каскад рыб"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Космический кадет"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Редактирование списка слов"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Падение комет"
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Пилот"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Уроки"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Ас"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Параметры"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Инструкции"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Капитан"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Выбор языка"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Выход"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Главное меню"
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Работа продолжается!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Эта функция еще не готова"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Обсудите будущее TuxTyping на"
Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/sv.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxtype2 1.5.1\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2003-07-23 17:44+0200\n"
"Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -39,124 +39,124 @@
msgid "Press space bar to return to game"
msgstr "Tryck mellanslag för att fortsätta spela"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Lätt"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Mellan"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Svårt"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Övning"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Gratulerar"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Åh nej!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskregn"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Rymdkadett"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Redigera ordlista"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Pricka kometer"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Pilot"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Lektioner"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Flygaress"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Inställningar"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Instruktioner"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Kommendör"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Ställ in språk"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Avsluta"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Huvudmeny"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Arbete pågår!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "Denna funktion är inte färdig än"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutera TyxeTypes framtid på"
Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/sw.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,124 +40,124 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Peces"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Rahisi"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Ngumu"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Ngumu zaidi"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Jifunze"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Shukran"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Ahhhh"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Samaki zinaanguka"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Kidato cha kwanza"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Edit Word Lists"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Vita vya nyota"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Kidato cha pili"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Madarasa"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Kidato cha tatu"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Maoni"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Nammna ya kutumia"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Kidato cha nne"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Chagua Lugha"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Ondoka"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Listi ya kwanza"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Bado kumalizika"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
#, fuzzy
msgid "This feature is not ready yet"
msgstr "Bado ina jengwa"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Toa maoni yako kuhusu TuxTyping"
Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/tuxtype.pot 2008-09-23 12:16:42 UTC (rev 758)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,114 +39,114 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr ""
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr ""
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr ""
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr ""
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr ""
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr ""
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr ""
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr ""
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr ""
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr ""
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr ""
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr ""
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr ""
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr ""
Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/po/wo.po 2008-09-23 12:16:42 UTC (rev 758)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-26 16:04-0500\n"
+"POT-Creation-Date: 2008-09-22 21:17-0500\n"
"PO-Revision-Date: 2007-09-25 09:50-0000\n"
"Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
"org>\n"
@@ -41,124 +41,124 @@
msgid "Press space bar to return to game"
msgstr "Bësal banqaasu teqale ngir fo"
-#: src/playgame.c:1044
+#: src/playgame.c:1068
msgid "Level"
msgstr "Tollu tollu"
-#: src/playgame.c:1045
+#: src/playgame.c:1069
msgid "Lives"
msgstr "Dund yi"
-#: src/playgame.c:1046
+#: src/playgame.c:1070
msgid "Fish"
msgstr "Jën yi"
# levels for Cascade game:
-#: src/playgame.c:1048 src/titlescreen.c:91
+#: src/playgame.c:1072 src/titlescreen.c:92
msgid "Easy"
msgstr "Yomb"
-#: src/playgame.c:1049 src/titlescreen.c:92
+#: src/playgame.c:1073 src/titlescreen.c:93
msgid "Medium"
msgstr "Ci diggante bi"
-#: src/playgame.c:1050 src/titlescreen.c:93
+#: src/playgame.c:1074 src/titlescreen.c:94
msgid "Hard"
msgstr "Dëgër"
# general stuff
-#: src/playgame.c:1051 src/titlescreen.c:92
+#: src/playgame.c:1075 src/titlescreen.c:93
msgid "Practice"
msgstr "Jëf ji"
-#: src/playgame.c:1062
+#: src/playgame.c:1086
msgid "Congratulations"
msgstr "Waaw góor"
-#: src/playgame.c:1066
+#: src/playgame.c:1090
msgid "Oh No!"
msgstr "Déedéet!"
-#: src/practice.c:471
+#: src/practice.c:590
msgid "Great!"
msgstr "Ndokkale!"
-#: src/practice.c:774
+#: src/practice.c:1160
msgid "Next letter "
msgstr ""
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Jën yu tegloo"
# "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Space Cadet"
msgstr "Xale jaww ji"
-#: src/titlescreen.c:91
+#: src/titlescreen.c:92
msgid "Edit Word Lists"
msgstr "Jagal limu baat yi"
# types of games
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Comet Zap"
msgstr "Neenal biddeew yi"
# "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:92
+#: src/titlescreen.c:93
msgid "Pilot"
msgstr "Dawalkat"
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Lessons"
msgstr "Njàng"
# "Ace" is level 3 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Ace"
msgstr "Jambaaru jaww ji"
#
-#: src/titlescreen.c:93
+#: src/titlescreen.c:94
msgid "Project Info"
msgstr "Ci mbirum porose bi"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Options"
msgstr "Tànneef yi"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Instructions"
msgstr "Tektal yi"
# "Commander" is level 4 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Commander"
msgstr "Kelifa"
-#: src/titlescreen.c:94
+#: src/titlescreen.c:95
msgid "Setup Language"
msgstr "Regle lammiñ wi"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Quit"
msgstr "Génn"
-#: src/titlescreen.c:95
+#: src/titlescreen.c:96
msgid "Main Menu"
msgstr "Njël li ëpp solo"
# work in progress stuff
-#: src/titlescreen.c:1175
+#: src/titlescreen.c:1176
msgid "Work In Progress!"
msgstr "Ñi ngi koy defar!"
-#: src/titlescreen.c:1176
+#: src/titlescreen.c:1177
msgid "This feature is not ready yet"
msgstr "Pareegul"
-#: src/titlescreen.c:1177
+#: src/titlescreen.c:1178
msgid "Discuss the future of TuxTyping at"
msgstr "Wax ci ëlëgu TuxTyping ak"
Modified: tuxtype/trunk/src/SDL_extras.c
===================================================================
--- tuxtype/trunk/src/SDL_extras.c 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/src/SDL_extras.c 2008-09-23 12:16:42 UTC (rev 758)
@@ -513,8 +513,8 @@
SDL_Surface* BlackOutline_w(wchar_t* t, const TTF_Font* font, const SDL_Color* c, int size)
{
- wchar_t wchar_tmp[512];
- char tmp[512];
+ wchar_t wchar_tmp[1024];
+ char tmp[1024];
int i;
wcsncpy( wchar_tmp, t, size);
wchar_tmp[size]=0;
Modified: tuxtype/trunk/src/alphabet.c
===================================================================
--- tuxtype/trunk/src/alphabet.c 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/src/alphabet.c 2008-09-23 12:16:42 UTC (rev 758)
@@ -819,19 +819,19 @@
int ConvertToUTF8(wchar_t* wide_word, unsigned char* UTF8_word)
{
int i = 0;
- UTF8 temp_UTF8[FNLEN];
- UTF32 temp_UTF32[FNLEN];
+ UTF8 temp_UTF8[1024];
+ UTF32 temp_UTF32[1024];
UTF8* UTF8_Start = &temp_UTF8[0];
- UTF8* UTF8_End = &temp_UTF8[FNLEN - 1];
+ UTF8* UTF8_End = &temp_UTF8[1024 - 1];
const UTF32* UTF32_Start = &temp_UTF32[0];
- const UTF32* UTF32_End = &temp_UTF32[FNLEN - 1];
+ const UTF32* UTF32_End = &temp_UTF32[1024 - 1];
iconv_t conv_descr;
size_t bytes_converted;
- size_t in_length = (size_t)FNLEN;
- size_t out_length = (size_t)FNLEN;
- wcsncpy(temp_UTF32, wide_word, FNLEN);
+ size_t in_length = (size_t)1024;
+ size_t out_length = (size_t)1024;
+ wcsncpy(temp_UTF32, wide_word, 1024);
DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): wide_word = %S\n", wide_word);}
DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): temp_UTF32 = %S\n", temp_UTF32);}
@@ -844,13 +844,13 @@
UTF8_word[0] = 0;
- while ((i < FNLEN) && (temp_UTF8[i] != 0))
+ while ((i < 1024) && (temp_UTF8[i] != 0))
{
UTF8_word[i] = temp_UTF8[i];
i++;
}
- if (i >= FNLEN)
+ if (i >= 1024)
{
fprintf(stderr, "ConvertToUTF8(): buffer overflow\n");
return -1;
Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/src/playgame.c 2008-09-23 12:16:42 UTC (rev 758)
@@ -879,6 +879,7 @@
int i;
LOG("Entering UpdateScreen()\n");
+ DOUT(numupdates);
/* -- First erase everything we need to -- */
for (i = 0; i < numupdates; i++)
@@ -928,11 +929,8 @@
// if (SNOW_on)
// SDL_UpdateRects(screen, SNOW_add( (SDL_Rect*)&dstupdate, numupdates ), SNOW_rects);
// else
-// SDL_UpdateRects(screen, numupdates, dstupdate);
+ SDL_UpdateRects(screen, numupdates, dstupdate);
- /* try something simpler for now: */
- SDL_UpdateRect(screen, 0, 0, 0, 0);
-
numupdates = 0;
*frame = *frame + 1;
Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c 2008-09-21 17:11:41 UTC (rev 757)
+++ tuxtype/trunk/src/practice.c 2008-09-23 12:16:42 UTC (rev 758)
@@ -24,22 +24,40 @@
#include "globals.h"
#include "funcs.h"
-//static SDL_Surface* bg = NULL;
+#define MAX_PHRASES 256
+#define MAX_PHRASE_LENGTH 256
+#define MAX_WRAP_LINES 10
+
+/* "Local globals" for practice.c */
static SDL_Surface* hands = NULL;
static SDL_Surface* hand_shift[3] = {NULL};
static SDL_Surface* keyboard = NULL;
static SDL_Surface* keypress1 = NULL;
static SDL_Surface* keypress2 = NULL;
static SDL_Surface* hand[11] = {NULL};
-static SDL_Rect hand_loc, letter_loc,keyboard_loc;
static TTF_Font* font = NULL;
-static wchar_t phrase[255][FNLEN];
-
+static wchar_t phrases[MAX_PHRASES][MAX_PHRASE_LENGTH];
static Mix_Chunk* wrong = NULL;
+/* Locations for blitting */
+static int phrase_draw_width = 0; /* How wide before text needs wrapping */
+static SDL_Rect phr_text_rect;
+static SDL_Rect user_text_rect;
+static SDL_Rect keytime_rect;
+static SDL_Rect totaltime_rect;
+static SDL_Rect congrats_rect;
+static SDL_Rect mydest;
+static SDL_Rect hand_loc;
+static SDL_Rect letter_loc;
+static SDL_Rect keyboard_loc;
+
/*local function prototypes: */
+static int load_phrases(const char* phrase_file);
+static int num_phrases = 0;
+static int find_next_wrap(const wchar_t* wstr, const TTF_Font* font, int width);
static int get_phrase(const wchar_t* phr);
+static void recalc_positions(void);
static int practice_load_media(void);
static void practice_unload_media(void);
static void print_at(const wchar_t* pphrase, int wrap, int x, int y);
@@ -55,7 +73,7 @@
/* */
/************************************************************************/
-
+/* -------- This is the main function for the 'Practice' activity. ------ */
int Phrases(wchar_t* pphrase )
{
@@ -71,76 +89,27 @@
i = 0,
cursor = 0,
wrap_pt = 0,
+ prev_wrap = 0,
z = 0,
total = 0,
state = 0;
- int keytimes[100] = {0};
+ int cur_phrase = 0;
+ int keytimes[MAX_PHRASE_LENGTH] = {0};
int next_line = 0;
-
- /* Locations to draw strings: */
- SDL_Rect user_text_rect;
- SDL_Rect keytime_rect;
- SDL_Rect totaltime_rect;
- SDL_Rect congrats_rect;
- SDL_Rect mydest;
-
char keytime_str[20],
totaltime_str[20];
- SDL_Surface* srfc = NULL;
SDL_Surface* tmpsurf = NULL;
-
+ /* Load all needed graphics, strings, sounds.... */
if (!practice_load_media())
{
fprintf(stderr, "Phrases() - practice_load_media() failed, returning.\n");
return 0;
}
- SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
- SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
- SDL_BlitSurface(hands, NULL, screen, &hand_loc);
- SDL_Flip(screen);
+ /* Set up positions for blitting: */
+ recalc_positions();
- /* FIXME get_phrase() does the blitting of the phrase to the screen - this */
- /* is utterly perverse! */
- wrap_pt = get_phrase(pphrase);
-
- if (!wcsncmp(phrase[0], (wchar_t*)"", 1))
- wcsncpy(pphrase, phrase[0], 80);
-
- srfc = GetWhiteGlyph(GetLastKey());
-
- if (!srfc)
- {
- fprintf(stderr, "Phrases() - GetWhiteGlyph(GetLastKey()) not defined - bailing out.\n");
- return 0;
- }
-
- /* FIXME Do these locations even need w and h???????? */
- user_text_rect.x = 40;
- user_text_rect.y = 100;
-// user_text_rect.w = srfc->w;
-// user_text_rect.h = srfc->h;
-
- keytime_rect.x = 50;
- keytime_rect.y = screen->h - 80;
-// keytime_rect.w = srfc->w;
-// keytime_rect.h = srfc->h;
-
- totaltime_rect.x = screen->w - 160;
- totaltime_rect.y = screen->h - 80;
-// totaltime_rect.w = 240;
-// totaltime_rect.h = 50;
-
- congrats_rect.x = screen->w/2;
- congrats_rect.y = 200;//screen->h - 80;
-
- /* This is just a rectangle to redraw everything from the user's text on down: */
- mydest.x = 0;
- mydest.y = user_text_rect.y;
- mydest.w = screen->w;
- mydest.h = screen->h-mydest.y;
-
start = SDL_GetTicks();
@@ -149,24 +118,96 @@
{
switch (state)
{
+ /* state = 0 means the phrase has changed and we need to reset */
+ /* all the variables related to progress of this phrase; we also */
+ /* need a complete redraw (state = 1) */
case 0:
+ /* reset other variables related to progress within phrase: */
+ for (i = 0; i < MAX_PHRASE_LENGTH; i++)
+ keytimes[i] = 0;
+ keytime_str[0] = '\0';
+ totaltime_str[0] = '\0';
+ total = 0;
+ cursor = 0;
+ wrap_pt = 0;
+ prev_wrap = 0;
+
+ /* No 'break;' so we drop through to do case 1 as well : */
+
+ /* state == 1 means complete redraw needed */
+ /* If we do this without the case 0 resets, it means the wrap point */
+ /* has changed and the text needs redrawing, or that the screen */
+ /* size has changed: */
+ case 1:
+ /* Draw bkgd before we start */
+ /* NOTE the keyboard and hands will get drawn when we drop through to case 2: */
+ SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
+// SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
+// SDL_BlitSurface(hands, NULL, screen, &hand_loc);
+ /* Draw the phrase to be typed up to the next wrapping point: */
+ wrap_pt = find_next_wrap(&phrases[cur_phrase][prev_wrap],
+ font, phrase_draw_width);
+ tmpsurf = BlackOutline_w(&phrases[cur_phrase][prev_wrap],
+ font, &white, wrap_pt + 1);
+ if (tmpsurf)
+ {
+ SDL_BlitSurface(tmpsurf, NULL, screen, &phr_text_rect);
+ SDL_FreeSurface(tmpsurf);
+ tmpsurf = NULL;
+ }
+ /* Draw the text the player has typed so far: */
+ tmpsurf = BlackOutline_w(&phrases[cur_phrase][prev_wrap],
+ font, &white,
+ cursor - prev_wrap);
+ if (tmpsurf)
+ {
+ SDL_BlitSurface(tmpsurf, NULL, screen, &user_text_rect);
+ SDL_FreeSurface(tmpsurf);
+ tmpsurf = NULL;
+ }
+
+ /* Draw strings for time displays: */
+ tmpsurf = BlackOutline(keytime_str, font, &white);
+ if (tmpsurf)
+ {
+ SDL_BlitSurface(tmpsurf, NULL, screen, &keytime_rect);
+ SDL_FreeSurface(tmpsurf);
+ tmpsurf = NULL;
+ }
+ tmpsurf = BlackOutline(totaltime_str, font, &white);
+ if (tmpsurf)
+ {
+ SDL_BlitSurface(tmpsurf, NULL, screen, &totaltime_rect);
+ SDL_FreeSurface(tmpsurf);
+ tmpsurf = NULL;
+ }
+// SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
+
+ /* state == 2 means user has pressed key, either correct or incorrect */
+ case 2:
start = SDL_GetTicks();
+ SDL_BlitSurface(CurrentBkgd(), &hand_loc, screen, &hand_loc);
SDL_BlitSurface(hands, NULL, screen, &hand_loc);
SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
- state = 1;
+ /* Update entire screen */
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
+
+ state = 3;
break;
- case 1:
- if (SDL_GetTicks() - start > 500)
+
+ case 3: /* Wind up here the next time through the loop: */
+ /* If no typing for 0.5 sec, display hint: */
+ if (SDL_GetTicks() - start > 500)
{
/* Show finger hint, if available. Note that GetFinger() */
/* returns negative values on error and never returns a */
/* value greater than 9. */
- int key = GetIndex(pphrase[cursor]);
+ int key = GetIndex(phrases[cur_phrase][cursor]);
int fing = GetFinger(key);
int shift = GetShift(key);
- keypress1= GetKeypress1(key);
- keypress2= GetKeypress2(key);
+ keypress1 = GetKeypress1(key);
+ keypress2 = GetKeypress2(key);
if (!keypress1)
{
@@ -180,6 +221,7 @@
return 0;
}
+ SDL_BlitSurface(CurrentBkgd(), &hand_loc, screen, &hand_loc);
SDL_BlitSurface(hands, NULL, screen, &hand_loc);
if (fing >= 0)
SDL_BlitSurface(hand[fing], NULL, screen, &hand_loc);
@@ -188,30 +230,32 @@
SDL_BlitSurface(keypress2, NULL, screen, &keyboard_loc);
SDL_FreeSurface(keypress1);
SDL_FreeSurface(keypress2);
- state = 2;
+ state = 4;
}
break;
- case 2:
- if (state == 2 && SDL_GetTicks() - start > 750)
+ case 4:
+ /* After 0.75 sec, hint starts flashing (alternating states 5 and 6 with delays) */
+ if (SDL_GetTicks() - start > 750)
{
- state = 3;
+ state = 5;
}
break;
- case 3:
+ case 5:
+ SDL_BlitSurface(CurrentBkgd(), &hand_loc, screen, &hand_loc);
SDL_BlitSurface(hands, NULL, screen, &hand_loc);
SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
- state = 12;
+ state = 14;
break;
- case 4:
+ case 6:
{
- int key = GetIndex(pphrase[cursor]);
+ int key = GetIndex(phrases[cur_phrase][cursor]);
int fing = GetFinger(key);
int shift = GetShift(key);
- keypress1= GetKeypress1(key);
- keypress2= GetKeypress2(key);
+ keypress1 = GetKeypress1(key);
+ keypress2 = GetKeypress2(key);
if (!keypress1)
{
@@ -225,6 +269,7 @@
return 0;
}
+ SDL_BlitSurface(CurrentBkgd(), &hand_loc, screen, &hand_loc);
SDL_BlitSurface(hands, NULL, screen, &hand_loc);
if (fing >= 0)
SDL_BlitSurface(hand[fing], NULL, screen, &hand_loc);
@@ -233,7 +278,7 @@
SDL_BlitSurface(keypress2, NULL, screen, &keyboard_loc);
SDL_FreeSurface(keypress1);
SDL_FreeSurface(keypress2);
- state = 11;
+ state = 13;
break;
}
@@ -243,7 +288,7 @@
} /* ----------- End of switch(state) statement-------------- */
/* This blits "Next letter %c" onto the screen - confusing! */
- next_letter(pphrase, cursor);
+ next_letter(phrases[cur_phrase], cursor);
while (SDL_PollEvent(&event))
{
@@ -263,10 +308,28 @@
quit = 1;
break;
+ case SDLK_F10:
+ SwitchScreenMode();
+ recalc_positions();
+ state = 1;
+ break;
+
case SDLK_DOWN: //practice next phase in list
- quit = 2;
+ if (cur_phrase < num_phrases - 1)
+ {
+ cur_phrase++;
+ state = 0;
+ }
break;
+ case SDLK_UP: //practice previous phase in list
+ if (cur_phrase > 0)
+ {
+ cur_phrase--;
+ state = 0;
+ }
+ break;
+
case SDLK_BACKQUOTE:
if(shift_pressed)
tmp='~';
@@ -443,9 +506,16 @@
case SDLK_z: tmp='z'; break;
}
+ /* If state has changed as direct result of keypress (e.g. F10), leave */
+ /* poll event loop so we don't treat it as a simple 'wrong' key: */
+ if (state == 0
+ || state == 1)
+ continue;
+
/* Change to uppercase if shift used */
if(shift_pressed)
tmp=toupper(tmp);
+
updatekeylist(key,tmp);
/* Record elapsed time for this keypress and update running total: */
@@ -459,32 +529,37 @@
/****************************************************/
/* ---------- If user typed correct character, handle it: --------------- */
- if (pphrase[cursor] == event.key.keysym.unicode)
+ if (phrases[cur_phrase][cursor] == event.key.keysym.unicode)
{
cursor++;
- state = 0;
- if (cursor == wrap_pt + 2) /* wrap onto next line */
+ // state = 2;
+
+ if (cursor >= prev_wrap + wrap_pt + 2) /* wrap onto next line */
{
- user_text_rect.x = 40;
+ /* This will cause the next line of the phrase to be drawn: */
+ prev_wrap = prev_wrap + wrap_pt + 2;
+ state = 1;
+
+/* user_text_rect.x = 40;
user_text_rect.y = user_text_rect.y + user_text_rect.h;
mydest.y = user_text_rect.y;
mydest.h = screen->h - mydest.y;
- next_line = 1;
+ next_line = 1;*/
}
+ else
+ state = 2;
- /* Redraw everything below any "completed" lines of input text: */
- SDL_BlitSurface(CurrentBkgd(), &mydest, screen, &mydest);
- SDL_Flip(screen);
+ /* Redraw everything below any "completed" lines of input text, */
+ /* except we don't want to redraw keyboard to avoid flicker: */
- if(!next_line)
- tmpsurf = BlackOutline_w(pphrase, font, &white, cursor);
- else
- tmpsurf = BlackOutline_w(pphrase + wrap_pt + 1,
- font, &white,
- cursor - (wrap_pt + 1));
+ tmpsurf = BlackOutline_w(&phrases[cur_phrase][prev_wrap],
+ font, &white,
+ cursor - prev_wrap);
+
if (tmpsurf)
{
+ SDL_BlitSurface(CurrentBkgd(), &user_text_rect, screen, &user_text_rect);
SDL_BlitSurface(tmpsurf, NULL, screen, &user_text_rect);
SDL_FreeSurface(tmpsurf);
tmpsurf = NULL;
@@ -495,6 +570,7 @@
tmpsurf = BlackOutline(keytime_str, font, &white);
if (tmpsurf)
{
+ SDL_BlitSurface(CurrentBkgd(), &keytime_rect, screen, &keytime_rect);
SDL_BlitSurface(tmpsurf, NULL, screen, &keytime_rect);
SDL_FreeSurface(tmpsurf);
tmpsurf = NULL;
@@ -503,12 +579,13 @@
tmpsurf = BlackOutline(totaltime_str, font, &white);
if (tmpsurf)
{
+ SDL_BlitSurface(CurrentBkgd(), &totaltime_rect, screen, &totaltime_rect);
SDL_BlitSurface(tmpsurf, NULL, screen, &totaltime_rect);
SDL_FreeSurface(tmpsurf);
tmpsurf = NULL;
}
- if (cursor==(wcslen(pphrase)))
+ if (cursor == wcslen(phrases[cur_phrase]))
{
tmpsurf = BlackOutline(gettext("Great!"), font, &white);
if (tmpsurf)
@@ -524,9 +601,16 @@
}
SDL_Flip(screen);
- SDL_Delay(2500);
- next_line = 0;
- quit = 2;
+ SDL_Delay(1200);
+ // next_line = 0;
+ // quit = 2;
+ /* Go on to next phrase, or back to first one if all done */
+ if (cur_phrase < num_phrases)
+ cur_phrase++;
+ else
+ cur_phrase = 0;
+
+ state = 0;
}
}
else /* -------- handle incorrect key press: -------------*/
@@ -539,7 +623,7 @@
SDL_BlitSurface(keypress1, NULL, screen, &keyboard_loc);
SDL_FreeSurface(keypress1);
}
- state=0;
+ state = 2;
if (event.key.keysym.sym != SDLK_RSHIFT
&& event.key.keysym.sym != SDLK_LSHIFT)
@@ -549,8 +633,8 @@
} /* End of "if(event.type == SDL_KEYDOWN)" block --*/
} /* ----- End of SDL_PollEvent() loop -------------- */
-
- SDL_Flip(screen);
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
+// SDL_Flip(screen);
SDL_Delay(30); /* FIXME should keep frame rate constant */
}while (!quit); /* ------- End of main event loop ------------- */
@@ -577,19 +661,19 @@
unsigned char fn[FNLEN];
unsigned char let[5];
int load_failed = 0;
+
DEBUGCODE { printf("Entering practice_load_media\n"); }
- LOG("Loading practice media\n");
+ /* load practice phrases from file */
+ num_phrases = load_phrases("phrases.txt");
+
+ /* load needed SDL_Surfaces: */
LoadBothBkgds("main_bkg.png");
-
hands = LoadImage("hands/hands.png", IMG_ALPHA);
hand_shift[0] = LoadImage("hands/none.png", IMG_ALPHA);
hand_shift[1] = LoadImage("hands/lshift.png", IMG_ALPHA);
hand_shift[2] = LoadImage("hands/rshift.png", IMG_ALPHA);
keyboard = LoadImage("keyboard/keyboard.png", IMG_ALPHA);
-// bg = LoadImage("main_bkg.png", IMG_ALPHA);
- wrong = LoadSound("tock.wav");
- font = LoadFont(settings.theme_font_name, 30);
for (i = 0; i < 10; i++)
{
@@ -597,10 +681,17 @@
hand[i] = LoadImage(fn, IMG_ALPHA);
if (!hand[i])
load_failed = 1;
- }
+ } /* load needed sounds: */
+ wrong = LoadSound("tock.wav");
+
+ /* load needed font: */
+ font = LoadFont(settings.theme_font_name, 30);
+
+
/* Get out if anything failed to load: */
if (load_failed
+ ||!num_phrases
||!hands
||!CurrentBkgd()
||!wrong
@@ -615,19 +706,9 @@
return 0;
}
- /* Should be safe from here on out: */
- hand_loc.x = (screen->w/2) - (hand[0]->w/2);
- hand_loc.y = screen->h - (hand[0]->h);
- hand_loc.w = (hand[0]->w);
- hand_loc.h = (hand[0]->h);
- /********Position of keyboard image*/
- keyboard_loc.x = screen->w/2 -keyboard->w/2;
- keyboard_loc.y = screen->h/2;
- keyboard_loc.w = screen->w/8;
- keyboard_loc.h = screen->h/8;
-
/* Now render letters for glyphs in alphabet: */
+ /* FIXME do we need this? */
RenderLetters(font);
//TTF_CloseFont(font); /* Don't need it after rendering done */
//font = NULL;
@@ -639,14 +720,57 @@
}
+static void recalc_positions(void)
+{
+ /* we can't just use phr_text_rect.w because SDL_BlitSurface() clobbers it: */
+ phrase_draw_width = screen->w - 80;
+ phr_text_rect.x = 40;
+ phr_text_rect.y = 10;
+
+ user_text_rect.x = 40;
+ user_text_rect.y = 100;
+ user_text_rect.w = screen->w;
+ user_text_rect.h = 30; /* FIXME ideally should calculate from font height */
+
+ keytime_rect.x = 50;
+ keytime_rect.y = screen->h - 80;
+ keytime_rect.w = 100;
+ keytime_rect.h = 30;
+
+ totaltime_rect.x = screen->w - 160;
+ totaltime_rect.y = screen->h - 80;
+ totaltime_rect.w = 100;
+ totaltime_rect.h = 30;
+
+ congrats_rect.x = screen->w/2;
+ congrats_rect.y = 200;//screen->h - 80;
+
+ /* This is just a rectangle to redraw everything from the user's text on down: */
+ mydest.x = 0;
+ mydest.y = user_text_rect.y;
+ mydest.w = screen->w;
+ mydest.h = screen->h-mydest.y;
+
+ hand_loc.x = (screen->w/2) - (hand[0]->w/2);
+ hand_loc.y = screen->h - (hand[0]->h);
+ hand_loc.w = (hand[0]->w);
+ hand_loc.h = (hand[0]->h);
+
+ /**** Position of keyboard image */
+ keyboard_loc.x = screen->w/2 -keyboard->w/2;
+ keyboard_loc.y = screen->h/2;
+ keyboard_loc.w = screen->w/8;
+ keyboard_loc.h = screen->h/8;
+
+}
+
static void practice_unload_media(void)
{
int i;
- FreeBothBkgds();
-// SDL_FreeSurface(bg);
-// bg = NULL;
+ FreeBothBkgds();
+ FreeLetters();
if (hands)
SDL_FreeSurface(hands);
@@ -698,14 +822,190 @@
}
+/* Looks for phrases.txt in theme, then in default if not found, */
+/* loads it into phrases[][] array. Returns number of phrases */
+/* successfully loaded. */
+static int load_phrases(const char* phrase_file)
+{
+ int found = 0;
+ int num_phrases = 0;
+ char buf[MAX_PHRASE_LENGTH];
+ FILE* fp;
+ char fn[FNLEN];
+ /* If using theme, look there first: */
+ if (!settings.use_english)
+ {
+ sprintf(fn , "%s/%s", settings.theme_data_path, phrase_file);
+ if (CheckFile(fn))
+ found = 1;
+ }
+
+ /* Now checking English: */
+ if (!found)
+ {
+ sprintf(fn , "%s/%s", settings.default_data_path, phrase_file);
+ if (CheckFile(fn))
+ found = 1;
+ }
+
+ if (!found)
+ {
+ fprintf(stderr, "Could not find phrases file '%s' - cannot do Practice\n",
+ phrase_file);
+ return 0;
+ }
+
+ DEBUGCODE { printf("load_phrases(): phrases file is '%s'\n", fn ); }
+
+ /* We know it will open OK because we already ran CheckFile() on it */
+ fp = fopen(fn, "r");
+
+ /* So now copy each line into phrases array: */
+ /* NOTE we need to convert to wchar_t so just fscanf won't work! */
+ while (!feof(fp) && num_phrases <= MAX_PHRASES)
+ {
+ fscanf(fp, "%[^\n]\n", buf);
+ ConvertFromUTF8(phrases[num_phrases], buf);
+ DEBUGCODE {printf("phrase %d:\t%S\n", num_phrases, phrases[num_phrases]);}
+ num_phrases++;
+ }
+
+ if (num_phrases > MAX_PHRASES)
+ {
+ fprintf(stderr, "File contains more than MAX_PHRASES - stopping\n");
+ num_phrases = MAX_PHRASES;
+ }
+
+ fclose(fp);
+
+ DOUT(num_phrases);
+
+ return num_phrases;
+}
+
+
+
+/* Returns index relative to wstr of last char to be printed before break. */
+/* (i.e. end of last full word that fits within 'width' */
+static int find_next_wrap(const wchar_t* wstr, const TTF_Font* font, int width)
+{
+ wchar_t buf[MAX_PHRASE_LENGTH];
+ unsigned char UTF8buf[MAX_PHRASE_LENGTH];
+
+ int word_end = -1;
+ int prev_word_end = -1;
+
+ int i = 0;
+ int phr_length = 0;
+ int test_w = 0; /* The width in pixels of the SDL-rendered string */
+
+ settings.debug_on = 1;
+ LOG("Entering find__next_wrap\n");
+
+ /* Make sure args OK: */
+ if (!wstr)
+ {
+ fprintf(stderr, "find_next_wrap() - error - invalid string argument\n");
+ return -1;
+ }
+
+ if (!font)
+ {
+ fprintf(stderr, "find_next_wrap() - error - invalid font argument\n");
+ return -1;
+ }
+
+ DOUT(width);
+ DEBUGCODE{ fprintf(stderr, "wstr = %S\n", wstr);}
+
+ phr_length = wcslen(wstr);
+
+ DOUT(phr_length);
+ /* Using 'MAX_PHRASE_LENGTH - 1' will make sure our copied string is */
+ /* null-terminated, even if it didn't fit. */
+
+ if (phr_length > (MAX_PHRASE_LENGTH - 1))
+ {
+ fprintf(stderr, "find_next_wrap() - error - phrase exceeds MAX_PHRASE_LENGTH\n");
+ return -1;
+ }
+
+ /* The function will eventually return from within the loop */
+ while(1)
+ {
+ /* Find next either next space or end of string to check width */
+ for( ;
+ i < phr_length && wstr[i] != ' ';
+ i++);
+
+ DOUT(i);
+
+ /* If exited because space found, back up one so we are at last char in word: */
+ if (wstr[i] == ' ')
+ word_end = i - 1;
+ else
+ word_end = i;
+
+ /* See if we have exceeded the width */
+ /* Copy string into buf and null terminate after point to be checked: */
+ wcsncpy(buf, wstr, MAX_PHRASE_LENGTH);
+ buf[word_end + 1] = '\0';
+ DEBUGCODE{ fprintf(stderr, "buf = %S\n", buf);}
+
+ /* Need to convert to UTF8 because couldn't get UNICODE version to work: */
+ ConvertToUTF8(buf, UTF8buf);
+ /* Now check width of string: */
+ if (-1 == TTF_SizeUTF8(font, UTF8buf, &test_w, NULL))
+ {
+ /* An error occurred: */
+ return -1;
+ }
+
+ DOUT(test_w);
+ DOUT(width);
+ /* If we've gone past the width, the previous space was the wrap point, */
+ /* whether or not we are at the end of the string: */
+ if (test_w > width)
+ {
+ DEBUGCODE
+ {
+ fprintf(stderr, "width exceeded, returning end of previous word as wrap point\n");
+ fprintf(stderr, "prev_word_end is %d\n", prev_word_end);
+ }
+ settings.debug_on = 0;
+ return prev_word_end;
+ }
+ else
+ {
+ if (i >= phr_length)
+ {
+ DEBUGCODE
+ {
+ fprintf(stderr, "width not exceeded, returning because end of string reached\n");
+ fprintf(stderr, "word_end is %d\n", word_end);
+ }
+ /* We reached the end of the phrase without exceeding the width, */
+ /* so just return our current position: */
+ settings.debug_on = 0;
+ return word_end;
+ }
+ else
+ {
+ prev_word_end = word_end;
+ i++;
+ }
+ }
+ }
+}
+
+
static int get_phrase(const wchar_t* phr)
{
int pc = 0; // 'phrase count' (?)
- int pw[256] = { 0 };
- int wrap_pt = 0, i = 0, cursor = 0, z = 0;
+ int phr_widths[MAX_PHRASES] = { 0 };
+ int wrap_pt = 0, i = 0, c = 0, z = 0;
char fn[FNLEN];
-
int old_debug_on = settings.debug_on;
settings.debug_on = 1;
@@ -714,7 +1014,7 @@
/* If we didn't receive a phrase get the first one from the file...*/
if (wcsncmp((wchar_t*)"", phr, 40) == 0)
{
- FILE* pf; /* "phrase file" */
+ FILE* phrase_file;
/* set the phrases directory/file */
/* FIXME I think the phrases should be under data or the theme */
#ifdef WIN32
@@ -725,38 +1025,40 @@
DEBUGCODE { printf("get_phrases(): phrases file is '%s'\n", fn ); }
LOG("get_phrases(): trying to open phrases file\n");
- pf = fopen( fn, "r" );
- if (pf == NULL)
+ phrase_file = fopen( fn, "r" );
+ if (phrase_file == NULL)
return(wrap_pt); /* why not just 'return 0;' ??? */
/* So now copy each line into phrases array: */
- while (!feof(pf) && pc < 256)
+ while (!feof(phrase_file) && pc < 256)
{
- fscanf( pf, "%[^\n]\n", phrase[pc] );
+ fscanf( phrase_file, "%[^\n]\n", phrases[pc] );
pc++;
- DEBUGCODE {printf("%s", phrase[pc]);}
+ DEBUGCODE {printf("%s", phrases[pc]);}
}
- if (pc == 256)
- LOG("File contains more than max allowed phrases - stopping\n");
+ if (pc == MAX_PHRASES)
+ LOG("File contains more than MAX_PHRASES - stopping\n");
- fclose(pf);
+ fclose(phrase_file);
pc--;
}
else
{
+ LOG("get_phrase() in else clause\n");
pc = 1;
- wcsncpy(phrase[0], phr, 80);
+ wcsncpy(phrases[0], phr, MAX_PHRASE_LENGTH);
}
+ /* FIXME this seems to be broken - phr_widths[] has not yet been calculated! */
//Find wrapping point
- for (cursor = 0; cursor <= pc; cursor++)
+ for (c = 0; c <= pc; c++)
{
- if (pw[cursor] < 50) // If the phrase is less than 598 pixels wide
+ if (phr_widths[c] < 50) // If the phrase is less than 598 pixels wide
{
- if (cursor == 0)
+ if (c == 0)
{
- wrap_pt = wcslen(phrase[cursor]);
- print_at(phrase[0], wrap_pt, 40, 10);
+ wrap_pt = wcslen(phrases[c]);
+ print_at(phrases[0], wrap_pt, 40, 10);
}
}
else
@@ -764,7 +1066,7 @@
z = 0;
wrap_pt = 0;
- for (i = 0; i < wcslen(phrase[cursor]); i++)
+ for (i = 0; i < wcslen(phrases[c]); i++)
{
/* Should be safe (if no glyph, will have returned above) */
z ++;
@@ -777,69 +1079,80 @@
for (i = wrap_pt; i >= 0; i--)
{
- if (wcsncmp((wchar_t*)" ", &phrase[cursor][i], 1) == 0)
+ if (wcsncmp((wchar_t*)" ", &phrases[c][i], 1) == 0)
{
wrap_pt = i-1;
break;
}
}
- if (cursor == 0)
+ if (c == 0)
{
- print_at(phrase[0], wrap_pt, 40, 10);
+ LOG("about to call print_at() near bottom\n");
+ print_at(phrases[0], wrap_pt, 40, 10);
}
}
}
+ LOG("Leaving get_phrase()\n");
+
settings.debug_on = old_debug_on;
- LOG("Leaving get_phrase()\n");
return(wrap_pt);
}
static void print_at(const wchar_t *pphrase, int wrap, int x, int y)
{
- int z=0;
- SDL_Surface *tmp;
- letter_loc.x = x;
- letter_loc.y = y;
+ int z = 0;
+ SDL_Surface* tmp;
+ SDL_Rect dst;
+ dst.x = x;
+ dst.y = y;
//font = LoadFont(settings.theme_font_name, 30);
- DEBUGCODE {
- printf("\n\n\nEntering print_at with : %S\n",pphrase);
- printf("wrap = %d\t wsclen() = %d\n", wrap, wcslen(pphrase));
- }
+ DEBUGCODE
+ {
+ printf("\n\n\nEntering print_at with : %S\n",pphrase);
+ printf("wrap = %d\t wsclen() = %d\n", wrap, wcslen(pphrase));
+ }
- if ( wrap == wcslen(pphrase) ){
- LOG("Wrap not needed\n");
+ if (wrap == wcslen(pphrase))
+ {
+ LOG("Wrap not needed\n");
- tmp = BlackOutline_w(pphrase, font, &white, wrap);
- letter_loc.w = tmp->w+5;
- letter_loc.h = tmp->h+5;
- SDL_BlitSurface(tmp, NULL, screen, &letter_loc);
- SDL_FreeSurface(tmp);
- }else{
- LOG("Line length exceeded - wrap required\n");
+ tmp = BlackOutline_w(pphrase, font, &white, wrap);
+ if (tmp)
+ {
+ SDL_BlitSurface(tmp, NULL, screen, &dst);
+ SDL_FreeSurface(tmp);
+ tmp = NULL;
+ }
+ }
+ else
+ {
+ LOG("Line length exceeded - wrap required\n");
- tmp = BlackOutline_w(pphrase, font, &white, wrap+1);
- letter_loc.w = tmp->w+5;
- letter_loc.h = tmp->h+5;
- SDL_BlitSurface(tmp, NULL, screen, &letter_loc);
- SDL_FreeSurface(tmp);
- letter_loc.x = 40;
- // - (letter_loc.h/4) to account for free space at top and bottom of rendered letters
- //SDL_FreeSurface(tmp);
- letter_loc.y = letter_loc.y + letter_loc.h - (letter_loc.h/4);
- tmp = BlackOutline_w(pphrase+wrap+1, font, &white, wcslen(pphrase));
- letter_loc.w = tmp->w+5;
- letter_loc.h = tmp->h+5;
- SDL_BlitSurface(tmp, NULL, screen, &letter_loc);
- SDL_FreeSurface(tmp);
- }
+ tmp = BlackOutline_w(pphrase, font, &white, wrap + 1);
+ if (tmp)
+ {
+ SDL_BlitSurface(tmp, NULL, screen, &dst);
+ dst.y += tmp->h; // move "cursor" down for next line
+ SDL_FreeSurface(tmp);
+ tmp = NULL;
+ }
+
+ tmp = BlackOutline_w(pphrase+wrap+1, font, &white, wcslen(pphrase));
+ if (tmp)
+ {
+ SDL_BlitSurface(tmp, NULL, screen, &dst);
+ SDL_FreeSurface(tmp);
+ }
+ }
//TTF_CloseFont(font);
- // DEBUGCODE { exit(-1); }
- DEBUGCODE { printf("Leaving print_at \n\n\n"); }
+ // DEBUGCODE { exit(-1); }
+ DEBUGCODE { printf("Leaving print_at \n\n\n"); }
}
+
static void next_letter(wchar_t *t, int c)
{
int i;
More information about the Tux4kids-commits
mailing list