[Tux4kids-commits] r842 - in tuxtype/trunk: . data/scripts doc po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Tue Jan 13 19:16:43 UTC 2009
Author: dbruce-guest
Date: 2009-01-13 19:16:42 +0000 (Tue, 13 Jan 2009)
New Revision: 842
Added:
tuxtype/trunk/data/scripts/cascade.xml.bak
tuxtype/trunk/data/scripts/laser.xml.bak
Removed:
tuxtype/trunk/data/scripts/cascade.xml
tuxtype/trunk/data/scripts/laser.xml
tuxtype/trunk/src/Makefile.in
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/ChangeLog~
tuxtype/trunk/config.h.in
tuxtype/trunk/config.h.in~
tuxtype/trunk/configure
tuxtype/trunk/configure.ac
tuxtype/trunk/doc/INSTALL
tuxtype/trunk/doc/INSTALL-Win32
tuxtype/trunk/po/ar.po
tuxtype/trunk/po/as.po
tuxtype/trunk/po/ca.po
tuxtype/trunk/po/cs.po
tuxtype/trunk/po/da.po
tuxtype/trunk/po/de.po
tuxtype/trunk/po/el.po
tuxtype/trunk/po/en at boldquot.po
tuxtype/trunk/po/en at quot.po
tuxtype/trunk/po/en_GB.po
tuxtype/trunk/po/es.po
tuxtype/trunk/po/eu.po
tuxtype/trunk/po/fr.po
tuxtype/trunk/po/gu.po
tuxtype/trunk/po/hi.po
tuxtype/trunk/po/it.po
tuxtype/trunk/po/ja.po
tuxtype/trunk/po/kn.po
tuxtype/trunk/po/lt.po
tuxtype/trunk/po/ml.gmo
tuxtype/trunk/po/ml.po
tuxtype/trunk/po/nb.po
tuxtype/trunk/po/ne.po
tuxtype/trunk/po/nl.po
tuxtype/trunk/po/nn.po
tuxtype/trunk/po/or.po
tuxtype/trunk/po/pt.po
tuxtype/trunk/po/ru.po
tuxtype/trunk/po/sv.po
tuxtype/trunk/po/sw.po
tuxtype/trunk/po/ta.po
tuxtype/trunk/po/te.po
tuxtype/trunk/po/tr.po
tuxtype/trunk/po/tuxtype.pot
tuxtype/trunk/po/wo.po
tuxtype/trunk/src/funcs.h
tuxtype/trunk/src/loaders.c
tuxtype/trunk/src/playgame.c
tuxtype/trunk/src/playgame.h
tuxtype/trunk/src/practice.c
tuxtype/trunk/src/scripting.c
Log:
tweak of drawing in fish cascade game to make sure letters get erased completely on redraw
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/ChangeLog 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,3 +1,15 @@
+12 Jan 2009 - svn revision 841
+Version 1.7.1
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - additional code to work around unreliability of setlocale() under
+ Windows. We now set LANG for both the C compiler and OS as well, using
+ Bruno Haible's my_setenv() function from the GNU Gettext FAQ. Tuxtype
+ now starts in the correct language for the underlying OS, and also
+ switches translations with theme changes. It does not yet automatically
+ pick the correct theme on startup to match the current LANG.
+ - additional code in ConvertToUTF8() to handle Windows' 16-bit wchar_t vs.
+ unix's 32-bit wchar_t.
+
10 Jan 2009 - svn revision 830
[ David Bruce <davidstuartbruce at gmail.com> ]
- adaptation of menu code for lessons activity so as to be consistent with
Modified: tuxtype/trunk/ChangeLog~
===================================================================
--- tuxtype/trunk/ChangeLog~ 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/ChangeLog~ 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,3 +1,9 @@
+10 Jan 2009 - svn revision 830
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - adaptation of menu code for lessons activity so as to be consistent with
+ rest of menus.
+
+
08 Jan 2009 - svn revision 830
[ David Bruce <davidstuartbruce at gmail.com> ]
- adaptation of menu code for lessons activity so as to be consistent with
Modified: tuxtype/trunk/config.h.in
===================================================================
--- tuxtype/trunk/config.h.in 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/config.h.in 2009-01-13 19:16:42 UTC (rev 842)
@@ -109,6 +109,9 @@
/* Define to 1 if you have the `getegid' function. */
#undef HAVE_GETEGID
+/* Define to 1 if you have the `getenv' function. */
+#undef HAVE_GETENV
+
/* Define to 1 if you have the `geteuid' function. */
#undef HAVE_GETEUID
Modified: tuxtype/trunk/config.h.in~
===================================================================
--- tuxtype/trunk/config.h.in~ 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/config.h.in~ 2009-01-13 19:16:42 UTC (rev 842)
@@ -433,34 +433,24 @@
made weak. */
#undef USE_SOLARIS_THREADS_WEAK
-/* Enable extensions on AIX 3, Interix. */
+/* Define if the Win32 multithreading API can be used. */
+#undef USE_WIN32_THREADS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if on AIX 3.
+ System headers sometimes define this.
+ We just want to avoid a redefinition error message. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
+
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
-/* Enable threading extensions on Solaris. */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop. */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-/* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
-
-/* Version number of package */
-#undef VERSION
-
/* Define to 1 if on MINIX. */
#undef _MINIX
@@ -471,6 +461,17 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
+/* Enable extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/configure 2009-01-13 19:16:42 UTC (rev 842)
@@ -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.7.0.
+# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.1.
#
# 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.7.0'
-PACKAGE_STRING='Tux Typing 1.7.0'
+PACKAGE_VERSION='1.7.1'
+PACKAGE_STRING='Tux Typing 1.7.1'
PACKAGE_BUGREPORT='tux4kids-tuxtype-dev at lists.alioth.debian.org'
ac_unique_file="src/playgame.c"
@@ -1286,7 +1286,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.7.0 to adapt to many kinds of systems.
+\`configure' configures Tux Typing 1.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Typing 1.7.0:";;
+ short | recursive ) echo "Configuration of Tux Typing 1.7.1:";;
esac
cat <<\_ACEOF
@@ -1469,7 +1469,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Typing configure 1.7.0
+Tux Typing configure 1.7.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1483,7 +1483,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.7.0, which was
+It was created by Tux Typing $as_me 1.7.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2307,7 +2307,7 @@
# Define the identity of the package.
PACKAGE='tuxtype'
- VERSION='1.7.0'
+ VERSION='1.7.1'
cat >>confdefs.h <<_ACEOF
@@ -14709,7 +14709,6 @@
-
# --------------------------------------------------------------------------------------
# Checks for header files.
# --------------------------------------------------------------------------------------
@@ -17519,7 +17518,10 @@
-for ac_func in __argz_count __argz_next __argz_stringify atexit bcopy getcwd localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul
+
+
+
+for ac_func in __argz_count __argz_next __argz_stringify atexit bcopy getcwd getenv localtime_r memmove mempcpy memset mkdir munmap nl_langinfo putenv scandir setenv setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -18186,7 +18188,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.7.0, which was
+This file was extended by Tux Typing $as_me 1.7.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18239,7 +18241,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Typing config.status 1.7.0
+Tux Typing config.status 1.7.1
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 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/configure.ac 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Typing],[1.7.0],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
+AC_INIT([Tux Typing],[1.7.1],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
AC_CONFIG_SRCDIR([src/playgame.c])
AC_PREREQ(2.61)
@@ -110,7 +110,6 @@
-
# --------------------------------------------------------------------------------------
# Checks for header files.
# --------------------------------------------------------------------------------------
@@ -148,7 +147,7 @@
AC_FUNC_STRCOLL
AC_FUNC_STRTOD
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit bcopy getcwd localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul])
+AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit bcopy getcwd getenv localtime_r memmove mempcpy memset mkdir munmap nl_langinfo putenv scandir setenv setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul])
# Set PACKAGE_DATA_DIR
PACKAGE_DATA_DIR="data"
Deleted: tuxtype/trunk/data/scripts/cascade.xml
===================================================================
--- tuxtype/trunk/data/scripts/cascade.xml 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/data/scripts/cascade.xml 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,188 +0,0 @@
-<script title="Fish Cascade Instructions">
- <page>
- <img src="lessons_bkg.png" x="0" y="0">
- <img src="tutor-alpha.png" x="0" y="0">
- <img src="fishy-.png" x="130" y="50">
- <img src="tux/stand-.png" x="100" y="330">
- <text color="#ffffff" x="142" y="63" size="22">F</text>
- <text color="#FFFFFF" align="right" size="32">Help Tux Eat Fish! </text>
- <text color="#FFFFFF" align="right">Tux is very hungry! Eating </text>
- <text color="#FFFFFF" align="right">fish with letters gives him </text>
- <text color="#FFFFFF" align="right">a tummy ache. Help Tux </text>
- <text color="#FFFFFF" align="right">eat fish by pressing the </text>
- <text color="#FFFFFF" align="right">letters on the fish making </text>
- <text color="#FFFFFF" align="right">them go away so he can </text>
- <text color="#FFFFFF" align="right">eat them all! </text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="52">
- <img src="tux/stand-.png" x="100" y="330">
- <text color="#ffffff" x="142" y="65" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="54">
- <text color="#ffffff" x="142" y="67" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="56">
- <text color="#ffffff" x="142" y="69" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="58">
- <text color="#ffffff" x="142" y="71" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="60">
- <text color="#ffffff" x="142" y="73" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="62">
- <text color="#ffffff" x="142" y="75" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="64">
- <text color="#ffffff" x="142" y="77" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="66">
- <text color="#ffffff" x="142" y="79" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="68">
- <text color="#ffffff" x="142" y="81" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="70">
- <text color="#ffffff" x="142" y="83" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="72">
- <text color="#ffffff" x="142" y="85" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="74">
- <text color="#ffffff" x="142" y="87" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="76">
- <text color="#ffffff" x="142" y="89" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="78">
- <text color="#ffffff" x="142" y="91" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="80">
- <text color="#ffffff" x="142" y="93" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="82">
- <text color="#ffffff" x="142" y="95" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="84">
- <text color="#ffffff" x="142" y="97" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="86">
- <text color="#ffffff" x="142" y="99" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="88">
- <text color="#ffffff" x="142" y="101" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="90">
- <text color="#ffffff" x="142" y="103" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="92">
- <text color="#ffffff" x="142" y="105" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="94">
- <text color="#ffffff" x="142" y="107" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="96">
- <text color="#ffffff" x="142" y="109" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="98">
- <text color="#ffffff" x="142" y="111" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="100">
- <text color="#ffffff" x="142" y="113" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="102">
- <text color="#ffffff" x="142" y="115" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="104">
- <text color="#ffffff" x="142" y="117" size="22">F</text>
- </page>
- <page>
- <img src="tutor-alpha2.png" x="98" y="64">
- <img src="insert1.png" x="126" y="41">
- <img src="fishy-.png" x="130" y="106">
- <text color="#ffffff" x="142" y="119" size="22">F</text>
- <text color="#ffffff" x="230" y="370" size="22">Press Space to Continue!</text>
- </page>
- <waitforinput/>
- </page></lesson>
Copied: tuxtype/trunk/data/scripts/cascade.xml.bak (from rev 840, tuxtype/trunk/data/scripts/cascade.xml)
===================================================================
--- tuxtype/trunk/data/scripts/cascade.xml.bak (rev 0)
+++ tuxtype/trunk/data/scripts/cascade.xml.bak 2009-01-13 19:16:42 UTC (rev 842)
@@ -0,0 +1,188 @@
+<script title="Fish Cascade Instructions">
+ <page>
+ <img src="lessons_bkg.png" x="0" y="0">
+ <img src="tutor-alpha.png" x="0" y="0">
+ <img src="fishy-.png" x="130" y="50">
+ <img src="tux/stand-.png" x="100" y="330">
+ <text color="#ffffff" x="142" y="63" size="22">F</text>
+ <text color="#FFFFFF" align="right" size="32">Help Tux Eat Fish! </text>
+ <text color="#FFFFFF" align="right">Tux is very hungry! Eating </text>
+ <text color="#FFFFFF" align="right">fish with letters gives him </text>
+ <text color="#FFFFFF" align="right">a tummy ache. Help Tux </text>
+ <text color="#FFFFFF" align="right">eat fish by pressing the </text>
+ <text color="#FFFFFF" align="right">letters on the fish making </text>
+ <text color="#FFFFFF" align="right">them go away so he can </text>
+ <text color="#FFFFFF" align="right">eat them all! </text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="52">
+ <img src="tux/stand-.png" x="100" y="330">
+ <text color="#ffffff" x="142" y="65" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="54">
+ <text color="#ffffff" x="142" y="67" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="56">
+ <text color="#ffffff" x="142" y="69" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="58">
+ <text color="#ffffff" x="142" y="71" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="60">
+ <text color="#ffffff" x="142" y="73" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="62">
+ <text color="#ffffff" x="142" y="75" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="64">
+ <text color="#ffffff" x="142" y="77" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="66">
+ <text color="#ffffff" x="142" y="79" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="68">
+ <text color="#ffffff" x="142" y="81" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="70">
+ <text color="#ffffff" x="142" y="83" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="72">
+ <text color="#ffffff" x="142" y="85" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="74">
+ <text color="#ffffff" x="142" y="87" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="76">
+ <text color="#ffffff" x="142" y="89" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="78">
+ <text color="#ffffff" x="142" y="91" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="80">
+ <text color="#ffffff" x="142" y="93" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="82">
+ <text color="#ffffff" x="142" y="95" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="84">
+ <text color="#ffffff" x="142" y="97" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="86">
+ <text color="#ffffff" x="142" y="99" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="88">
+ <text color="#ffffff" x="142" y="101" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="90">
+ <text color="#ffffff" x="142" y="103" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="92">
+ <text color="#ffffff" x="142" y="105" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="94">
+ <text color="#ffffff" x="142" y="107" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="96">
+ <text color="#ffffff" x="142" y="109" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="98">
+ <text color="#ffffff" x="142" y="111" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="100">
+ <text color="#ffffff" x="142" y="113" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="102">
+ <text color="#ffffff" x="142" y="115" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="104">
+ <text color="#ffffff" x="142" y="117" size="22">F</text>
+ </page>
+ <page>
+ <img src="tutor-alpha2.png" x="98" y="64">
+ <img src="insert1.png" x="126" y="41">
+ <img src="fishy-.png" x="130" y="106">
+ <text color="#ffffff" x="142" y="119" size="22">F</text>
+ <text color="#ffffff" x="230" y="370" size="22">Press Space to Continue!</text>
+ </page>
+ <waitforinput/>
+ </page></lesson>
Property changes on: tuxtype/trunk/data/scripts/cascade.xml.bak
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: tuxtype/trunk/data/scripts/laser.xml
===================================================================
--- tuxtype/trunk/data/scripts/laser.xml 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/data/scripts/laser.xml 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,29 +0,0 @@
-<script title="Comet Zap Instructions" background="main_bkg.jpg">
- <page>
- <text align="center" size="28">Save The Cities From Falling Comets!</text>
-<waitforinput/>
- </page>
- <page>
- <text align="center" size="28">Save The Cities From Falling Comets!</text>
-<waitforinput/>
- </page>
- <page>
- <text align="center" size="28">Save The Cities From Falling Comets!</text>
-<waitforinput/>
- </page>
- <page>
- <text align="center" size="28">Save The Cities From Falling Comets!</text>
-<waitforinput/>
- </page>
- <page>
- <text align="center" size="28">Save The Cities From Falling Comets!</text>
-<waitforinput/>
- </page>
- <page>
- <text>Tux is very hungry! Eating fish with letters gives him a tummy ache.</text>
- <text>Help Tux eat fish by pressing the letters on the fish making</text>
- <text>them go away so he can eat all the 10 9 8 7 6 5 4 3 2 1 0</text>
- <waitforinput/>
- </page>
-</lesson>
-
\ No newline at end of file
Copied: tuxtype/trunk/data/scripts/laser.xml.bak (from rev 840, tuxtype/trunk/data/scripts/laser.xml)
===================================================================
--- tuxtype/trunk/data/scripts/laser.xml.bak (rev 0)
+++ tuxtype/trunk/data/scripts/laser.xml.bak 2009-01-13 19:16:42 UTC (rev 842)
@@ -0,0 +1,29 @@
+<script title="Comet Zap Instructions" background="main_bkg.jpg">
+ <page>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
+<waitforinput/>
+ </page>
+ <page>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
+<waitforinput/>
+ </page>
+ <page>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
+<waitforinput/>
+ </page>
+ <page>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
+<waitforinput/>
+ </page>
+ <page>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
+<waitforinput/>
+ </page>
+ <page>
+ <text>Tux is very hungry! Eating fish with letters gives him a tummy ache.</text>
+ <text>Help Tux eat fish by pressing the letters on the fish making</text>
+ <text>them go away so he can eat all the 10 9 8 7 6 5 4 3 2 1 0</text>
+ <waitforinput/>
+ </page>
+</lesson>
+
\ No newline at end of file
Property changes on: tuxtype/trunk/data/scripts/laser.xml.bak
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: tuxtype/trunk/doc/INSTALL
===================================================================
--- tuxtype/trunk/doc/INSTALL 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/doc/INSTALL 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,5 +1,5 @@
-Tux Typing 1.7.0
-December 10, 2008
+Tux Typing 1.7.1
+January 12, 2009
NOTE - this document is reasonably correct but not completely current.
It will updated as the maintainer's time allows. For GNU/Linux users, you
@@ -34,32 +34,45 @@
freetype2 is required for SDL_ttf
SDL_2.0.6 is known not to compile on RH9
-For most people using Linux
+For most people using Linux:
-./configure --prefix=[your prefix here]
+./configure
make
-make install
+make install (or "sudo make install", if needed to install to default location).
-if you run into problems rerun:
+You can install to a different location by setting a prefix with:
+
+./configure --prefix=[your desired location]
+instead of just "./configure". The default prefix is /usr/local
+
+
+If you run into problems, run:
+
autoreconf --install
+This will re-generate the configure script from configure.ac, and all the Makefile.in's from
+the corresponding Makefile.am's. You should not need to do this if you are building from
+a tuxtype*.tar.gz (but will need to do this if building from a Subversion checkout).
+
+Note - you almost certainly want the tarball with the bundled fonts, e.g. tuxtype_w_fonts-1.7.1.tar.gz.
+The tarballs without fonts are for making Debian packages that will be installed by a package
+manager that will take care of installing the needed fonts.
+
We want this to work for everybody, everywhere, if it doesn't
-work for you please contact calarndt at tux4kids.org
+work for you please contact: tux4kids-tuxtype-dev at lists.alioth.debian.org
-While I've made every attempt to get build system right,
-I am an autoconf/automake newbie. If you encounter issues
-please feel free to contact me directly at:
+You may also contact me directly at:
+davidstuartbruce at gmail.com
-Calvin Arndt <calarndt at tux4kids.net>
+(below are reproduced some generic instructions on how to build and
+install packages that require "./configure; make; make install". They
+were not written specifically for tuxtype).
-
Basic Installation
==================
- These are generic installation instructions.
-
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
Modified: tuxtype/trunk/doc/INSTALL-Win32
===================================================================
--- tuxtype/trunk/doc/INSTALL-Win32 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/doc/INSTALL-Win32 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,7 +1,7 @@
Tux Typing for Windows
----------------------
-Updated Dec 10 2008
+Updated Jan 12 2009
2006-present Lead Developer:
David Bruce <davidstuartbruce at gmail.com>
@@ -16,15 +16,15 @@
Jesse Andrews <jdandr2 at sheffield.cslab.uky.edu>
Original Windows Port by:
Olivier Dagenais <olivier_dagenais at canada.com>
-Windows Crossbuild by
+Windows Crossbuild by:
David Bruce <dbruce at tampabay.rr.com>
(based on TuxMath Windows crossbuild by Yves Combe)
To install the binary package for Tux Typing for Windows:
-1. Run the nsis installer file (e.g. tuxtype-1.7.10-win32-installer.exe)
-2. Click to accept the terms of the GPL
-(you actually have the legal right to install and run the program
+1. Run the nsis installer file (e.g. tuxtype-1.7.1-win32-installer.exe)
+2. Click to review the terms of the GPL.
+(Note - you actually have the legal right to install and run the program
irrespective of what you think of the GPL, but the NSIS installer
program needs a click to proceed with installation. The GPL covers
copying, not use. You no more need a license to simply *use* software
Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ar.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "@ovg"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "G3ank"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "@ovg"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -106,11 +102,9 @@
msgid "Pilot"
msgstr "Pilot"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Practice"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -165,6 +159,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Discuss the future of TuxTyping at"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Practice"
+
#~ msgid "Setup"
#~ msgstr "Setup"
Modified: tuxtype/trunk/po/as.po
===================================================================
--- tuxtype/trunk/po/as.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/as.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-22 12:36+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
"Language-Team: American English <kde-i18n-doc at lists.kde.org>\n"
@@ -15,9 +15,9 @@
"X-Generator: KAider 0.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fish"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr "জীৱন"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fish"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "সহজ"
@@ -100,9 +96,8 @@
msgstr "পাইলট"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "অভ্যাস"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -152,6 +147,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping ৰ গুণৰ আলোচনা ইয়াত কৰক"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "অভ্যাস"
+
#~ msgid "Great!"
#~ msgstr "বঢ়িয়া!"
Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ca.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Peix"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -54,10 +54,6 @@
msgid "Lives"
msgstr "Vides"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Peix"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -107,11 +103,9 @@
msgid "Pilot"
msgstr "Pilot"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Practicar"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -165,6 +159,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Podeu parlar sobre el futur de TuxTyping a"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Practicar"
+
#~ msgid "Alphabet"
#~ msgstr "Lletres soles"
Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/cs.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2007-11-10 16:36+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -18,9 +18,10 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Ryba"
#
#: src/pause.c:279
@@ -63,11 +64,6 @@
msgstr "Životy"
#
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Ryba"
-
-#
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Snadná"
@@ -122,11 +118,9 @@
msgid "Pilot"
msgstr "Pilot"
-#
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Procvičování"
+msgid "Phrase Typing"
+msgstr ""
#
#: src/titlescreen.c:95
@@ -189,6 +183,11 @@
msgstr "Diskutuj o budoucnosti TuxTyping na"
#
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Procvičování"
+
+#
#~ msgid "Great!"
#~ msgstr "Skvělé!"
Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/da.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2003-05-08 17:58+0200\n"
"Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
"Language-Team: Danish\n"
@@ -16,9 +16,9 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fisk"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fisk"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "Trænet"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Øv dig!"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutér TuxTypings fremtid på"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Øv dig!"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabetet"
Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/de.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2003-06-14 19:00+0000\n"
"Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
"Language-Team: German\n"
@@ -16,9 +16,9 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fisch"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Leben"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fisch"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "Pilot"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Fingerübung"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutiere die Zukunft von TuxTyping auf"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Fingerübung"
+
#~ msgid "Setup"
#~ msgstr "Einrichten"
Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/el.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Ψάρια"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Ζωές"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Ψάρια"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "2. Πιλότος"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Εξάσκηση"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Σχόλια για το TuxTyping"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Εξάσκηση"
+
#~ msgid "Great!"
#~ msgstr "Μπράβο!"
Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/en at boldquot.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxtype 1.7.0\n"
+"Project-Id-Version: tuxtype 1.7.1\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
-"PO-Revision-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
+"PO-Revision-Date: 2009-01-12 13:39-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr "Help"
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fish"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -76,10 +76,6 @@
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fish"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Easy"
@@ -125,8 +121,8 @@
msgstr "Pilot"
#: src/titlescreen.c:94
-msgid "Phrase Practice"
-msgstr "Phrase Practice"
+msgid "Phrase Typing"
+msgstr "Phrase Typing"
#: src/titlescreen.c:95
msgid "Lessons"
Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/en at quot.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxtype 1.7.0\n"
+"Project-Id-Version: tuxtype 1.7.1\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
-"PO-Revision-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
+"PO-Revision-Date: 2009-01-12 13:39-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -37,9 +37,9 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr "Help"
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fish"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -73,10 +73,6 @@
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fish"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Easy"
@@ -122,8 +118,8 @@
msgstr "Pilot"
#: src/titlescreen.c:94
-msgid "Phrase Practice"
-msgstr "Phrase Practice"
+msgid "Phrase Typing"
+msgstr "Phrase Typing"
#: src/titlescreen.c:95
msgid "Lessons"
Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/en_GB.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,8 +16,8 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
msgstr ""
#: src/pause.c:279
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr ""
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr ""
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr ""
@@ -101,7 +97,7 @@
msgstr ""
#: src/titlescreen.c:94
-msgid "Phrase Practice"
+msgid "Phrase Typing"
msgstr ""
#: src/titlescreen.c:95
Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/es.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,16 +8,16 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2007-09-16 19:00+0000\n"
"Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Pescado"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Pescado"
-
# niveles para juego de cascada:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -104,11 +100,9 @@
msgid "Pilot"
msgstr "Piloto"
-# Cosas generales
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Practicar"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Charlar del futuro de TuxTyping en"
+# Cosas generales
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Practicar"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabeto"
Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/eu.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Arraina"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Bizitzak"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Arraina"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "Pilotua"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Trebakuntza"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping-en etorkizunaz aritu honekin:"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Trebakuntza"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabetoa"
Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/fr.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Poissons"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -54,10 +54,6 @@
msgid "Lives"
msgstr "Vies"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Poissons"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -107,11 +103,9 @@
msgid "Pilot"
msgstr "Pilote"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Pratique"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -165,6 +159,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Parler du futur de TuxTyping a"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Pratique"
+
#~ msgid "Alphabet"
#~ msgstr "Alphabet"
Modified: tuxtype/trunk/po/gu.po
===================================================================
--- tuxtype/trunk/po/gu.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/gu.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-28 16:17+0530\n"
"Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
"Language-Team: Gujarati\n"
@@ -16,9 +16,9 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "માછલી"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "જીવો"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "માછલી"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "સરળ"
@@ -101,9 +97,8 @@
msgstr "પાઇલોટ"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "પ્રયાસ"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -153,6 +148,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping ને ભવિષ્યમાં ચર્ચા કરો"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "પ્રયાસ"
+
#~ msgid "Great!"
#~ msgstr "મહાન!"
Modified: tuxtype/trunk/po/hi.po
===================================================================
--- tuxtype/trunk/po/hi.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/hi.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-28 16:08+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
"Language-Team: Hindi <hindi.sf.net>\n"
@@ -20,9 +20,9 @@
"\n"
"\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "मछली"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -56,10 +56,6 @@
msgid "Lives"
msgstr "जीवनदान"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "मछली"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "आसान"
@@ -105,9 +101,8 @@
msgstr "पाइलट"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "अभ्यास"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -157,6 +152,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "टक्स टाइपिंग के भविष्य के बारे में यहाँ चर्चा करें"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "अभ्यास"
+
#~ msgid "Great!"
#~ msgstr "बढ़िया!"
Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/it.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Pesci"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Vite"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Pesci"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "Pilota"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Pratica"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Discuti del futuro di TuxTyping su:"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Pratica"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabeto"
Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ja.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,8 +15,8 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
msgstr ""
#: src/pause.c:279
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr ""
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr ""
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr ""
@@ -100,7 +96,7 @@
msgstr ""
#: src/titlescreen.c:94
-msgid "Phrase Practice"
+msgid "Phrase Typing"
msgstr ""
#: src/titlescreen.c:95
Modified: tuxtype/trunk/po/kn.po
===================================================================
--- tuxtype/trunk/po/kn.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/kn.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-27 13:58+0530\n"
"Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
"Language-Team: Kannada <en at li.org>\n"
@@ -16,9 +16,9 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "ಮೀನು"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "ಜೀವಗಳು"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "ಮೀನು"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "ಸುಲಭ"
@@ -101,9 +97,8 @@
msgstr "ಪೈಲೆಟ್"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "ತರಬೇತಿ"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -153,6 +148,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping ನ ಮುಂದಿನ ಭವಿಷ್ಯವನ್ನು ಇಲ್ಲಿ ಚರ್ಚಿಸಿ"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "ತರಬೇತಿ"
+
#~ msgid "Great!"
#~ msgstr "ಅದ್ಭುತ!"
Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/lt.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Žuvų:"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Meškerių:"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Žuvų:"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "Patyręs"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Pirštų pratimai"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskusijos apie \"Tux Typing\" vyksta adresu:"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Pirštų pratimai"
+
#~ msgid "Alphabet"
#~ msgstr "Abėcėlė"
Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ml.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
@@ -17,9 +17,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "മത്സ്യം"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -53,10 +53,6 @@
msgid "Lives"
msgstr "ആയുസ്സ്"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "മത്സ്യം"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "എളുപ്പം"
@@ -102,9 +98,8 @@
msgstr "ആദ്യ പരിശീലനം"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "പരിശീലനം"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -154,6 +149,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "ടക്സ് ടൈപ്പിന്റെ ഭാവി ചര്ച്ചചെയ്യാനായി ഇവിടെ പോകുക"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "പരിശീലനം"
+
#~ msgid "Great!"
#~ msgstr "അഭിനന്ദനങ്ങള്!"
Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/nb.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2005-10-20 21:24+0200\n"
"Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -17,9 +17,9 @@
"X-Generator: KBabel 1.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fisk"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -53,10 +53,6 @@
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fisk"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Lett"
@@ -102,9 +98,8 @@
msgstr "Erfaren"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Øving"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -154,5 +149,9 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Øving"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabetet"
Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ne.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,10 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "माछा"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -58,11 +59,6 @@
msgstr "जिवनहरु"
#
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "माछा"
-
-#
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "सजिलो"
@@ -117,11 +113,9 @@
msgid "Pilot"
msgstr "पाइलट"
-#
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "प्रशिक्षण"
+msgid "Phrase Typing"
+msgstr ""
#
#: src/titlescreen.c:95
@@ -184,6 +178,11 @@
msgstr " टक्शटाइप को भविष्य बारेमा छलफल गर्नुहोस ।"
#
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "प्रशिक्षण"
+
+#
#~ msgid "Great!"
#~ msgstr "उत्तम अति उत्तम !"
Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/nl.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Vissen"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -54,10 +54,6 @@
msgid "Lives"
msgstr "Levens"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Vissen"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -107,11 +103,9 @@
msgid "Pilot"
msgstr "Ruimtepiloot"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Vingeroefeningen"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -165,6 +159,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Bespreek de toekomst van TuxTyping op"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Vingeroefeningen"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabet"
Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/nn.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2005-02-12 13:13+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -16,9 +16,9 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.9.1\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fisk"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fisk"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Lett"
@@ -101,9 +97,8 @@
msgstr "Erfaren"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Øving"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -154,5 +149,9 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Øving"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabetet"
Modified: tuxtype/trunk/po/or.po
===================================================================
--- tuxtype/trunk/po/or.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/or.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-27 17:56+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
"Language-Team: Oriya\n"
@@ -17,9 +17,9 @@
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
"\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "ମାଛ"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -53,10 +53,6 @@
msgid "Lives"
msgstr "ଜୀବନଗୁଡ଼ିକ"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "ମାଛ"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "ସହଜ"
@@ -102,9 +98,8 @@
msgstr "ଚାଳକ"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "ଅଭ୍ୟାସ"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -154,6 +149,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "ରେ TuxTyping ର ଭବିଷ୍ୟତ ଆଲୋଚନା କରନ୍ତୁ"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "ଅଭ୍ୟାସ"
+
#~ msgid "Great!"
#~ msgstr "ଉତ୍ତମ!"
Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/pt.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2007-02-07 16:08+0000\n"
"Last-Translator: Hudson G M Figueredo <kynder at pquilinux.org>\n"
"Language-Team: <pt at li.org>\n"
@@ -15,9 +15,9 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Peixes"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Peixes"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -104,11 +100,9 @@
msgid "Pilot"
msgstr "Piloto"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Praticar"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -162,6 +156,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Discuta o futuro do TuxType em"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Praticar"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabeto"
Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ru.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Рыб"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Жизней"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Рыб"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Легкий"
@@ -101,9 +97,8 @@
msgstr "Пилот"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Практика"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -152,3 +147,7 @@
#: src/titlescreen.c:1138
msgid "Discuss the future of TuxTyping at"
msgstr "Обсудите будущее TuxTyping на"
+
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Практика"
Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/sv.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxtype2\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-12-02 19:51+0100\n"
"Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,9 +15,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Fisk"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Fisk"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -104,11 +100,9 @@
msgid "Pilot"
msgstr "Pilot"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Övning"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -160,3 +154,8 @@
#: src/titlescreen.c:1138
msgid "Discuss the future of TuxTyping at"
msgstr "Diskutera TyxeTypes framtid på"
+
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Övning"
Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/sw.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,9 +16,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Peces"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -52,10 +52,6 @@
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Peces"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -105,11 +101,9 @@
msgid "Pilot"
msgstr "Kidato cha pili"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Jifunze"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -163,6 +157,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Toa maoni yako kuhusu TuxTyping"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Jifunze"
+
#~ msgid "Alphabet"
#~ msgstr "Alfabeto"
Modified: tuxtype/trunk/po/ta.po
===================================================================
--- tuxtype/trunk/po/ta.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/ta.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-22 12:41+0530\n"
"Last-Translator: Felix I <ifelix25 at gmail.com>, 2008\n"
"Language-Team: <en at li.org>\n"
@@ -15,9 +15,9 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "ஃபிஷ்"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr "லைவ்ஸ்"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "ஃபிஷ்"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "எளியது"
@@ -100,9 +96,8 @@
msgstr "பைலட்"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "பயிற்சி"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -152,6 +147,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping எதிர்கால திட்டத்தை இங்கு விவாதிக்கவும்"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "பயிற்சி"
+
#~ msgid "Great!"
#~ msgstr "சபாஷ்!"
Modified: tuxtype/trunk/po/te.po
===================================================================
--- tuxtype/trunk/po/te.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/te.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-08-28 17:58+0530\n"
"Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
"Language-Team: Telugu <en at li.org>\n"
@@ -17,9 +17,9 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "చాప"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -53,10 +53,6 @@
msgid "Lives"
msgstr "అవకాశాలు"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "చాప"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "తేలికైన"
@@ -102,9 +98,8 @@
msgstr "చోదకుడు(పైలెట్)"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "సాధన"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -154,6 +149,10 @@
msgid "Discuss the future of TuxTyping at"
msgstr "TuxTyping యొక్క భవిష్యత్తు యిక్కడ చర్చించండి"
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "సాధన"
+
#~ msgid "Great!"
#~ msgstr "చాలా గొప్ప!"
Modified: tuxtype/trunk/po/tr.po
===================================================================
--- tuxtype/trunk/po/tr.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/tr.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2008-12-11 15:08+0200\n"
"Last-Translator: Doruk Fisek <dfisek at fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -15,9 +15,9 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Balık"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr "Yaşamlar"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Balık"
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr "Kolay"
@@ -100,9 +96,8 @@
msgstr "Pilot"
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Alıştırma"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -151,3 +146,7 @@
#: src/titlescreen.c:1138
msgid "Discuss the future of TuxTyping at"
msgstr "Tuxtyping'in geleceğinin tartışıldığı liste :"
+
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Alıştırma"
Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/tuxtype.pot 2009-01-13 19:16:42 UTC (rev 842)
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: tuxtype 1.7.0\n"
+"Project-Id-Version: tuxtype 1.7.1\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,8 +15,8 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
msgstr ""
#: src/pause.c:279
@@ -51,10 +51,6 @@
msgid "Lives"
msgstr ""
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr ""
-
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
msgstr ""
@@ -100,7 +96,7 @@
msgstr ""
#: src/titlescreen.c:94
-msgid "Phrase Practice"
+msgid "Phrase Typing"
msgstr ""
#: src/titlescreen.c:95
Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/po/wo.po 2009-01-13 19:16:42 UTC (rev 842)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-09 13:55-0600\n"
+"POT-Creation-Date: 2009-01-12 13:39-0600\n"
"PO-Revision-Date: 2007-09-25 09:50-0000\n"
"Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
"org>\n"
@@ -17,9 +17,9 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/loaders.c:86
-msgid "Help"
-msgstr ""
+#: src/loaders.c:87 src/main.c:150 src/playgame.c:1076
+msgid "Fish"
+msgstr "Jën yi"
#: src/pause.c:279
msgid "Sound Effects Volume"
@@ -53,10 +53,6 @@
msgid "Lives"
msgstr "Dund yi"
-#: src/playgame.c:1076
-msgid "Fish"
-msgstr "Jën yi"
-
# levels for Cascade game:
#: src/playgame.c:1078 src/titlescreen.c:93
msgid "Easy"
@@ -106,11 +102,9 @@
msgid "Pilot"
msgstr "Dawalkat"
-# general stuff
#: src/titlescreen.c:94
-#, fuzzy
-msgid "Phrase Practice"
-msgstr "Jëf ji"
+msgid "Phrase Typing"
+msgstr ""
#: src/titlescreen.c:95
msgid "Lessons"
@@ -164,6 +158,11 @@
msgid "Discuss the future of TuxTyping at"
msgstr "Wax ci ëlëgu TuxTyping ak"
+# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Jëf ji"
+
#~ msgid "Great!"
#~ msgstr "Ndokkale!"
Deleted: tuxtype/trunk/src/Makefile.in
===================================================================
--- tuxtype/trunk/src/Makefile.in 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/Makefile.in 2009-01-13 19:16:42 UTC (rev 842)
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
- at BUILD_MINGW32_FALSE@bin_PROGRAMS = tuxtype$(EXEEXT)
- at BUILD_MINGW32_TRUE@bin_PROGRAMS = TuxType$(EXEEXT)
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__objects_1 = playgame.$(OBJEXT) main.$(OBJEXT) \
- titlescreen.$(OBJEXT) loaders.$(OBJEXT) setup.$(OBJEXT) \
- laser.$(OBJEXT) alphabet.$(OBJEXT) theme.$(OBJEXT) \
- practice.$(OBJEXT) audio.$(OBJEXT) snow.$(OBJEXT) \
- scripting.$(OBJEXT) SDL_extras.$(OBJEXT) pixels.$(OBJEXT) \
- pause.$(OBJEXT) ConvertUTF.$(OBJEXT) options.$(OBJEXT) \
- iconv_string.$(OBJEXT) mysetenv.$(OBJEXT)
-am_TuxType_OBJECTS = $(am__objects_1)
-TuxType_OBJECTS = $(am_TuxType_OBJECTS)
-TuxType_LDADD = $(LDADD)
-TuxType_DEPENDENCIES =
-am_tuxtype_OBJECTS = playgame.$(OBJEXT) main.$(OBJEXT) \
- titlescreen.$(OBJEXT) loaders.$(OBJEXT) setup.$(OBJEXT) \
- laser.$(OBJEXT) alphabet.$(OBJEXT) theme.$(OBJEXT) \
- practice.$(OBJEXT) audio.$(OBJEXT) snow.$(OBJEXT) \
- scripting.$(OBJEXT) SDL_extras.$(OBJEXT) pixels.$(OBJEXT) \
- pause.$(OBJEXT) ConvertUTF.$(OBJEXT) options.$(OBJEXT) \
- iconv_string.$(OBJEXT) mysetenv.$(OBJEXT)
-tuxtype_OBJECTS = $(am_tuxtype_OBJECTS)
-tuxtype_LDADD = $(LDADD)
-tuxtype_DEPENDENCIES =
-tuxtype_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tuxtype_LDFLAGS) \
- $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(TuxType_SOURCES) $(tuxtype_SOURCES)
-DIST_SOURCES = $(TuxType_SOURCES) $(tuxtype_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NAME_VERSION = @NAME_VERSION@
-NSIS = @NSIS@
-NSI_DLL_DIR = @NSI_DLL_DIR@
-NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-
-# Support for gettext:
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = $(datadir)/locale
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
- -DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
-
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
- -I../intl -I$(top_srcdir)/intl
-
-LDADD = @LIBINTL@
-tuxtype_LDFLAGS = $(LTLIBINTL)
- at BUILD_MINGW32_FALSE@TUXTYPERC =
-tuxtype_SOURCES = \
- playgame.c \
- main.c \
- titlescreen.c \
- loaders.c \
- setup.c \
- laser.c \
- alphabet.c \
- theme.c \
- practice.c \
- audio.c \
- snow.c \
- scripting.c \
- SDL_extras.c \
- pixels.c \
- pause.c \
- ConvertUTF.c \
- options.c \
- iconv_string.c \
- mysetenv.c
-
-TuxType_SOURCES = $(tuxtype_SOURCES)
-# The rc file has something to do with the icon in Windows, IIRC
-#TuxType_SOURCES = $(tuxtype_SOURCES) tuxtyperc.rc
-EXTRA_DIST = titlescreen.h \
- playgame.h \
- laser.h \
- globals.h \
- funcs.h \
- pixels.h \
- scripting.h \
- SDL_extras.h \
- snow.h \
- ConvertUTF.h \
- iconv_string.h \
- gettext.h \
- compiler.h \
- mysetenv.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
-clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-TuxType$(EXEEXT): $(TuxType_OBJECTS) $(TuxType_DEPENDENCIES)
- @rm -f TuxType$(EXEEXT)
- $(LINK) $(TuxType_OBJECTS) $(TuxType_LDADD) $(LIBS)
-tuxtype$(EXEEXT): $(tuxtype_OBJECTS) $(tuxtype_DEPENDENCIES)
- @rm -f tuxtype$(EXEEXT)
- $(tuxtype_LINK) $(tuxtype_OBJECTS) $(tuxtype_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ConvertUTF.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SDL_extras.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alphabet.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iconv_string.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/laser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/loaders.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mysetenv.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/options.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pause.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pixels.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/playgame.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/practice.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scripting.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setup.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snow.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/theme.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/titlescreen.Po at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
- for dir in "$(DESTDIR)$(bindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: tuxtype/trunk/src/funcs.h
===================================================================
--- tuxtype/trunk/src/funcs.h 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/funcs.h 2009-01-13 19:16:42 UTC (rev 842)
@@ -107,7 +107,6 @@
/* In practice.c: */
int Phrases(wchar_t* practice_phrase);
-static void next_letter(wchar_t *t, int c);
/* In scripting.c: */
Modified: tuxtype/trunk/src/loaders.c
===================================================================
--- tuxtype/trunk/src/loaders.c 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/loaders.c 2009-01-13 19:16:42 UTC (rev 842)
@@ -64,6 +64,7 @@
return 0;
}
+
/* FIXME not sure we need to call *textdomain() functions again here */
/* FIXME need to read language's font name, if needed - e.g. Russian. */
/* also should have return value reflect success or failure. */
@@ -72,20 +73,20 @@
char *s1, *s2, *s3, *s4;
char buf [30];
s1 = setlocale(LC_ALL, settings.theme_locale_name);
- s2 = bindtextdomain(PACKAGE, TUXLOCALE);
- s3 = bind_textdomain_codeset(PACKAGE, "UTF-8");
- s4 = textdomain(PACKAGE);
+// s2 = bindtextdomain(PACKAGE, TUXLOCALE);
+// s3 = bind_textdomain_codeset(PACKAGE, "UTF-8");
+// s4 = textdomain(PACKAGE);
DEBUGCODE
{
- fprintf(stderr, "PACKAGE = %s\n", PACKAGE);
- fprintf(stderr, "TUXLOCALE = %s\n", TUXLOCALE);
+// fprintf(stderr, "PACKAGE = %s\n", PACKAGE);
+// fprintf(stderr, "TUXLOCALE = %s\n", TUXLOCALE);
fprintf(stderr, "setlocale(LC_ALL, %s) returned: %s\n", settings.theme_locale_name, s1);
- fprintf(stderr, "bindtextdomain(PACKAGE, TUXLOCALE) returned: %s\n", s2);
- fprintf(stderr, "bind_textdomain_codeset(PACKAGE, \"UTF-8\") returned: %s\n", s3);
- fprintf(stderr, "textdomain(PACKAGE) returned: %s\n", s4);
+// fprintf(stderr, "bindtextdomain(PACKAGE, TUXLOCALE) returned: %s\n", s2);
+// fprintf(stderr, "bind_textdomain_codeset(PACKAGE, \"UTF-8\") returned: %s\n", s3);
+// fprintf(stderr, "textdomain(PACKAGE) returned: %s\n", s4);
fprintf(stderr, "gettext(\"Fish\"): %s\n\n", gettext("Fish"));
- fprintf(stderr, "After gettext() call\n");
+// fprintf(stderr, "After gettext() call\n");
}
/* Also set LANG as fallback because setlocale() unreliable */
Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/playgame.c 2009-01-13 19:16:42 UTC (rev 842)
@@ -977,6 +977,12 @@
return 0;
}
+ if(numupdates >= MAX_UPDATES)
+ {
+ fprintf(stderr, "Warning - MAX_UPDATES exceeded, cannot add blit to queue\n");
+ return 0;
+ }
+
update = &blits[numupdates++];
if(!update || !update->srcrect || !update->dstrect)
@@ -986,21 +992,43 @@
}
update->src = CurrentBkgd();
-// update->src = background;
+
+ /* take dimentsions from src surface: */
update->srcrect->x = x;
update->srcrect->y = y;
update->srcrect->w = surf->w;
update->srcrect->h = surf->h;
- /* (reduce width or height of srcrect so it doesn't go past bkgd) */
+ /* NOTE this is needed because the letters may go beyond the size of */
+ /* the fish, and we only erase the fish image before we redraw the */
+ /* fish followed by the letter - DSB */
+ /* add margin of a few pixels on each side: */
+ update->srcrect->x -= ERASE_MARGIN;
+ update->srcrect->y -= ERASE_MARGIN;
+ update->srcrect->w += (ERASE_MARGIN * 2);
+ update->srcrect->h += (ERASE_MARGIN * 2);
+
+
+ /* Adjust srcrect so it doesn't go past bkgd: */
+ if (update->srcrect->x < 0)
+ {
+ update->srcrect->w += update->srcrect->x; //so right edge stays correct
+ update->srcrect->x = 0;
+ }
+ if (update->srcrect->y < 0)
+ {
+ update->srcrect->h += update->srcrect->y; //so bottom edge stays correct
+ update->srcrect->y = 0;
+ }
+
if (update->srcrect->x + update->srcrect->w > CurrentBkgd()->w)
update->srcrect->w = CurrentBkgd()->w - update->srcrect->x;
if (update->srcrect->y + update->srcrect->h > CurrentBkgd()->h)
update->srcrect->h = CurrentBkgd()->h - update->srcrect->y;
- update->dstrect->x = x;
- update->dstrect->y = y;
+ update->dstrect->x = update->srcrect->x;
+ update->dstrect->y = update->srcrect->y;
update->dstrect->w = update->srcrect->w;
update->dstrect->h = update->srcrect->h;
update->type = 'E';
@@ -1034,6 +1062,12 @@
return 0;
}
+ if(numupdates >= MAX_UPDATES)
+ {
+ fprintf(stderr, "Warning - MAX_UPDATES exceeded, cannot add blit to queue\n");
+ return 0;
+ }
+
update = &blits[numupdates++];
if(!update || !update->srcrect || !update->dstrect)
@@ -1055,6 +1089,7 @@
return 1;
}
+
/*********************
LoadOthers : Load all other graphics
**********************/
Modified: tuxtype/trunk/src/playgame.h
===================================================================
--- tuxtype/trunk/src/playgame.h 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/playgame.h 2009-01-13 19:16:42 UTC (rev 842)
@@ -22,9 +22,11 @@
//definitions
#define FISHY_FONT_SIZE 32
#define LABEL_FONT_SIZE 20
+//space between each status bar element in cascade
+#define GRAPHIC_SPACE 4
+//extra bkgd border around "erased" images.
+#define ERASE_MARGIN 5
-#define GRAPHIC_SPACE 4 //space between each status bar element in cascade
-
#define NUM_NUMS 10 //"Mmmmm....Num-Nums...."
#define CONGRATS_FRAMES 2 //number of frames for congrats animation
Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/practice.c 2009-01-13 19:16:42 UTC (rev 842)
@@ -103,6 +103,7 @@
static int find_next_wrap(const wchar_t* wstr, const TTF_Font* font, int width);
static void recalc_positions(void);
static void calc_font_sizes(void);
+static void next_letter(wchar_t *t, int c);
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);
@@ -258,7 +259,7 @@
wchar_t buf[200];
wcsncpy(buf, &phrases[cur_phrase][prev_wrap], cursor - prev_wrap);
buf[cursor - prev_wrap + 1]= '\0';
- fprintf(stderr, "Phrase to be typed is: %S\n", buf);
+ fprintf(stderr, "Text typed so far is: %S\n", buf);
}
if (tmpsurf)
@@ -1425,7 +1426,7 @@
DEBUGCODE { printf("Leaving print_at \n\n\n"); }
}
-
+/* Displays the next letter to be typed in a large font */
static void next_letter(wchar_t *t, int c)
{
int i;
Modified: tuxtype/trunk/src/scripting.c
===================================================================
--- tuxtype/trunk/src/scripting.c 2009-01-13 12:53:42 UTC (rev 841)
+++ tuxtype/trunk/src/scripting.c 2009-01-13 19:16:42 UTC (rev 842)
@@ -18,6 +18,7 @@
#include "scripting.h"
#define MAX_LESSONS 100
+#include "SDL_extras.h"
/* Local function prototypes: */
static void clear_items(itemType* i);
@@ -450,10 +451,10 @@
if (finish >= strlen(in)) return 0; // return null string if no " found
- out = malloc(finish-start+2);
+ out = malloc(finish - start + 2);
- snprintf(out, finish-start+1, &in[start]);
- out[finish-start]=0;
+ snprintf(out, finish - start + 1, "%s", &in[start]);
+ out[finish-start] = 0;
return out;
}
More information about the Tux4kids-commits
mailing list