[Tux4kids-commits] r765 - in tuxtype/trunk: . data/scripts po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Nov 6 02:39:59 UTC 2008
Author: dbruce-guest
Date: 2008-11-06 02:39:59 +0000 (Thu, 06 Nov 2008)
New Revision: 765
Removed:
tuxtype/trunk/data/scripts/Lesson_2.xml
tuxtype/trunk/data/scripts/Lesson_3.xml
tuxtype/trunk/data/scripts/Lesson_4.xml
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/ChangeLog~
tuxtype/trunk/configure
tuxtype/trunk/configure.ac
tuxtype/trunk/data/scripts/Makefile.am
tuxtype/trunk/data/scripts/Makefile.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/SDL_extras.h
tuxtype/trunk/src/globals.h
tuxtype/trunk/src/main.c
tuxtype/trunk/src/playgame.c
tuxtype/trunk/src/playgame.h
tuxtype/trunk/src/practice.c
tuxtype/trunk/src/setup.c
Log:
Fix of Practice activity so it once again accepts its string argument (needed for Lessons).
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/ChangeLog 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,3 +1,8 @@
+05 Nov 2008 - svn revision 765
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - Practice activity revised to get it to handle single phrase passed as function
+ argument so it again plays nicely with "Lessons"
+
13 Oct 2008 - svn revision 760
[ David Bruce <davidstuartbruce at gmail.com> ]
- Lots more work on fullscreen mode with Fish Cascade working but a little slow
Modified: tuxtype/trunk/ChangeLog~
===================================================================
--- tuxtype/trunk/ChangeLog~ 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/ChangeLog~ 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,3 +1,10 @@
+13 Oct 2008 - svn revision 760
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - Lots more work on fullscreen mode with Fish Cascade working but a little slow
+ - Practice activity extensively reworked - wrapping of arbitrary length phrases,
+ rearrangement of screen layout, fullscreen mode supported, animated Tux icons,
+ onscreen display of time, chars, words per min, accuracy with gettext support.
+
22 Aug 2008 - svn revision 668
[ David Bruce <davidstuartbruce at gmail.com> ]
- Extensive revision to support fullscreen mode at resolution of OS rather than only 640x480.
Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/configure 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Typing 1.6.0.
+# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.0.
#
# Report bugs to <tux4kids-tuxtype-dev at lists.alioth.debian.org>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='Tux Typing'
PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='Tux Typing 1.6.0'
+PACKAGE_VERSION='1.7.0'
+PACKAGE_STRING='Tux Typing 1.7.0'
PACKAGE_BUGREPORT='tux4kids-tuxtype-dev at lists.alioth.debian.org'
ac_unique_file="src/funcs.h"
@@ -1248,7 +1248,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Tux Typing 1.6.0 to adapt to many kinds of systems.
+\`configure' configures Tux Typing 1.7.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1319,7 +1319,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Typing 1.6.0:";;
+ short | recursive ) echo "Configuration of Tux Typing 1.7.0:";;
esac
cat <<\_ACEOF
@@ -1420,7 +1420,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Typing configure 1.6.0
+Tux Typing configure 1.7.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1434,7 +1434,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Tux Typing $as_me 1.6.0, which was
+It was created by Tux Typing $as_me 1.7.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2257,7 +2257,7 @@
# Define the identity of the package.
PACKAGE='tuxtype'
- VERSION='1.6.0'
+ VERSION='1.7.0'
cat >>confdefs.h <<_ACEOF
@@ -6713,6 +6713,7 @@
fi
+
{ echo "$as_me:$LINENO: checking for TTF_Init in -lSDL_ttf" >&5
echo $ECHO_N "checking for TTF_Init in -lSDL_ttf... $ECHO_C" >&6; }
if test "${ac_cv_lib_SDL_ttf_TTF_Init+set}" = set; then
@@ -6788,6 +6789,7 @@
fi
+
{ echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6; }
if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then
@@ -8599,7 +8601,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Tux Typing $as_me 1.6.0, which was
+This file was extended by Tux Typing $as_me 1.7.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8652,7 +8654,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Typing config.status 1.6.0
+Tux Typing config.status 1.7.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: tuxtype/trunk/configure.ac
===================================================================
--- tuxtype/trunk/configure.ac 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/configure.ac 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Typing],[1.6.0],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
+AC_INIT([Tux Typing],[1.7.0],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
@@ -42,12 +42,26 @@
:,
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-AC_CHECK_LIB([SDL_mixer], [Mix_PlayMusic], ,[AC_MSG_ERROR(SDL_mixer not found http://www.libsdl.org/projects/SDL_mixer, )])
-AC_CHECK_LIB([SDL_ttf], [TTF_Init], ,[AC_MSG_ERROR(SDL_ttf not found http://www.libsdl.org/projects/SDL_ttf, )])
-AC_CHECK_LIB([SDL_image], [IMG_Load], ,[AC_MSG_ERROR(SDL_image not found http://www.libsdl.org/projects/SDL_image, )])
+AC_CHECK_LIB([SDL_mixer],
+ [Mix_PlayMusic],
+ ,
+ [AC_MSG_ERROR(SDL_mixer not found http://www.libsdl.org/projects/SDL_mixer, )])
+AC_CHECK_LIB([SDL_ttf],
+ [TTF_Init],
+ ,
+ [AC_MSG_ERROR(SDL_ttf not found http://www.libsdl.org/projects/SDL_ttf, )])
+
+AC_CHECK_LIB([SDL_image],
+ [IMG_Load],
+ ,
+ [AC_MSG_ERROR(SDL_image not found http://www.libsdl.org/projects/SDL_image, )])
+
# FIXME would be better to skip check for win32 build
-AC_CHECK_LIB([SDL_Pango], [SDLPango_Init], ,[AC_MSG_WARN(SDL_Pango not found http://sdlpango.sourceforge.net/)])
+AC_CHECK_LIB([SDL_Pango],
+ [SDLPango_Init],
+ ,
+ [AC_MSG_WARN(SDL_Pango not found http://sdlpango.sourceforge.net/)])
#
Deleted: tuxtype/trunk/data/scripts/Lesson_2.xml
===================================================================
--- tuxtype/trunk/data/scripts/Lesson_2.xml 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/data/scripts/Lesson_2.xml 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,5 +0,0 @@
-<script title="New Lesson" bgcolor="#3f7f3f">
- <page>
-<waitforinput/>
- </page>
-</lesson>
Deleted: tuxtype/trunk/data/scripts/Lesson_3.xml
===================================================================
--- tuxtype/trunk/data/scripts/Lesson_3.xml 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/data/scripts/Lesson_3.xml 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,5 +0,0 @@
-<script title="New Lesson" bgcolor="#3f7f3f">
- <page>
-<waitforinput/>
- </page>
-</lesson>
Deleted: tuxtype/trunk/data/scripts/Lesson_4.xml
===================================================================
--- tuxtype/trunk/data/scripts/Lesson_4.xml 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/data/scripts/Lesson_4.xml 2008-11-06 02:39:59 UTC (rev 765)
@@ -1,5 +0,0 @@
-<script title="New Lesson" bgcolor="#3f7f3f">
- <page>
-<waitforinput/>
- </page>
-</lesson>
Modified: tuxtype/trunk/data/scripts/Makefile.am
===================================================================
--- tuxtype/trunk/data/scripts/Makefile.am 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/data/scripts/Makefile.am 2008-11-06 02:39:59 UTC (rev 765)
@@ -6,7 +6,4 @@
dist_scripts_DATA = projectInfo.xml \
cascade.xml \
laser.xml \
- Lesson_1.xml \
- Lesson_2.xml \
- Lesson_3.xml \
- Lesson_4.xml
+ Lesson_1.xml
\ No newline at end of file
Modified: tuxtype/trunk/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/data/scripts/Makefile.in 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/data/scripts/Makefile.in 2008-11-06 02:39:59 UTC (rev 765)
@@ -183,10 +183,7 @@
dist_scripts_DATA = projectInfo.xml \
cascade.xml \
laser.xml \
- Lesson_1.xml \
- Lesson_2.xml \
- Lesson_3.xml \
- Lesson_4.xml
+ Lesson_1.xml
all: all-am
Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/ar.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "A[qarh"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "G3ank"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "@ovg"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Tanta."
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Hard"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
#, fuzzy
msgid "Fish Cascade"
Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/ca.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +42,44 @@
msgid "Press space bar to return to game"
msgstr "Premeu 'espai' per tornar al joc"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nivell"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Vides"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Peix"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Fàcil"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Mitg"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "L'enhorabona!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Caiguda de peixos"
Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/cs.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,60 +49,51 @@
msgstr "Stiskni mezerník pro návrat do hry"
#
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Úroveň"
#
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Životy"
#
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Ryba"
#
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Snadná"
#
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Střední"
#
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Těžká"
#
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Procvičování"
#
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Gratuluji"
#
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Ach jo!"
#
-#: src/practice.c:590
-msgid "Great!"
-msgstr "Skvělé!"
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
-#
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Vodopád ryb"
@@ -188,5 +179,9 @@
msgstr "Diskutuj o budoucnosti TuxTyping na"
#
+#~ msgid "Great!"
+#~ msgstr "Skvělé!"
+
+#
#~ msgid "Alphabet"
#~ msgstr "Abeceda"
Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/da.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Tryk på mellemrumstasten for at spille videre"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Let"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Mellem"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Hård"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Øv dig!"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Tillykke!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Åh nej!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskeregn"
Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/de.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Drücke die Leertaste um weiterzuspielen"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Runde"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Leben"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fisch"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Einfach"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Mittel"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Schwer"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Fingerübung"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Herzlichen Glückwunsch!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh Nein!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fischregen"
Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/el.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Επίπεδο"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Ζωές"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Ψάρια"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "1. Εύκολο"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "2. Κανονικό"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "3. Δύσκολο"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Εξάσκηση"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Συγχαρητήρια"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Ωχ! Όχι"
-#: src/practice.c:590
-msgid "Great!"
-msgstr "Μπράβο!"
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Φάε τα Ψαράκια"
@@ -160,6 +152,9 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Σχόλια για το TuxTyping"
+#~ msgid "Great!"
+#~ msgstr "Μπράβο!"
+
#~ msgid "Alphabet"
#~ msgstr "Αλφάβητο"
Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/en at boldquot.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Typing 1.6.0\n"
+"Project-Id-Version: Tux Typing 1.7.0\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-09-22 21:17-0500\n"
-"PO-Revision-Date: 2008-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-0500\n"
+"PO-Revision-Date: 2008-10-16 21:12-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -64,50 +64,42 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr "Great!"
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr "Next letter "
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fish Cascade"
Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/en at quot.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Typing 1.6.0\n"
+"Project-Id-Version: Tux Typing 1.7.0\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-09-22 21:17-0500\n"
-"PO-Revision-Date: 2008-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-0500\n"
+"PO-Revision-Date: 2008-10-16 21:12-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -61,50 +61,42 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh No!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr "Great!"
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr "Next letter "
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fish Cascade"
Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/en_GB.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +40,42 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr ""
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr ""
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr ""
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr ""
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr ""
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr ""
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr ""
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr ""
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr ""
Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/es.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +39,44 @@
msgid "Press space bar to return to game"
msgstr "Pulsa la barra espaciadora para regresar al juego"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Pescado"
# niveles para juego de cascada:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Difícil"
# Cosas generales
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "¡Felicidades!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "¡Oh, no!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Cascada de Pescado"
Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/eu.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Maila"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Bizitzak"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Arraina"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Erreza"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Ertaina"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Gaitza"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Trebakuntza"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Zorionak"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oi ez!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Arrainak goitik-behera"
Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/fr.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +42,44 @@
msgid "Press space bar to return to game"
msgstr "taper la touche espace pour jouer"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Vies"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Poissons"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Moyen"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Fort"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Pratique"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Flicitations"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh Non!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Cascade de Poissons"
Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/it.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "premi SPAZIO per ritornare al gioco"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Livello"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Vite"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Pesci"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Difficile"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Pratica"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Congratulazioni"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh No! Prova di nuovo..."
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Pioggia di pesci"
Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/ja.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +39,42 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr ""
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr ""
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr ""
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr ""
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr ""
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr ""
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr ""
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr ""
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr ""
Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/lt.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-0500\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
@@ -40,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "lygis"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Meškerių:"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Žuvų:"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Lengvas"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Vidutinis"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Sunkus"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Pirštų pratimai"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Sveikiname!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Deja..."
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Žuvų lietus"
Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/ml.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +41,42 @@
msgid "Press space bar to return to game"
msgstr "കളിയില് തിരിച്ചെത്താന് സ്പെയ്സ് കീ അടിക്കുക"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "തട്ട്"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "ആയുസ്സ്"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "മത്സ്യം"
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "എളുപ്പം"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "ഇടത്തരം"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "ബുദ്ധിമുട്ടുള്ളത്"
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "പരിശീലനം"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "കൊള്ളാലോ!!!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "അയ്യോ!.."
-#: src/practice.c:590
-msgid "Great!"
-msgstr "അഭിനന്ദനങ്ങള്!"
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr "അടുത്തത് :"
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "വീഴുന്ന മത്സ്യങ്ങള്"
@@ -153,6 +145,12 @@
msgid "Discuss the future of TuxTyping at"
msgstr "ടക്സ് ടൈപ്പിന്റെ ഭാവി ചര്ച്ചചെയ്യാനായി ഇവിടെ പോകുക"
+#~ msgid "Great!"
+#~ msgstr "അഭിനന്ദനങ്ങള്!"
+
+#~ msgid "Next letter "
+#~ msgstr "അടുത്തത് :"
+
#, fuzzy
#~ msgid "Easy!"
#~ msgstr "എളുപ്പം"
Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/nb.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +41,42 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomrom for å gå tilbake til spillet."
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Vanskelig"
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Uff!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskefall"
Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/ne.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,62 +44,51 @@
msgstr "खेलमा फर्कन स्पेस बार थिच्नुहोस । "
#
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "श्रेणी"
#
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "जिवनहरु"
#
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "माछा"
#
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "सजिलो"
#
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "मध्यम"
#
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "कठिन"
#
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "प्रशिक्षण"
#
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "तपाइलाई बधाई छ!!!"
#
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "हेत्तेरिका!.."
#
-#: src/practice.c:590
-msgid "Great!"
-msgstr "उत्तम अति उत्तम !"
-
-#
-#: src/practice.c:1160
-#, fuzzy
-msgid "Next letter "
-msgstr "आगामी अक्षर"
-
-#
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "माछा क्यास्केड "
@@ -185,6 +174,15 @@
msgstr " टक्शटाइप को भविष्य बारेमा छलफल गर्नुहोस ।"
#
+#~ msgid "Great!"
+#~ msgstr "उत्तम अति उत्तम !"
+
+#
+#, fuzzy
+#~ msgid "Next letter "
+#~ msgstr "आगामी अक्षर"
+
+#
#~ msgid "Alphabet"
#~ msgstr "वर्णमाला"
Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/nl.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +42,44 @@
msgid "Press space bar to return to game"
msgstr "terug naar het spel? druk op spatiebalk"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Levens"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Vissen"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Gemakkelijk"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Moeilijker"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Echt Moeilijk"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Vingeroefeningen"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Gefeliciteerd !"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Oh Nee!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Vallende Vissen"
Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/nn.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +40,42 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Vanskeleg"
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Uff!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskefall"
Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/pt.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +39,44 @@
msgid "Press space bar to return to game"
msgstr "Pressione a barra de espaço para voltar ao jogo"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nível"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Peixes"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Médio"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Praticar"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Parabéns"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Ah não!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Cascata de peixes"
Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/ru.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +40,42 @@
msgid "Press space bar to return to game"
msgstr "Нажмите пробел для возврата к игре"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Уровень"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Жизней"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Рыб"
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Легкий"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Средний"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Сложный"
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Практика"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Поздравляем"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "О, нет!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Каскад рыб"
Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/sv.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +39,44 @@
msgid "Press space bar to return to game"
msgstr "Tryck mellanslag för att fortsätta spela"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Lätt"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Mellan"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Svårt"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Övning"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Gratulerar"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Åh nej!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Fiskregn"
Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/sw.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +40,44 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Peces"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Rahisi"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Ngumu"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Ngumu zaidi"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Jifunze"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Shukran"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Ahhhh"
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Samaki zinaanguka"
Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/tuxtype.pot 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,50 +39,42 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr ""
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr ""
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr ""
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr ""
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr ""
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr ""
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr ""
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr ""
-#: src/practice.c:590
-msgid "Great!"
-msgstr ""
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr ""
Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/po/wo.po 2008-11-06 02:39:59 UTC (rev 765)
@@ -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-09-22 21:17-0500\n"
+"POT-Creation-Date: 2008-10-16 21:12-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,52 +41,44 @@
msgid "Press space bar to return to game"
msgstr "Bësal banqaasu teqale ngir fo"
-#: src/playgame.c:1068
+#: src/playgame.c:1074
msgid "Level"
msgstr "Tollu tollu"
-#: src/playgame.c:1069
+#: src/playgame.c:1075
msgid "Lives"
msgstr "Dund yi"
-#: src/playgame.c:1070
+#: src/playgame.c:1076
msgid "Fish"
msgstr "Jën yi"
# levels for Cascade game:
-#: src/playgame.c:1072 src/titlescreen.c:92
+#: src/playgame.c:1078 src/titlescreen.c:92
msgid "Easy"
msgstr "Yomb"
-#: src/playgame.c:1073 src/titlescreen.c:93
+#: src/playgame.c:1079 src/titlescreen.c:93
msgid "Medium"
msgstr "Ci diggante bi"
-#: src/playgame.c:1074 src/titlescreen.c:94
+#: src/playgame.c:1080 src/titlescreen.c:94
msgid "Hard"
msgstr "Dëgër"
# general stuff
-#: src/playgame.c:1075 src/titlescreen.c:93
+#: src/playgame.c:1081 src/titlescreen.c:93
msgid "Practice"
msgstr "Jëf ji"
-#: src/playgame.c:1086
+#: src/playgame.c:1092
msgid "Congratulations"
msgstr "Waaw góor"
-#: src/playgame.c:1090
+#: src/playgame.c:1096
msgid "Oh No!"
msgstr "Déedéet!"
-#: src/practice.c:590
-msgid "Great!"
-msgstr "Ndokkale!"
-
-#: src/practice.c:1160
-msgid "Next letter "
-msgstr ""
-
#: src/titlescreen.c:92
msgid "Fish Cascade"
msgstr "Jën yu tegloo"
@@ -162,5 +154,8 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Wax ci ëlëgu TuxTyping ak"
+#~ msgid "Great!"
+#~ msgstr "Ndokkale!"
+
#~ msgid "Alphabet"
#~ msgstr "Abajada"
Modified: tuxtype/trunk/src/SDL_extras.c
===================================================================
--- tuxtype/trunk/src/SDL_extras.c 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/SDL_extras.c 2008-11-06 02:39:59 UTC (rev 765)
@@ -18,6 +18,7 @@
#ifdef HAVE_LIBSDL_PANGO
#include "SDL_Pango.h"
static SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color* cl);
+SDLPango_Context* context;
#endif
@@ -320,15 +321,13 @@
return ret;
}
+
#ifdef HAVE_LIBSDL_PANGO
-SDLPango_Context *context = NULL;
-
-
void init_SDLPango_Context()
{
if((context = SDLPango_CreateContext_GivenFontDesc(settings.theme_font_name))==NULL)
- context = SDLPango_CreateContext();
+ context = SDLPango_CreateContext();
SDLPango_SetBaseDirection(context, SDLPANGO_DIRECTION_LTR);
SDLPango_SetDpi(context, 125.0, 125.0);
}
@@ -342,6 +341,12 @@
}
+void reset_DPI_SDLPango_Context(float dpi_x, float dpi_y)
+{
+ SDLPango_SetDpi(context, dpi_x, dpi_y);
+}
+
+
SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color *cl)
{
SDLPango_Matrix *colour;
Modified: tuxtype/trunk/src/SDL_extras.h
===================================================================
--- tuxtype/trunk/src/SDL_extras.h 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/SDL_extras.h 2008-11-06 02:39:59 UTC (rev 765)
@@ -19,12 +19,6 @@
#include "SDL.h"
#include "SDL_ttf.h"
-#ifdef HAVE_LIBSDL_PANGO
-//#include "SDL_Pango.h"
-//extern SDLPango_Context *context;
-void init_SDLPango_Context();
-void free_SDLPango_Context();
-#endif
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
#define rmask 0xff000000
@@ -52,5 +46,10 @@
SDL_Surface* Blend(SDL_Surface *S1, SDL_Surface *S2,float gamma);
SDL_Surface *zoom(SDL_Surface * src, int new_w, int new_h);
+#ifdef HAVE_LIBSDL_PANGO
+void init_SDLPango_Context();
+void free_SDLPango_Context();
+void reset_DPI_SDLPango_Context(float dpi_x, float dpi_y);
+#endif
#endif
Modified: tuxtype/trunk/src/globals.h
===================================================================
--- tuxtype/trunk/src/globals.h 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/globals.h 2008-11-06 02:39:59 UTC (rev 765)
@@ -170,7 +170,7 @@
#define MAX_UNICODES 1024
#define WAIT_MS 2500
-#define FRAMES_PER_SEC 50
+#define FRAMES_PER_SEC 15
#define FULL_CIRCLE 140
/* Menu Prototypes */
@@ -208,10 +208,11 @@
/* FIXME get rid of as much global data as possible, esp. pointers */
extern SDL_Surface* screen;
+
/* these will store the resolution used by the OS when we start, so we */
/* can run fullscreen at the user's preferred resolution: */
-extern uint fs_res_x;
-extern uint fs_res_y;
+extern int fs_res_x;
+extern int fs_res_y;
//extern TTF_Font* font;
extern SDL_Event event;
Modified: tuxtype/trunk/src/main.c
===================================================================
--- tuxtype/trunk/src/main.c 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/main.c 2008-11-06 02:39:59 UTC (rev 765)
@@ -20,7 +20,6 @@
#include "funcs.h"
SDL_Surface* screen;
-
SDL_Event event;
/* the colors we use throughout the game */
Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/playgame.c 2008-11-06 02:39:59 UTC (rev 765)
@@ -33,7 +33,9 @@
//int o_lives; // something cal is working on
//int sound_vol;
-static TTF_Font* font = NULL;
+static TTF_Font* label_font = NULL;
+static TTF_Font* fishy_font = NULL;
+
//static SDL_Surface* background = NULL;
static SDL_Surface* level[NUM_LEVELS] = {NULL};
static SDL_Surface* number[NUM_NUMS] = {NULL};
@@ -149,8 +151,6 @@
LoadTuxAnims();
LoadFishies();
LoadOthers();
- RenderLetters(font);
- LOG( " Done rendering letters \n ");
/* Make sure everything in the word list is "typable" according to the current */
/* theme's keyboard.lst: */
@@ -231,6 +231,7 @@
// background = LoadImage( filename, IMG_REGULAR );
// SNOW_setBkg( background );
+
DrawBackground();
ResetObjects();
@@ -357,7 +358,8 @@
/* --- fishy updates --- */
- if ((frame % 10) == 0)
+ if ((frame% 3) == 0)
+// if ((frame % 10) == 0)
NEXT_FRAME(fishy);
if (fishies < local_max_fishies)
@@ -1061,17 +1063,23 @@
fprintf(stderr, "settings.theme_font_name is %s\n",
settings.theme_font_name);
}
- font = LoadFont(settings.theme_font_name, GAME_FONT_SIZE);
- curlev = BlackOutline(gettext("Level"), font, &white);
- lives = BlackOutline(gettext("Lives"), font, &white);
- fish = BlackOutline(gettext("Fish"), font, &white);
+ fishy_font = LoadFont(settings.theme_font_name, FISHY_FONT_SIZE);
+ label_font = LoadFont(settings.theme_font_name, LABEL_FONT_SIZE);
- level[0] = BlackOutline(gettext("Easy"), font, &white);
- level[1] = BlackOutline(gettext("Medium"), font, &white);
- level[2] = BlackOutline(gettext("Hard"), font, &white);
- level[3] = BlackOutline(gettext("Practice"), font, &white);
+ RenderLetters(fishy_font);
+ LOG( " Done rendering letters \n ");
+
+ curlev = BlackOutline(gettext("Level"), label_font, &white);
+ lives = BlackOutline(gettext("Lives"), label_font, &white);
+ fish = BlackOutline(gettext("Fish"), label_font, &white);
+
+ level[0] = BlackOutline(gettext("Easy"), label_font, &white);
+ level[1] = BlackOutline(gettext("Medium"), label_font, &white);
+ level[2] = BlackOutline(gettext("Hard"), label_font, &white);
+ level[3] = BlackOutline(gettext("Practice"), label_font, &white);
+
number_max_w = 0;
for (i = 0; i < NUM_NUMS; i++) {
sprintf(filename, "num_%i.png", i);
@@ -1081,11 +1089,11 @@
}
for (i = 0; i < CONGRATS_FRAMES; i++) {
- congrats[i] = BlackOutline(gettext("Congratulations"), font, &white);
+ congrats[i] = BlackOutline(gettext("Congratulations"), label_font, &white);
}
for (i = 0; i < OH_NO_FRAMES; i++) {
- ohno[i] = BlackOutline(gettext("Oh No!"), font, &white);
+ ohno[i] = BlackOutline(gettext("Oh No!"), label_font, &white);
}
if (settings.sys_sound) {
@@ -1124,7 +1132,7 @@
static void display_msg(const unsigned char* msg, int x, int y)
{
SDL_Surface* m;
- m = TTF_RenderUTF8_Shaded(font, msg, white, white);
+ m = TTF_RenderUTF8_Shaded(label_font, msg, white, white);
EraseObject(m, x, y);
DrawObject(m, x, y);
SDL_FreeSurface(m);
@@ -1256,10 +1264,14 @@
FreeLetters();
- if (font)
- TTF_CloseFont(font);
- font = NULL;
+ if (fishy_font)
+ TTF_CloseFont(fishy_font);
+ fishy_font = NULL;
+ if (label_font)
+ TTF_CloseFont(label_font);
+ label_font = NULL;
+
LOG( "FreeGame():\n-Freeing Tux Animations\n" );
for (i = 0; i < TUX_NUM_STATES; i++ )
@@ -1404,7 +1416,7 @@
fish_object[*fishies].y = 0;
/* set the percentage of the speed based on length */
- fish_object[*fishies].dy = pow(0.92,fish_object[*fishies].len-1);
+ fish_object[*fishies].dy = pow(0.92, fish_object[*fishies].len - 1);
/* ex: a 9 letter word will be roughly twice as slow! 0.92^8 */
/* give it a random variance so the fish "crunch" isn't constant */
@@ -1424,7 +1436,7 @@
break;
}
- fish_object[*fishies].splat_time = *frame + (480 - fishy->frame[0]->h - tux_object.spr[TUX_STANDING][0]->frame[0]->h)/fish_object[*fishies].dy;
+ fish_object[*fishies].splat_time = *frame + (screen->h - fishy->frame[0]->h - tux_object.spr[TUX_STANDING][0]->frame[0]->h)/fish_object[*fishies].dy;
DEBUGCODE {
/* NOTE need %S rather than %s because of wide characters */
@@ -1548,8 +1560,8 @@
int current_letter;
/* 'x_inset' and 'y_inset' are where the glyph to be drawn relative */
/* the fishy graphic: */
- const int x_inset = 10;
- const int y_inset = 10;
+ const int x_inset = 5;
+ const int y_inset = 0;
/* letter_x and letter_y are where the upper left corner of the glyph needs */
/* to be located - (e.g. how SDL blitting understands locations) */
int letter_x = 0;
@@ -1824,8 +1836,9 @@
tux_object.x = tux_object.endx;
}
}
-
- if ((frame % 8) == 0) next_tux_frame();
+// if ((frame % 8) == 0) next_tux_frame();
+ /* Changed from 8 to 3 because throttling frame rate down to 15 */
+ if ((frame % 3) == 0) next_tux_frame();
}
static void draw_bar(int curlevel, int diflevel, int curlives, int oldlives, int fish_left, int oldfish_left) {
Modified: tuxtype/trunk/src/playgame.h
===================================================================
--- tuxtype/trunk/src/playgame.h 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/playgame.h 2008-11-06 02:39:59 UTC (rev 765)
@@ -20,6 +20,9 @@
#define __PLAYGAME_H__
//definitions
+#define FISHY_FONT_SIZE 32
+#define LABEL_FONT_SIZE 20
+
#define GRAPHIC_SPACE 4 //space between each status bar element in cascade
#define NUM_NUMS 10 //"Mmmmm....Num-Nums...."
@@ -40,7 +43,7 @@
#define STAND_ONSCREEN 15
#define GULP_ONSCREEN 10
//tux default walking & running speeds
-#define WALKING_SPEED 1.5
+#define WALKING_SPEED 5
//#define WALKING_SPEED 1
#define MIN_RUNNING_SPEED 4 * WALKING_SPEED
#define MAX_RUNNING_SPEED 10 * WALKING_SPEED
@@ -57,11 +60,12 @@
#define FISHY_ONSCREEN 10
#define SPLAT_FRAMES 1
#define SPLAT_ONSCREEN 4
-#define DEFAULT_SPEED .3
+#define DEFAULT_SPEED 1
-#define MAX_SPEED_EASY 0.4
-#define MAX_SPEED_MEDIUM 0.9
-#define MAX_SPEED_HARD 1.2
+/* These aren't maxes - they are multipliers to determine how fast the fish fall */
+#define MAX_SPEED_EASY 1.3
+#define MAX_SPEED_MEDIUM 3
+#define MAX_SPEED_HARD 5
#define FISH_SPACING_EASY 90
#define FISH_SPACING_MEDIUM 40
Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/practice.c 2008-11-06 02:39:59 UTC (rev 765)
@@ -23,6 +23,7 @@
#include "globals.h"
#include "funcs.h"
+#include "SDL_extras.h"
#define MAX_PHRASES 256
#define MAX_PHRASE_LENGTH 256
@@ -134,6 +135,7 @@
prev_wrap = 0,
total = 0,
state = 0;
+ int once_only = 0;
int correct_chars = 0;
int wrong_chars = 0;
float accuracy = 0;
@@ -155,6 +157,19 @@
return 0;
}
+ /* If we got a phrase string arg, use it, otherwise we */
+ /* load practice phrases from the default file: */
+ if (pphrase != NULL
+ && wcslen(pphrase) > 0)
+ {
+ wcsncpy(phrases[0], pphrase, MAX_PHRASE_LENGTH);
+ num_phrases = 1;
+ once_only = 1;
+ }
+ else
+ {
+ num_phrases = load_phrases("phrases.txt");
+ }
/* Set up positions for blitting: */
recalc_positions();
@@ -723,15 +738,18 @@
}
}
-// SDL_Flip(screen);
-// SDL_Delay(1200);
-
- /* Go on to next phrase, or back to first one if all done */
- if (cur_phrase < num_phrases)
- cur_phrase++;
- else
- cur_phrase = 0;
-
+ /* if we are just doing a single phrase passed as arg to function, */
+ /* we stop here: */
+ if (once_only)
+ quit = 1;
+ else /* means we are using the phrases from the file */
+ {
+ /* 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;
}
}
@@ -751,8 +769,14 @@
if (event.key.keysym.sym != SDLK_RSHIFT
&& event.key.keysym.sym != SDLK_LSHIFT)
{
- wrong_chars++;
- PlaySound(wrong);
+ /* Also, don't count spacebar as wrong on first char */
+ /* after wrap because we automatically skip it above */
+ if((cursor != prev_wrap)
+ ||(event.key.keysym.sym != SDLK_SPACE))
+ {
+ wrong_chars++;
+ PlaySound(wrong);
+ }
}
}
@@ -798,6 +822,17 @@
{
fontsize = (screen->h)/18;
bigfontsize = fontsize * 3;
+
+ /* When SDL_Pango is used, the above font sizes are ignored */
+ /* by BlackOutline(), so we adjust dpi to scale the fonts: */
+ /* HACK this isn't quite the intended use of SDLPango_SetDpi() */
+#ifdef HAVE_LIBSDL_PANGO
+ {
+ float dpi_x, dpi_y;
+ dpi_x = dpi_y = 125 * ((float)screen->h/(float)480);
+ reset_DPI_SDLPango_Context(dpi_x, dpi_y);
+ }
+#endif
}
static int practice_load_media(void)
@@ -809,8 +844,6 @@
DEBUGCODE { printf("Entering practice_load_media\n"); }
- /* load practice phrases from file */
- num_phrases = load_phrases("phrases.txt");
/* load needed SDL_Surfaces: */
LoadBothBkgds("main_bkg.png");
@@ -850,7 +883,6 @@
/* Get out if anything failed to load: */
if (load_failed
- ||!num_phrases
||!hands
||!CurrentBkgd()
||!tux_win
@@ -876,10 +908,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;
+ /* This is used for keyboard graphic */
+ RenderLetters(smallfont);
GenerateKeyboard(keyboard);
LOG("DONE - Loading practice media\n");
@@ -1034,7 +1064,7 @@
int i;
FreeBothBkgds();
-// FreeLetters();
+ FreeLetters();
if (time_label_srfc)
SDL_FreeSurface(time_label_srfc);
@@ -1109,6 +1139,12 @@
if (wrong)
Mix_FreeChunk(wrong);
wrong = NULL;
+
+/* Set the dpi back to default: */
+#ifdef HAVE_LIBSDL_PANGO
+ reset_DPI_SDLPango_Context(125, 125);
+#endif
+
}
Modified: tuxtype/trunk/src/setup.c
===================================================================
--- tuxtype/trunk/src/setup.c 2008-11-03 15:03:44 UTC (rev 764)
+++ tuxtype/trunk/src/setup.c 2008-11-06 02:39:59 UTC (rev 765)
@@ -34,8 +34,8 @@
"./data"
};
-uint fs_res_x = 0;
-uint fs_res_y = 0;
+int fs_res_x = 0;
+int fs_res_y = 0;
/* Local function prototypes: */
static int load_settings_fp(FILE* fp);
@@ -102,30 +102,7 @@
exit(2);
}
-// LOG( "GraphicsInit - Initialize graphic system\n" );
-//
-// DEBUGCODE {
-// fprintf(stderr, "-SDL Setting VidMode to %ix%ix%i\n", RES_X, RES_Y, BPP);
-// }
-//
-// /* NOTE fullscreen vs. windowed is indicated by video_flags: */
-// if (settings.fullscreen)
-// {
-// video_flags = (SDL_FULLSCREEN | SDL_SWSURFACE | SDL_HWPALETTE);
-// }
-// else
-// {
-// video_flags = (SDL_SWSURFACE | SDL_HWPALETTE);
-// }
-//
-// screen = SDL_SetVideoMode(RES_X, RES_Y, BPP, video_flags);
-//
-// if (screen == NULL) {
-// fprintf(stderr, "Couldn't set %ix%i video mode: %s\n", RES_X, RES_Y, SDL_GetError());
-// exit(2);
-// }
-
LOG( "SDL_SetClipRect(screen, NULL):\n" );
SDL_SetClipRect(screen, NULL); // Let's set the appropriate clip rect -- JA: is neccessary???
More information about the Tux4kids-commits
mailing list