Thu Mar 8 21:43:22 CET 2007

Author: holger
Date: 2006-07-15 16:43:25 +0000 (Sat, 15 Jul 2006)
New Revision: 99

Modified:
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/Makefile.am
   tuxtype/trunk/config.guess
   tuxtype/trunk/config.sub
   tuxtype/trunk/configure.in
   tuxtype/trunk/tuxtype/alphabet.c
   tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT
   tuxtype/trunk/tuxtype/data/themes/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/armenian/lang.po
   tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po
   tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/lang.po
   tuxtype/trunk/tuxtype/data/themes/dansk/lang.po
   tuxtype/trunk/tuxtype/data/themes/deutsch/lang.po
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3-mit.txt
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3.txt
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8-mit.txt
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8.txt
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6-mit.txt
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6.txt
   tuxtype/trunk/tuxtype/data/themes/espanol/lang.po
   tuxtype/trunk/tuxtype/data/themes/french/lang.po
   tuxtype/trunk/tuxtype/data/themes/greek/lang.po
   tuxtype/trunk/tuxtype/data/themes/italian/lang.po
   tuxtype/trunk/tuxtype/data/themes/lithuanian/lang.po
   tuxtype/trunk/tuxtype/data/themes/nederlands/lang.po
   tuxtype/trunk/tuxtype/data/themes/nynorsk/lang.po
   tuxtype/trunk/tuxtype/data/themes/russian/lang.po
   tuxtype/trunk/tuxtype/data/themes/svenska/lang.po
   tuxtype/trunk/tuxtype/data/themes/swahili/lang.po
   tuxtype/trunk/tuxtype/globals.h
   tuxtype/trunk/tuxtype/loaders.c
   tuxtype/trunk/tuxtype/playgame.c
   tuxtype/trunk/tuxtype/scripting.c
Log:
- reverted to r15 except for  config.h and tuxtype/data/themes/spanish/ stay removed
  


Modified: tuxtype/trunk/ChangeLog
===================================================================

--- tuxtype/trunk/ChangeLog	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/ChangeLog	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,14 +1,10 @@
-v1.5.6	 utf-8 release 		- work in progress -
+v1.5.6	 utf-8 release
 [ Holger Levsen ]
        - switched to utf-8, first only to workaround debian bug #374062, but now
          "forever" :)
-       - the menus should be mostly fine, while I expect most wordlists to be
-         broken
-       - TODO: removed some soundfiles with unclear licence 
-       - font-loading is still a ugly hack :-( but works on debian with
-         ttf-gentium, which requires a little code-change for a sarge backport
-	 :-( other plattform untested (und probably not working...)
+       - removed some soundfiles with unclear licence
 
+
 v1.5.5   development version, not yet released (still font+sound issues)
 
 [ Calvin Arndt ]

Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/Makefile.am	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,7 +1,7 @@
 
 SUBDIRS = tuxtype
 
-EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.spec tuxtype.spec.in config.h autogen.sh
+EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
@@ -17,6 +17,11 @@
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
 	$(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(prefix)/doc/$(PACKAGE)/TODO
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+	$(INSTALL_DATA) $(srcdir)/tuxtype.lsm $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)
+	$(INSTALL_DATA) $(srcdir)/tuxtype.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)
+	$(INSTALL_DATA) $(srcdir)/autorun.inf $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
 
 uninstall-local:
 	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/AUTHORS
@@ -25,7 +30,10 @@
 	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/INSTALL
 	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/README
 	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/TODO
+	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
 	-rm -rf $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
+	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
 	-rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2

Modified: tuxtype/trunk/config.guess
===================================================================
--- tuxtype/trunk/config.guess	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/config.guess	2006-07-15 16:43:25 UTC (rev 99)
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2006-02-23'
+timestamp='2005-08-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,9 +206,6 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@@ -767,12 +764,7 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -780,9 +772,6 @@
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS_NT-*:*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
     i*:windows32*:*)
     	# uname -m includes "-pc" on this system.
     	echo ${UNAME_MACHINE}-mingw32
@@ -790,12 +779,9 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit ;;
-    EM64T:Interix*:[345]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -865,11 +851,7 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -888,11 +870,7 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -941,9 +919,6 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -989,7 +964,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#ifdef __INTEL_COMPILER
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -999,11 +974,7 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1214,6 +1185,7 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1292,9 +1264,6 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

Modified: tuxtype/trunk/config.sub
===================================================================
--- tuxtype/trunk/config.sub	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/config.sub	2006-07-15 16:43:25 UTC (rev 99)
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2006-02-23'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,9 +119,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -172,10 +171,6 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -192,10 +187,6 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -248,7 +239,7 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -266,9 +257,8 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| mt \
+	| ms1 \
 	| msp430 \
-	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
@@ -296,9 +286,6 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -349,9 +336,8 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| mt-* \
+	| ms1-* \
 	| msp430-* \
-	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -710,9 +696,6 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -820,12 +803,6 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -882,10 +859,6 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1201,23 +1174,21 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)

Modified: tuxtype/trunk/configure.in
===================================================================
--- tuxtype/trunk/configure.in	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/configure.in	2006-07-15 16:43:25 UTC (rev 99)
@@ -112,6 +112,8 @@
 tuxtype/data/themes/russian/images/Makefile
 tuxtype/data/themes/russian/images/status/Makefile
 tuxtype/data/themes/russian/words/Makefile
+tuxtype/data/themes/spanish/Makefile
+tuxtype/data/themes/spanish/words/Makefile
 tuxtype/data/themes/svenska/Makefile
 tuxtype/data/themes/svenska/words/Makefile
 tuxtype/data/themes/swahili/Makefile

Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/alphabet.c	2006-07-15 16:43:25 UTC (rev 99)
@@ -119,7 +119,7 @@
         
         DEBUGCODE { fprintf( stderr, "black_outline of \"%s\"\n", t ); }
 
-	tmp = TTF_RenderUTF8_Shaded(font, t, black, black);
+	tmp = TTF_RenderText_Solid(font, t, black);
 	tmp2 = SDL_CreateRGBSurface(SDL_SWSURFACE, (tmp->w)+5, (tmp->h)+5, BPP, rmask, gmask, bmask, amask);
 	out = SDL_DisplayFormatAlpha(tmp2);
 	SDL_FreeSurface(tmp2);
@@ -135,7 +135,7 @@
 
 	/* --- Put the color version of the text on top! --- */
 
-	tmp = TTF_RenderUTF8_Blended(font, t, *c);
+	tmp = TTF_RenderText_Blended(font, t, *c);
 
 	dstrect.x = dstrect.y = 2;
 

Modified: tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,62 +1,72 @@
 About The Sound Files Used In This Game
 ---------------------------------------
 
-Some of the sound files used in this game were made exclusively by myself (Sam
-Hart, <hart at geekcomix.com>) and I place under the Gnu GPL as dictated by the
-COPYING file in the root directory of this archive. Those files are:
+Some of the sound files used in this game were made exclusively
+by myself (Sam Hart, <hart at geekcomix.com>) and I place under the
+Gnu GPL as dictated by the COPYING file in the root directory of
+this archive. Those files are:
 
 excuseme.wav
 bite.wav
 run.wav
 splat.wav
 
-The following files are taken from tuxmath and where made by Bill Kendrick
-<bill at newbreedsoftware.com> - the files are also place under the GPL:
+Sam got the following two files from a CD with copyright-free stuff 
+("they were sounds you could legally use to sample, remix, use 
+elsewhere, without having to get permission or any acknowledgement 
+back to the author"):
 
+win.wav 	 	
+winfinal.wav
+
+
+The following files are taken from tuxmath and where made by 
+Bill Kendrick <bill at newbreedsoftware.com> - the files are also 
+place under the GPL:
+
+explosion.wav  	-> also used in tuxmath
+alarm.wav	-> also used in tuxmath
+buzz.wav	-> also used in tuxmath
 game.mod
 game2.mod
 game3.mod
 laser.wav
+lose.wav	-> also used in tuxmath
 pause.wav	
-tock.wav
-explosion.wav  	-> also used in tuxmath
-alarm.wav	-> also used in tuxmath
-buzz.wav	-> also used in tuxmath
-lose.wav	-> also used in tuxmath
 pop.wav		-> also used in tuxmath
 shieldsdown.wav	-> also used in tuxmath
+tock.wav
+tuxi.ogg
 
-Sam got the following two files from a CD with copyright-free stuff ("they were
-sounds you could legally use to sample, remix, use elsewhere, without having to
-get permission or any acknowledgement back to the author"):
 
-win.wav 	 	
-winfinal.wav
-
-
-Emmett Plant (emmett at sonivius.com) is the author of tuxi.ogg and released it in the public domain.
-
-
-"Problematic" files (where we don't know the author):
-funkbrt.it 		-> from http://www.partnersinrhyme.com/ or http://www.musicloops.com/
-kmus1.wav		-> from http://wavplace.com or wavplace.2 (which is offline)
-kmus2.wav		-> ditto (which is offline)
-kmus3.wav		-> ditto (which is offline)
-kmus4.wav 		-> ditto (which is offline)
+Problematic files:
 click.wav 		-> no clue, maybe from kde
+funkbrt.it 		-> from one of those sites
+kmus1.wav		-> from wavplace?.com (which is offline)
+kmus2.wav		-> from wavplace?.com (which is offline)
+kmus3.wav		-> from wavplace?.com (which is offline)
+kmus4.wav 		-> from wavplace?.com (which is offline)
 
-Each file was either declared in the public domain, or was allowed to be used
-freely in non-comercial products. 
+The remainder files were gathered from the following sources (I
+tried out so many files that I forget where each specifically
+came from... sorry):
 
+http://www.partnersinrhyme.com/
+http://www.wavplace.com/
+http://www.wavplace2.com/
+http://www.musicloops.com/
 
-This game is under the Gnu GPL (again, see COPYING) and is open-source. While
-this does not preclude it from being included in a comercial packade (such as a
-Linux distro) this software is required to be freely distributable. Thus, it is
-not comercial.
+Each file was either declared in the public domain, or was
+allowed to be used freely in non-comercial products. This game
+is under the Gnu GPL (again, see COPYING) and is
+open-source. While this does not preclude it from being included
+in a comercial packade (such as a Linux distro) this software is
+required to be freely distributable. Thus, it is not comercial.
 
-If you have any further questions (or you feel a sound file used in this
-open-source game has a copyright conflicting enough to not be included
-with a Gnu GPL software title) please contact me at hart at geekcomix.com
+If you have any further questions (or you feel a sound file used
+in this open-source game has a copyright conflicting enough to
+not be included with a Gnu GPL software title) please contact me
+at hart at geekcomix.com
 
 Thx.
 

Modified: tuxtype/trunk/tuxtype/data/themes/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.am	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.am	2006-07-15 16:43:25 UTC (rev 99)
@@ -14,6 +14,7 @@
 nederlands\
 nynorsk\
 russian\
+spanish\
 svenska\
 swahili
 

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -56,7 +56,7 @@
 msgid "Commander"
 msgstr "Commander"
 
-# levels for Cascade game:
+#levels for Cascade game:
 msgid "Easy"
 msgstr "Tanta."
 
@@ -66,7 +66,7 @@
 msgid "Hard"
 msgstr "Hard"
 
-# types of games
+#types of games
 msgid "Comet Zap"
 msgstr "Comet Zap"
 
@@ -76,7 +76,7 @@
 msgid "Word Cascade"
 msgstr "Pa-yri dara'"
 
-# general stuff
+#general stuff
 msgid "Practice"
 msgstr "Practice"
 
@@ -98,7 +98,7 @@
 msgid "Setup Language"
 msgstr "Setup Language"
 
-# work in progress stuff
+#work in progress stuff
 msgid "Work in Progress!"
 msgstr "Work in Progress!"
 

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,8 +1,6 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
@@ -12,187 +10,91 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
- at SET_MAKE@
+
+SHELL = @SHELL@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+
 top_builddir = ../../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 INSTALL = @INSTALL@
-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)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
+host_alias = @host_alias@
 host_triplet = @host@
-target_triplet = @target@
-subdir = tuxtype/data/themes/bokmal
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-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 =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
 LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
+LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
 VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-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 = @localedir@
-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@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
+
 SUBDIRS = images words
+
 EXTRA_DIST = lang.po keyboard.lst
-all: all-recursive
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../../../config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
 
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
 .SUFFIXES:
-$(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) --gnu  tuxtype/data/themes/bokmal/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/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;
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/Makefile
 
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(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
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -200,14 +102,13 @@
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+
+ at SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -219,7 +120,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -227,24 +128,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
-	rev="$$rev ."; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -254,211 +144,147 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
 
-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; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
 tags: TAGS
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
 	done; \
-	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; } \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
 	       END { 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: ctags-recursive $(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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+mostlyclean-tags:
 
+clean-tags:
+
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID
 
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = tuxtype/data/themes/bokmal
+
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tuxtype/data/themes/bokmal/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    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; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	for subdir in $(SUBDIRS); do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
 	      || exit 1; \
 	  fi; \
 	done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
 install-exec: install-exec-recursive
+
+install-data-am: install-data-local
 install-data: install-data-recursive
-uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
+install: install-recursive
+uninstall-am: uninstall-local
+uninstall: uninstall-recursive
+all-am: Makefile
+all-redirect: all-recursive
 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
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+
+
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 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-recursive
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
-clean-am: clean-generic mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+clean-am:  clean-tags clean-generic mostlyclean-am
 
-dvi: dvi-recursive
+clean: clean-recursive
 
-dvi-am:
+distclean-am:  distclean-tags distclean-generic clean-am
 
-html: html-recursive
+distclean: distclean-recursive
 
-info: info-recursive
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
 
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
 maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+.PHONY: install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-local uninstall-am uninstall all-redirect all-am all \
+installdirs-am installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
 
-mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-data-local \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-local
-
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal
 	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
@@ -468,6 +294,7 @@
 uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
+
 # 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/tuxtype/data/themes/bokmal/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,15 +1,15 @@
-# Tux Typing 2 Norwegian BokmÃ¥l messages
+# Tux Typing 2 Norwegian Bokmål messages
 # Karl Ove Hufthammer <karl at huftis.org>, 2005.
-# Trond MÃ¦hlum <trondm at skolelinux.no>, 2005.
+# Trond Mæhlum <trondm at skolelinux.no>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: lang\n"
 "POT-Creation-Date: 2003-05-19 08:25+0100\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"
+"Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -24,7 +24,7 @@
 
 #: tuxtype/tuxtype/pause.c:93
 msgid "Sound & Music Disabled"
-msgstr "Lyd og musikk avslÃ¥tt"
+msgstr "Lyd og musikk avslått"
 
 #: tuxtype/tuxtype/pause.c:100
 msgid "Paused!"
@@ -32,15 +32,15 @@
 
 #: tuxtype/tuxtype/pause.c:106
 msgid "Press escape again to return to menu"
-msgstr "Trykk Â«EscapeÂ» for Ã¥ gÃ¥ tilbake til hovedmenyen."
+msgstr "Trykk «Escape» for å gå tilbake til hovedmenyen."
 
 #: tuxtype/tuxtype/pause.c:112
 msgid "Press space bar to return to game"
-msgstr "Trykk mellomrom for Ã¥ gÃ¥ tilbake til spillet."
+msgstr "Trykk mellomrom for å gå tilbake til spillet."
 
 #: tuxtype/tuxtype/playgame.c:295
 msgid "Level"
-msgstr "NivÃ¥"
+msgstr "Nivå"
 
 #: tuxtype/tuxtype/playgame.c:296
 msgid "Lives"
@@ -50,21 +50,25 @@
 msgid "Fish"
 msgstr "Fisk"
 
-#: tuxtype/tuxtype/playgame.c:299 tuxtype/tuxtype/titlescreen.h:23
+#: tuxtype/tuxtype/playgame.c:299
+#: tuxtype/tuxtype/titlescreen.h:23
 msgid "Easy"
 msgstr "Lett"
 
-#: tuxtype/tuxtype/playgame.c:300 tuxtype/tuxtype/titlescreen.h:24
+#: tuxtype/tuxtype/playgame.c:300
+#: tuxtype/tuxtype/titlescreen.h:24
 msgid "Medium"
 msgstr "Middels"
 
-#: tuxtype/tuxtype/playgame.c:301 tuxtype/tuxtype/titlescreen.h:25
+#: tuxtype/tuxtype/playgame.c:301
+#: tuxtype/tuxtype/titlescreen.h:25
 msgid "Hard"
 msgstr "Vanskelig"
 
-#: tuxtype/tuxtype/playgame.c:302 tuxtype/tuxtype/titlescreen.h:25
+#: tuxtype/tuxtype/playgame.c:302
+#: tuxtype/tuxtype/titlescreen.h:25
 msgid "Practice"
-msgstr "Ã˜ving"
+msgstr "Øving"
 
 #: tuxtype/tuxtype/playgame.c:313
 msgid "Congratulations"
@@ -80,13 +84,14 @@
 
 #: tuxtype/tuxtype/titlescreen.c:192
 msgid "This feature is not ready yet"
-msgstr "Denne funksjonen er ikke klar ennÃ¥."
+msgstr "Denne funksjonen er ikke klar ennå."
 
 #: tuxtype/tuxtype/titlescreen.c:193
 msgid "Discuss the future of TuxTyping at"
-msgstr "Diskuter neste versjon av Tux Typing pÃ¥"
+msgstr "Diskuter neste versjon av Tux Typing på"
 
-#: tuxtype/tuxtype/titlescreen.c:735 tuxtype/tuxtype/titlescreen.c:736
+#: tuxtype/tuxtype/titlescreen.c:735
+#: tuxtype/tuxtype/titlescreen.c:736
 msgid "Alphabet"
 msgstr "Alfabetet"
 
@@ -112,7 +117,7 @@
 
 #: tuxtype/tuxtype/titlescreen.h:24
 msgid "Lessons"
-msgstr "OpplÃ¦ring"
+msgstr "Opplæring"
 
 #: tuxtype/tuxtype/titlescreen.h:25
 msgid "Ace"
@@ -136,7 +141,7 @@
 
 #: tuxtype/tuxtype/titlescreen.h:26
 msgid "Setup Language"
-msgstr "SprÃ¥k"
+msgstr "Språk"
 
 #: tuxtype/tuxtype/titlescreen.h:27
 msgid "Quit"
@@ -145,3 +150,4 @@
 #: tuxtype/tuxtype/titlescreen.h:27
 msgid "Main Menu"
 msgstr "Hovedmeny"
+

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,8 +1,6 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
@@ -12,305 +10,175 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
- at SET_MAKE@
+
+SHELL = @SHELL@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+
 top_builddir = ../../../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 INSTALL = @INSTALL@
-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)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
+host_alias = @host_alias@
 host_triplet = @host@
-target_triplet = @target@
-subdir = tuxtype/data/themes/bokmal/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-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 =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
 LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
+LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
 VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-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 = @localedir@
-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@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenavn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
 
-all: all-am
+EXTRA_DIST = 3boks.txt 4boks.txt 5boks.txt 6boks.txt dyrenavn.txt frukt.txt land.txt sprak.txt yrke.txt
 
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../../../../config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
 .SUFFIXES:
-$(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) --gnu  tuxtype/data/themes/bokmal/words/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/words/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;
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/words/Makefile
 
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(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
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
 
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
+subdir = tuxtype/data/themes/bokmal/words
+
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tuxtype/data/themes/bokmal/words/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    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; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
 check-am: all-am
 check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
 install-exec: install-exec-am
+
+install-data-am: install-data-local
 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: install-am
+uninstall-am: uninstall-local
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-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
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 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
+mostlyclean-am:  mostlyclean-generic
 
-clean-am: clean-generic mostlyclean-am
+mostlyclean: mostlyclean-am
 
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+clean-am:  clean-generic mostlyclean-am
 
-dvi: dvi-am
+clean: clean-am
 
-dvi-am:
+distclean-am:  distclean-generic clean-am
 
-html: html-am
+distclean: distclean-am
 
-info: info-am
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
 
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
 maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-local install-data-am install-data install-am install \
+uninstall-local uninstall-am uninstall all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-local
-
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
 	$(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
@@ -341,6 +209,7 @@
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.txt
+
 # 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/tuxtype/data/themes/catalan/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -8,22 +8,22 @@
 msgstr "Oh No!"
 
 msgid "Sound & Music Disabled"
-msgstr "S'ha inhabilitat el sÃ³ i la mÃºsica"
+msgstr "S'ha inhabilitat el só i la música"
 
 msgid "Paused!"
 msgstr "En pausa!"
 
 msgid "press escape again to return to menu"
-msgstr "Torneu a prÃ¨mer escape per tornar al menÃº"
+msgstr "Torneu a prèmer escape per tornar al menú"
 
 msgid "press space bar to return to game"
 msgstr "Premeu 'espai' per tornar al joc"
 
 msgid "Sound Effects Volume"
-msgstr "Volum dels efectes de sÃ³"
+msgstr "Volum dels efectes de só"
 
 msgid "Music Volume"
-msgstr "Volum de la mÃºsica"
+msgstr "Volum de la música"
 
 msgid "Edit Word Lists"
 msgstr "Editar les llistes de paraules"
@@ -58,13 +58,13 @@
 
 #levels for Cascade game:
 msgid "Easy"
-msgstr "FÃ cil"
+msgstr "Fàcil"
 
 msgid "Medium"
 msgstr "Mitg"
 
 msgid "Hard"
-msgstr "DifÃcil"
+msgstr "Difícil"
 
 #types of games
 msgid "Comet Zap"
@@ -93,10 +93,10 @@
 msgstr "Sortir"
 
 msgid "Setup Keyboard"
-msgstr "ConfiguraciÃ³ del teclat"
+msgstr "Configuració del teclat"
 
 msgid "Setup Language"
-msgstr "ConfiguraciÃ³ de l'idioma"
+msgstr "Configuració de l'idioma"
 
 #work in progress stuff
 msgid "Work In Progress!"

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,9 +1,10 @@
 msgid ""
 msgstr ""
+""
 "Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
 "PO-Revision-Date: 2003-05-08 17:58+0200\n"
 "Language-Team: Danish\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
@@ -11,10 +12,10 @@
 msgstr "Tillykke!"
 
 msgid "Oh No!"
-msgstr "Ã…h nej!"
+msgstr "Åh nej!"
 
 msgid "Sound & Music Disabled"
-msgstr "Lyd og musik slÃ¥et fra"
+msgstr "Lyd og musik slået fra"
 
 msgid "Paused!"
 msgstr "Pause!"
@@ -23,7 +24,7 @@
 msgstr "Tryk escape igen for at komme tilbage til menuen"
 
 msgid "Press space bar to return to game"
-msgstr "Tryk pÃ¥ mellemrumstasten for at spille videre"
+msgstr "Tryk på mellemrumstasten for at spille videre"
 
 msgid "Sound Effects Volume"
 msgstr "Lydeffekternes styrke"
@@ -32,7 +33,7 @@
 msgstr "Musikkens styrke"
 
 msgid "Edit Word Lists"
-msgstr "RedigÃ©r ordlister"
+msgstr "Redigér ordlister"
 
 msgid "Fish"
 msgstr "Fisk"
@@ -44,7 +45,7 @@
 msgstr "Niveau"
 
 msgid "Options"
-msgstr "Indstillinger"
+msgstr "Indstilling"
 
 msgid "Alphabet"
 msgstr "Alfabetet"
@@ -55,7 +56,7 @@
 
 # "Pilot" is level 2 in comet zap
 msgid "Pilot"
-msgstr "TrÃ¦net"
+msgstr "Trænet"
 
 # "Ace" is level 3 in comet zap
 msgid "Ace"
@@ -65,7 +66,7 @@
 msgid "Commander"
 msgstr "Uovertruffen"
 
-# levels for Cascade game:
+#levels for Cascade game:
 msgid "Easy"
 msgstr "Let"
 
@@ -73,18 +74,18 @@
 msgstr "Mellem"
 
 msgid "Hard"
-msgstr "HÃ¥rd"
+msgstr "Hård"
 
-# types of games
+#types of games
 msgid "Comet Zap"
 msgstr "Plaf kometer"
 
 msgid "Fish Cascade"
 msgstr "Fiskeregn"
 
-# general stuff
+#general stuff
 msgid "Practice"
-msgstr "Ã˜v dig!"
+msgstr "Øv dig!"
 
 msgid "Lessons"
 msgstr "Lektioner"
@@ -95,6 +96,9 @@
 msgid "Main Menu"
 msgstr "Hovedmenu"
 
+msgid "Options"
+msgstr "Indstillinger"
+
 msgid "Quit"
 msgstr "Afslut"
 
@@ -102,14 +106,15 @@
 msgstr "Indstil tastatur"
 
 msgid "Setup Language"
-msgstr "VÃ¦lg sprog"
+msgstr "Vælg sprog"
 
-# work in progress stuff
+#work in progress stuff
 msgid "Work In Progress!"
-msgstr "Der arbejdes pÃ¥ sagen!"
+msgstr "Der arbejdes på sagen!"
 
 msgid "This feature is not ready yet"
 msgstr "Denne feature er ikke klar endnu"
 
 msgid "Discuss the future of TuxTyping at"
-msgstr "DiskutÃ©r TuxTypings fremtid pÃ¥"
+msgstr "Diskutér TuxTypings fremtid på"
+

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -3,33 +3,33 @@
 "Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
 "PO-Revision-Date: 2003-06-14 19:00+0000\n"
 "Language-Team: German\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
 msgid "Congratulations"
-msgstr "Herzlichen GlÃ¼ckwunsch!"
+msgstr "Herzlichen Glückwunsch!"
 
 msgid "Oh No!"
 msgstr "Oh Nein!"
 
 msgid "Sound & Music Disabled"
-msgstr "Musik & KlÃ¤nge aus"
+msgstr "Musik & Klänge aus"
 
 msgid "Paused!"
 msgstr "Pause!"
 
 msgid "Press escape again to return to menu"
-msgstr "DrÃ¼cke Escape um zum MenÃ¼ zurÃ¼ckzukehren"
+msgstr "Drücke Escape um zum Menü zurückzukehren"
 
 msgid "Press space bar to return to game"
-msgstr "DrÃ¼cke die Leertaste um weiterzuspielen"
+msgstr "Drücke die Leertaste um weiterzuspielen"
 
 msgid "Sound Effects Volume"
-msgstr "LautstÃ¤rke Soundeffekte"
+msgstr "Lautstärke Soundeffekte"
 
 msgid "Music Volume"
-msgstr "LautstÃ¤rke Musik"
+msgstr "Lautstärke Musik"
 
 msgid "Edit Word Lists"
 msgstr "Wortlisten bearbeiten"
@@ -54,7 +54,7 @@
 
 # "Space Cadet" is level 1 in comet zap
 msgid "Space Cadet"
-msgstr "AnfÃ¤nger"
+msgstr "Anfänger"
 
 # "Pilot" is level 2 in comet zap
 msgid "Pilot"
@@ -68,7 +68,7 @@
 msgid "Commander"
 msgstr "Unbesiegbar"
 
-# levels for Cascade game:
+#levels for Cascade game:
 msgid "Easy"
 msgstr "Einfach"
 
@@ -78,16 +78,16 @@
 msgid "Hard"
 msgstr "Schwer"
 
-# types of games
+#types of games
 msgid "Comet Zap"
 msgstr "Kometenabwehr"
 
 msgid "Fish Cascade"
 msgstr "Fischregen"
 
-# general stuff
+#general stuff
 msgid "Practice"
-msgstr "FingerÃ¼bung"
+msgstr "Fingerübung"
 
 msgid "Lessons"
 msgstr "Lektionen"
@@ -96,8 +96,11 @@
 msgstr "Anleitung"
 
 msgid "Main Menu"
-msgstr "HauptmenÃ¼"
+msgstr "Hauptmenü"
 
+msgid "Options"
+msgstr "Optionen"
+
 msgid "Quit"
 msgstr "Ende"
 
@@ -110,7 +113,7 @@
 msgid "Word Cascade"
 msgstr "Wortregen"
 
-# work in progress stuff
+#work in progress stuff
 msgid "Work In Progress!"
 msgstr "In Arbeit!"
 

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3-mit.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3-mit.txt	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3-mit.txt	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,19 +1,19 @@
-Kurze WÃ¶rter (mit Ã„Ã–ÃœÃŸ)
-# Hier kannst du selber WÃ¶rter hinzufÃ¼gen.
+Kurze Wörter (mit ÄÖÜß)
+# Hier kannst du selber Wörter hinzufügen.
 # Zeilen die mit '#' beginnen und Leerzeilen werden ignoriert.
-# Es sind HÃ¶chstens 200 Zeilen pro Datei erlaubt
-Ã–L
-BÃ„R
-FÃ–N
-FÃœR
-FUÃŸ
-JÃ„H
-KÃœR
-MAÃŸ
-MUÃŸ
-Ã–HR
-Ã–SE
-RUÃŸ
-SÃœÃŸ
-TÃœR
-ZÃ„H
+# Es sind Höchstens 200 Zeilen pro Datei erlaubt
+ÖL
+BÄR
+FÖN
+FÜR
+FUß
+JÄH
+KÜR
+MAß
+MUß
+ÖHR
+ÖSE
+RUß
+SÜß
+TÜR
+ZÄH

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3.txt	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/kurz2-3.txt	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,7 +1,7 @@
-Kurze WÃ¶rter (gemischt)
-# Hier kannst du selber WÃ¶rter hinzufÃ¼gen.
+Kurze Wörter (gemischt)
+# Hier kannst du selber Wörter hinzufügen.
 # Zeilen die mit '#' beginnen und Leerzeilen werden ignoriert.
-# Es sind HÃ¶chstens 200 Zeilen pro Datei erlaubt
+# Es sind Höchstens 200 Zeilen pro Datei erlaubt
 AB
 AM
 AN
@@ -15,7 +15,7 @@
 IN
 JA
 OB
-Ã–L
+ÖL
 PO
 SO
 UM
@@ -29,7 +29,7 @@
 ART
 AUF
 BAD
-BÃ„R
+BÄR
 BAU
 BEI
 BIN
@@ -47,9 +47,9 @@
 ENG
 FEE
 FIX
-FÃ–N
-FÃœR
-FUÃŸ
+FÖN
+FÜR
+FUß
 GAR
 GAS
 GUT
@@ -62,12 +62,12 @@
 IHN
 IHR
 IST
-JÃ„H
+JÄH
 JUX
 KAP
 KUH
 KUR
-KÃœR
+KÜR
 LAS
 LAX
 LID
@@ -78,10 +78,10 @@
 MAI
 MAL
 MAN
-MAÃŸ
+MAß
 MET
 MIT
-MUÃŸ
+MUß
 NAH
 NEU
 NIE
@@ -90,11 +90,11 @@
 NUR
 OFT
 OHR
-Ã–HR
+ÖHR
 OMA
 OPA
 ORT
-Ã–SE
+ÖSE
 PER
 PIK
 POL
@@ -107,12 +107,12 @@
 ROM
 ROT
 RUF
-RUÃŸ
+RUß
 SAU
 SEE
 SIE
 SKI
-SÃœÃŸ
+SÜß
 TAG
 TAL
 TAT
@@ -121,7 +121,7 @@
 TON
 TOR
 TOT
-TÃœR
+TÜR
 TUX
 TYP
 UHR
@@ -140,7 +140,7 @@
 WIE
 WIR
 WUT
-ZÃ„H
+ZÄH
 ZEH
 ZOO
 ZUG

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8-mit.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8-mit.txt	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8-mit.txt	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,10 +1,10 @@
-Lange WÃ¶rter (mit Ã„Ã–ÃœÃŸ)
-# Hier kannst du selber WÃ¶rter hinzufÃ¼gen.
+Lange Wörter (mit ÄÖÜß)
+# Hier kannst du selber Wörter hinzufügen.
 # Zeilen die mit '#' beginnen und Leerzeilen werden ignoriert.
-# Es sind HÃ¶chstens 200 Zeilen pro Datei erlaubt
-BÃ„UERIN
-LÃ„CHELN
-MÃ„DCHEN
-SCHÃœLER
-ÃœBERALL
-FRÃœHLING
+# Es sind Höchstens 200 Zeilen pro Datei erlaubt
+BÄUERIN
+LÄCHELN
+MÄDCHEN
+SCHÜLER
+ÜBERALL
+FRÜHLING

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8.txt	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/lang7-8.txt	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,13 +1,13 @@
-Lange WÃ¶rter (gemischt)
-# Hier kannst du selber WÃ¶rter hinzufÃ¼gen.
+Lange Wörter (gemischt)
+# Hier kannst du selber Wörter hinzufügen.
 # Zeilen die mit '#' beginnen und Leerzeilen werden ignoriert.
-# Es sind HÃ¶chstens 200 Zeilen pro Datei erlaubt
+# Es sind Höchstens 200 Zeilen pro Datei erlaubt
 ACHTUNG
 ACHTZIG
 ANTWORT
 APPETIT
 BAHNHOF
-BÃ„UERIN
+BÄUERIN
 BESETZT
 COUSINE
 DAGEGEN
@@ -24,9 +24,9 @@
 KELLNER
 KETCHUP
 KIRSCHE
-LÃ„CHELN
+LÄCHELN
 LANGSAM
-MÃ„DCHEN
+MÄDCHEN
 MILLION
 NACHBAR
 NASHORN
@@ -48,7 +48,7 @@
 SCHRANK
 SCHRECK
 SCHRITT
-SCHÃœLER
+SCHÜLER
 SCHWACH
 SCHWARZ
 SCHWEIN
@@ -69,7 +69,7 @@
 TEPPICH
 TOCHTER
 TROCKEN
-ÃœBERALL
+ÜBERALL
 UNDICHT
 VERKEHR
 VIERZIG
@@ -89,7 +89,7 @@
 ELEPHANT
 ERDBEERE
 FREUNDIN
-FRÃœHLING
+FRÜHLING
 GEWITTER
 LIMONADE
 LUTSCHER

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6-mit.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6-mit.txt	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6-mit.txt	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,42 +1,42 @@
-Mittellange WÃ¶rter (mit Ã„Ã–ÃœÃŸ)
-# Hier kannst du selber WÃ¶rter hinzufÃ¼gen.
+Mittellange Wörter (mit ÄÖÜß)
+# Hier kannst du selber Wörter hinzufügen.
 # Zeilen die mit '#' beginnen und Leerzeilen werden ignoriert.
-# Es sind HÃ¶chstens 200 Zeilen pro Datei erlaubt
-FÃœNF
-GROÃŸ
-GRÃœN
-KÃ„SE
-KÃ–LN
-KÃœHL
-LÃ„RM
-LÃ–WE
-MÃ„RZ
-MÃ–WE
-MÃœLL
-ÃœBEN
-ÃœBER
-WEIÃŸ
-DAFÃœR
-FÃ„HRE
-GLÃœCK
-HÃœFTE
-HÃœGEL
-KÃœSTE
-LÃ„NGE
-MÃ–BEL
-MÃ–GEN
-MÃ–HRE
-SCHÃ–N
-STÃœCK
-SÃœDEN
-ZÃœGEL
-ZWÃ–LF
-BRÃœCKE
-FÃœNZIG
-HEIÃŸEN
-KÃ–RPER
-LÃ–FFEL
-SPÃœLEN
-SÃœDPOL
-WÃ„SCHE
-ZURÃœCK
+# Es sind Höchstens 200 Zeilen pro Datei erlaubt
+FÜNF
+GROß
+GRÜN
+KÄSE
+KÖLN
+KÜHL
+LÄRM
+LÖWE
+MÄRZ
+MÖWE
+MÜLL
+ÜBEN
+ÜBER
+WEIß
+DAFÜR
+FÄHRE
+GLÜCK
+HÜFTE
+HÜGEL
+KÜSTE
+LÄNGE
+MÖBEL
+MÖGEN
+MÖHRE
+SCHÖN
+STÜCK
+SÜDEN
+ZÜGEL
+ZWÖLF
+BRÜCKE
+FÜNZIG
+HEIßEN
+KÖRPER
+LÖFFEL
+SPÜLEN
+SÜDPOL
+WÄSCHE
+ZURÜCK

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6.txt	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/mittel4-6.txt	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,7 +1,7 @@
-Mittellange WÃ¶rter (gemischt)
-# Hier kannst du selber WÃ¶rter hinzufÃ¼gen.
+Mittellange Wörter (gemischt)
+# Hier kannst du selber Wörter hinzufügen.
 # Zeilen die mit '#' beginnen und Leerzeilen werden ignoriert.
-# Es sind HÃ¶chstens 200 Zeilen pro Datei erlaubt
+# Es sind Höchstens 200 Zeilen pro Datei erlaubt
 ACHT
 AFFE
 ALLE
@@ -57,7 +57,7 @@
 FRAU
 FREI
 FROH
-FÃœNF
+FÜNF
 GANS
 GANZ
 GAST
@@ -68,8 +68,8 @@
 GOLD
 GOTT
 GRAS
-GROÃŸ
-GRÃœN
+GROß
+GRÜN
 GUSS
 HAAR
 HAHN
@@ -103,7 +103,7 @@
 KALK
 KALT
 KARO
-KÃ„SE
+KÄSE
 KEIN
 KERN
 KILO
@@ -111,32 +111,32 @@
 KINO
 KOCH
 KOHL
-KÃ–LN
+KÖLN
 KOPF
 KORN
 KRAN
-KÃœHL
+KÜHL
 KUSS
 LAHM
 LAND
 LANG
-LÃ„RM
+LÄRM
 LAUT
 LEER
 LIED
 LILA
 LOCH
-LÃ–WE
+LÖWE
 LUFT
 MAMA
 MANN
-MÃ„RZ
+MÄRZ
 MAUS
 MEER
 MIST
 MOND
-MÃ–WE
-MÃœLL
+MÖWE
+MÜLL
 MUND
 NAME
 NASE
@@ -198,8 +198,8 @@
 TOPF
 TUCH
 TURM
-ÃœBEN
-ÃœBER
+ÜBEN
+ÜBER
 UFER
 VATI
 VIER
@@ -212,7 +212,7 @@
 WAND
 WARM
 WEIN
-WEIÃŸ
+WEIß
 WILD
 WIND
 WITZ
@@ -251,7 +251,7 @@
 CLOWN
 DABEI
 DACHS
-DAFÃœR
+DAFÜR
 DAMPF
 DANKE
 DARUM
@@ -267,7 +267,7 @@
 ERNST
 ERNTE
 ESSIG
-FÃ„HRE
+FÄHRE
 FAHRT
 FISCH
 FLACH
@@ -277,7 +277,7 @@
 GEGEN
 GENAU
 GLEIS
-GLÃœCK
+GLÜCK
 GRAMM
 GRIFF
 HAFEN
@@ -287,8 +287,8 @@
 HOLEN
 HONIG
 HOTEL
-HÃœFTE
-HÃœGEL
+HÜFTE
+HÜGEL
 INSEL
 JACKE
 JUNGE
@@ -302,9 +302,9 @@
 KREUZ
 KRONE
 KUGEL
-KÃœSTE
+KÜSTE
 LAMPE
-LÃ„NGE
+LÄNGE
 LEBEN
 LEGEN
 LEISE
@@ -315,9 +315,9 @@
 MAUER
 METER
 MILCH
-MÃ–BEL
-MÃ–GEN
-MÃ–HRE
+MÖBEL
+MÖGEN
+MÖHRE
 MONAT
 MOTOR
 MUSIK
@@ -349,7 +349,7 @@
 RIESE
 SAGEN
 SCHON
-SCHÃ–N
+SCHÖN
 SCHUH
 SECHS
 SEITE
@@ -367,12 +367,12 @@
 STIFT
 STOCK
 STROH
-STÃœCK
+STÜCK
 STUFE
 STUHL
 STUMM
 SUCHE
-SÃœDEN
+SÜDEN
 SUPPE
 TAFEL
 TANNE
@@ -405,11 +405,11 @@
 WIESO
 WOLKE
 WOLLE
-ZÃœGEL
+ZÜGEL
 ZUNGE
 ZWEIG
 ZWERG
-ZWÃ–LF
+ZWÖLF
 ANFANG
 ARBEIT
 AUGUST
@@ -418,7 +418,7 @@
 BESSER
 BEUTEL
 BRILLE
-BRÃœCKE
+BRÜCKE
 BRUDER
 BUTTER
 COUSIN
@@ -433,7 +433,7 @@
 FRISUR
 FROSCH
 FRUCHT
-FÃœNZIG
+FÜNZIG
 FUTTER
 GARTEN
 GEBURT
@@ -444,7 +444,7 @@
 HALTEN
 HAMMER
 HANDEL
-HEIÃŸEN
+HEIßEN
 HERBST
 HIMMEL
 HINKEN
@@ -459,14 +459,14 @@
 KNOTEN
 KOCHEN
 KOFFER
-KÃ–RPER
+KÖRPER
 KUCHEN
 LACHEN
 LEHRER
 LEITER
 LENKEN
 LERNEN
-LÃ–FFEL
+LÖFFEL
 MACHEN
 MANDEL
 MELDEN
@@ -502,11 +502,11 @@
 SITZEN
 SOMMER
 SPAREN
-SPÃœLEN
+SPÜLEN
 STEHEN
 STRAND
 STUNDE
-SÃœDPOL
+SÜDPOL
 TASCHE
 TELLER
 TOMATE
@@ -521,7 +521,7 @@
 WAFFEL
 WAGGON
 WARTEN
-WÃ„SCHE
+WÄSCHE
 WASSER
 WECKEN
 WECKER
@@ -538,4 +538,4 @@
 ZETTEL
 ZIMMER
 ZIRKEL
-ZURÃœCK
+ZURÜCK

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -89,6 +89,9 @@
 msgid "Main Menu"
 msgstr "Menu principal"
 
+msgid "Options"
+msgstr "Opciones"
+
 msgid "Quit"
 msgstr "Salido"
 
@@ -108,4 +111,4 @@
 msgid "Discuss the future of TuxTyping at"
 msgstr "A Charlar del futuro de TuxTyping"
 
-#Ã Ã¡Ã¢Ã£Ã¤Ã¥Ã¦Ã§Ã¨Ã©ÃªÃ«Ã¬ÃÃ®Ã¯Ã°Ã±Ã²Ã³Ã´ÃµÃ¶Ã¹ÃºÃ»Ã¼Ã½Ã¿
+#àáâãäåæçèéêëìíîïðñòóôõöùúûüýÿ

Modified: tuxtype/trunk/tuxtype/data/themes/french/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/french/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -2,13 +2,13 @@
 msgstr "le "
 
 msgid "Congratulations"
-msgstr "FÃ©licitations"
+msgstr "Félicitations"
 
 msgid "Oh No!"
 msgstr "Oh Non!"
 
 msgid "Sound & Music Disabled"
-msgstr "Son & Musique Ã©teints"
+msgstr "Son & Musique éteints"
 
 msgid "Paused!"
 msgstr "Pause!"
@@ -71,7 +71,7 @@
 
 #types of games
 msgid "Comet Zap"
-msgstr "Destruction de ComÃ¨tes"
+msgstr "Destruction de Comètes"
 
 msgid "Fish Cascade"
 msgstr "Cascade de Poissons"
@@ -81,7 +81,7 @@
 msgstr "Pratique"
 
 msgid "Lessons"
-msgstr "LeÃ§ons"
+msgstr "Leçons"
 
 msgid "Instructions"
 msgstr "Instructions"
@@ -89,21 +89,24 @@
 msgid "Main Menu"
 msgstr "Menu Principal"
 
+msgid "Options"
+msgstr "Options"
+
 msgid "Quit"
 msgstr "Quitter"
 
 msgid "Setup Keyboard"
-msgstr "RÃ©gler le clavier"
+msgstr "Régler le clavier"
 
 msgid "Setup Language"
-msgstr "RÃ©gler la langue"
+msgstr "Régler la langue"
 
 #work in progress stuff
 msgid "Work In Progress!"
 msgstr "En cours de construction!"
 
 msgid "this feature is not ready yet"
-msgstr "Cette fonctionnalitÃ© n'est pas terminÃ©e"
+msgstr "Cette fonctionnalité n'est pas terminée"
 
 msgid "Discuss the future of TuxTyping at"
 msgstr "Parler du futur de TuxTyping a"

Modified: tuxtype/trunk/tuxtype/data/themes/greek/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/greek/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -2,109 +2,109 @@
 msgstr ""
 
 msgid "Congratulations"
-msgstr "Î£Ï…Î³Ï‡Î±ÏÎ·Ï„Î®ÏÎ¹Î±"
+msgstr "Óõã÷áñçôÞñéá"
 
 msgid "Oh No!"
-msgstr "Î©Ï‡! ÎŒÏ‡Î¹"
+msgstr "Ù÷! ¼÷é"
 
 msgid "Sound & Music Disabled"
-msgstr "Î§Ï‰ÏÎ¯Ï‚ Î‰Ï‡Î¿ ÎºÎ±Î¹ ÎœÎ¿Ï…ÏƒÎ¹ÎºÎ®"
+msgstr "×ùñßò ¹÷ï êáé ÌïõóéêÞ"
 
 msgid "Paused!"
-msgstr "Î Î¬Ï…ÏƒÎ·"
+msgstr "ÐÜõóç"
 
 msgid "Press escape again to return to menu"
-msgstr "Î Î¬Ï„Î± Î¾Î±Î½Î¬ Ï„Î¿ Esc Î³Î¹Î± Î½Î± Î³Ï…ÏÎ¯ÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¹Ï‚ ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚"
+msgstr "ÐÜôá îáíÜ ôï Esc ãéá íá ãõñßóåéò óôéò åðéëïãÝò"
 
 msgid "Press space bar to return to game"
-msgstr "Î Î¬Ï„Î± Ï„Î¿ ÎºÎµÎ½ÏŒ Î³Î¹Î± Î½Î± Î³Ï…ÏÎ¯ÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¿ Ï€Î±Î¹Ï‡Î½Î¯Î´Î¹"
+msgstr "ÐÜôá ôï êåíü ãéá íá ãõñßóåéò óôï ðáé÷íßäé"
 
 msgid "Sound Effects Volume"
-msgstr "ÎˆÎ½Ï„Î±ÏƒÎ· Î—Ï‡Î·Ï„Î¹ÎºÏŽÎ½ Î•Ï†Ï†Î"
+msgstr "¸íôáóç Ç÷çôéêþí ÅööÝ"
 
 msgid "Music Volume"
-msgstr "ÎˆÎ½Ï„Î±ÏƒÎ· Î‰Ï‡Î¿Ï…"
+msgstr "¸íôáóç ¹÷ïõ"
 
 msgid "Edit Word Lists"
-msgstr "Î”Î¹ÏŒÏÎ¸Ï‰ÏƒÎµ Ï„Î¹Ï‚ Î›Î¯ÏƒÏ„ÎµÏ‚ Î›ÎÎ¾ÎµÏ‰Î½"
+msgstr "Äéüñèùóå ôéò Ëßóôåò ËÝîåùí"
 
 msgid "Fish"
-msgstr "Î¨Î¬ÏÎ¹Î±"
+msgstr "ØÜñéá"
 
 msgid "Lives"
-msgstr "Î–Ï‰ÎÏ‚"
+msgstr "ÆùÝò"
 
 msgid "Level"
-msgstr "Î•Ï€Î¯Ï€ÎµÎ´Î¿"
+msgstr "Åðßðåäï"
 
 msgid "Alphabet"
-msgstr "Î‘Î»Ï†Î¬Î²Î·Ï„Î¿"
+msgstr "ÁëöÜâçôï"
 
 # "Space Cadet" is level 1 in comet zap
 msgid "Space Cadet"
-msgstr "1. ÎœÎ±Î¸Î·Ï„ÎµÏ…ÏŒÎ¼ÎµÎ½Î¿Ï‚"
+msgstr "1. Ìáèçôåõüìåíïò"
 
 # "Pilot" is level 2 in comet zap
 msgid "Pilot"
-msgstr "2. Î Î¹Î»ÏŒÏ„Î¿Ï‚"
+msgstr "2. Ðéëüôïò"
 
 # "Ace" is level 3 in comet zap
 msgid "Ace"
-msgstr "3. Î†ÏƒÏƒÎ¿Ï‚"
+msgstr "3. ¢óóïò"
 
 # "Commander" is level 4 in comet zap
 msgid "Commander"
-msgstr "4. Î’ÎµÏ„ÎµÏÎ¬Î½Î¿Ï‚"
+msgstr "4. ÂåôåñÜíïò"
 
 #levels for Cascade game:
 msgid "Easy"
-msgstr "1. Î•ÏÎºÎ¿Î»Î¿"
+msgstr "1. Åýêïëï"
 
 msgid "Medium"
-msgstr "2. ÎšÎ±Î½Î¿Î½Î¹ÎºÏŒ"
+msgstr "2. Êáíïíéêü"
 
 msgid "Hard"
-msgstr "3. Î”ÏÏƒÎºÎ¿Î»Î¿"
+msgstr "3. Äýóêïëï"
 
 #types of games
 msgid "Comet Zap"
-msgstr "ÎšÎ¿Î¼Î®Ï„ÎµÏ‚"
+msgstr "ÊïìÞôåò"
 
 msgid "Fish Cascade"
-msgstr "Î¦Î¬Îµ Ï„Î± Î¨Î±ÏÎ¬ÎºÎ¹Î±"
+msgstr "ÖÜå ôá ØáñÜêéá"
 
 #general stuff
 msgid "Practice"
-msgstr "Î•Î¾Î¬ÏƒÎºÎ·ÏƒÎ·"
+msgstr "ÅîÜóêçóç"
 
 msgid "Lessons"
-msgstr "ÎœÎ±Î¸Î®Î¼Î±Ï„Î±"
+msgstr "ÌáèÞìáôá"
 
 msgid "Instructions"
-msgstr "ÎŸÎ´Î·Î³Î¯ÎµÏ‚"
+msgstr "Ïäçãßåò"
 
 msgid "Main Menu"
-msgstr "Î’Î±ÏƒÎ¹ÎºÏŒ ÎœÎµÎ½Î¿Ï"
+msgstr "Âáóéêü Ìåíïý"
 
 msgid "Options"
-msgstr "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚"
+msgstr "ÅðéëïãÝò"
 
 msgid "Quit"
-msgstr "Î¤ÎÎ»Î¿Ï‚"
+msgstr "ÔÝëïò"
 
 msgid "Setup Keyboard"
-msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Î Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î¯Î¿Ï…"
+msgstr "Ñýèìéóç Ðëçêôñïëïãßïõ"
 
 msgid "Setup Language"
-msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Î“Î»ÏŽÏƒÏƒÎ±Ï‚"
+msgstr "Ñýèìéóç Ãëþóóáò"
 
 #work in progress stuff
 msgid "Work In Progress!"
-msgstr "Î•ÏÎ³Î±ÏƒÎ¯Î± ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î·"
+msgstr "Åñãáóßá óå åîÝëéîç"
 
 msgid "This feature is not ready yet"
-msgstr "Î‘Ï…Ï„ÏŒ Ï„Î¿ ÎºÎ¿Î¼Î¼Î¬Ï„Î¹ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±ÎºÏŒÎ¼Î· ÎÏ„Î¿Î¹Î¼Î¿"
+msgstr "Áõôü ôï êïììÜôé äåí åßíáé áêüìç Ýôïéìï"
 
 msgid "Discuss the future of TuxTyping at"
-msgstr "Î£Ï‡ÏŒÎ»Î¹Î± Î³Î¹Î± Ï„Î¿ TuxTyping"
+msgstr "Ó÷üëéá ãéá ôï TuxTyping"
 

Modified: tuxtype/trunk/tuxtype/data/themes/italian/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/italian/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -14,7 +14,7 @@
 msgstr "In pausa"
 
 msgid "Press escape again to return to menu"
-msgstr "premi di nuovo ESC per ritornare al menÃ¹"
+msgstr "premi di nuovo ESC per ritornare al menù"
 
 msgid "Press space bar to return to game"
 msgstr "premi SPAZIO per ritornare al gioco"
@@ -84,7 +84,7 @@
 msgstr "Istruzioni"
 
 msgid "Main Menu"
-msgstr "MenÃ¹ principale"
+msgstr "Menù principale"
 
 msgid "Options"
 msgstr "Opzioni"
@@ -103,7 +103,7 @@
 msgstr "Lavori in corso!"
 
 msgid "This feature is not ready yet"
-msgstr "Questa caratteristica non Ã¨ ancora supportata..."
+msgstr "Questa caratteristica non è ancora supportata..."
 
 msgid "Discuss the future of TuxTyping at"
 msgstr "Discuti del futuro di TuxTyping su:"

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -6,6 +6,9 @@
 "Content-Type: text/plain; charset=Windows-1257\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid ""
+msgstr ""
+
 msgid "Congratulations"
 msgstr "Sveikiname!"
 
@@ -13,37 +16,37 @@
 msgstr "Deja..."
 
 msgid "Sound & Music Disabled"
-msgstr "Garsas iÅ¡jungtas"
+msgstr "Garsas iðjungtas"
 
 msgid "Paused!"
 msgstr "Pertrauka!"
 
 msgid "Press escape again to return to menu"
-msgstr "Jei norite grÄ¯Å¾ti Ä¯ meniu, paspauskite grÄ¯Å¾imo klaviÅ¡Ä…"
+msgstr "Jei norite gráþti á meniu, paspauskite gráþimo klaviðà"
 
 msgid "Press space bar to return to game"
-msgstr "Jei norite grÄ¯Å¾ti Ä¯ Å¾aidimÄ…, paspauskite tarpo klaviÅ¡Ä…"
+msgstr "Jei norite gráþti á þaidimà, paspauskite tarpo klaviðà"
 
 msgid "Sound Effects Volume"
-msgstr "SignalÅ³ garsumas"
+msgstr "Signalø garsumas"
 
 msgid "Music Volume"
 msgstr "Muzikos garsumas"
 
 msgid "Edit Word Lists"
-msgstr "Modifikuoti Å¾odÅ¾iÅ³ sÄ…raÅ¡us"
+msgstr "Modifikuoti þodþiø sàraðus"
 
 msgid "Fish"
-msgstr "Å½uvÅ³:"
+msgstr "Þuvø:"
 
 msgid "Lives"
-msgstr "MeÅ¡keriÅ³:"
+msgstr "Meðkeriø:"
 
 msgid "Level"
 msgstr "lygis"
 
 msgid "Alphabet"
-msgstr "AbÄ—cÄ—lÄ—"
+msgstr "Abëcëlë"
 
 # "Space Cadet" is level 1 in comet zap
 msgid "Space Cadet"
@@ -51,7 +54,7 @@
 
 # "Pilot" is level 2 in comet zap
 msgid "Pilot"
-msgstr "PatyrÄ™s"
+msgstr "Patyræs"
 
 # "Ace" is level 3 in comet zap
 msgid "Ace"
@@ -73,20 +76,20 @@
 
 #types of games
 msgid "Comet Zap"
-msgstr "KometÅ³ lietus"
+msgstr "Kometø lietus"
 
 msgid "Fish Cascade"
-msgstr "Å½uvÅ³ lietus"
+msgstr "Þuvø lietus"
 
 #general stuff
 msgid "Practice"
-msgstr "PirÅ¡tÅ³ pratimai"
+msgstr "Pirðtø pratimai"
 
 msgid "Lessons"
-msgstr "Pamokos (dar nÄ—ra)"
+msgstr "Pamokos (dar nëra)"
 
 msgid "Instructions"
-msgstr "Nurodymai (dar nÄ—ra)"
+msgstr "Nurodymai (dar nëra)"
 
 msgid "Main Menu"
 msgstr "Pagrindinis meniu"
@@ -98,20 +101,20 @@
 msgstr "Baigti"
 
 msgid "Setup Keyboard"
-msgstr "KlaviatÅ«ros nustatymas"
+msgstr "Klaviatûros nustatymas"
 
 msgid "Project Info"
-msgstr "Apie Tuxtype (anglÅ³ k.)"
+msgstr "Apie "Tuxtype" (anglø k.)"
 
 msgid "Setup Language"
 msgstr "Kalbos parinkimas"
 
 #work in progress stuff
 msgid "Work In Progress!"
-msgstr "Å i programos dalis dar daroma!"
+msgstr "Ði programos dalis dar daroma!"
 
 msgid "This feature is not ready yet"
 msgstr "Kol kas ji dar nebaigta"
 
 msgid "Discuss the future of TuxTyping at"
-msgstr "Diskusijos apie Tux Typing vyksta adresu"
+msgstr "Diskusijos apie "Tux Typing" vyksta adresu:"

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -89,6 +89,9 @@
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
+msgid "Options"
+msgstr "Opties"
+
 msgid "Quit"
 msgstr "Stoppen"
 

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -10,7 +10,7 @@
 "Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
@@ -21,19 +21,19 @@
 msgstr "Musikk"
 
 msgid "Sound & Music Disabled"
-msgstr "Lyd og musikk avslÃ¥tt"
+msgstr "Lyd og musikk avslått"
 
 msgid "Paused!"
 msgstr "Pause!"
 
 msgid "Press escape again to return to menu"
-msgstr "Trykk Â«EscapeÂ» for Ã¥ gÃ¥ tilbake til hovudmenyen."
+msgstr "Trykk «Escape» for å gå tilbake til hovudmenyen."
 
 msgid "Press space bar to return to game"
-msgstr "Trykk mellomromstasten for Ã¥ gÃ¥ tilbake til spelet."
+msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
 
 msgid "Level"
-msgstr "NivÃ¥"
+msgstr "Nivå"
 
 msgid "Lives"
 msgstr "Liv"
@@ -51,7 +51,7 @@
 msgstr "Vanskeleg"
 
 msgid "Practice"
-msgstr "Ã˜ving"
+msgstr "Øving"
 
 msgid "Congratulations"
 msgstr "Gratulerer!"
@@ -66,7 +66,7 @@
 msgstr "Denne funksjonen er ikkje klar enno."
 
 msgid "Discuss the future of TuxTyping at"
-msgstr "Diskuter neste versjon av Tux Typing pÃ¥"
+msgstr "Diskuter neste versjon av Tux Typing på"
 
 msgid "Alphabet"
 msgstr "Alfabetet"
@@ -87,7 +87,7 @@
 msgstr "Erfaren"
 
 msgid "Lessons"
-msgstr "OpplÃ¦ring"
+msgstr "Opplæring"
 
 msgid "Ace"
 msgstr "Profesjonell"
@@ -106,7 +106,7 @@
 msgstr "Ekspert"
 
 msgid "Setup Language"
-msgstr "SprÃ¥k"
+msgstr "Språk"
 
 msgid "Quit"
 msgstr "Avslutt"

Modified: tuxtype/trunk/tuxtype/data/themes/russian/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/russian/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -2,123 +2,123 @@
 msgstr ""
 
 msgid "Congratulations"
-msgstr "â„–Ð¯ÐºÐ¤Ð²Ð¡Ð·Ð¬Ð±Ð¥Ð"
+msgstr "ðÏÚÄÒÁ×ÌÑÅÍ"
 
 msgid "Oh No!"
-msgstr "Ñ, Ð®Ð¥Ð´!"
+msgstr "ï, ÎÅÔ!"
 
 msgid "Sound & Music Disabled"
-msgstr "ÑšÐ·ÐµÐ«Ð© & ÑÐµÐºÐ¹Ð«Ð¡ Ð¯Ð´Ð«Ð¬Ð Ð¾Ð¥Ð®Ð¹"
+msgstr "ú×ÕËÉ & íÕÚÙËÁ ÏÔËÌÀÞÅÎÙ"
 
 msgid "Paused!"
-msgstr "â„–Ð¡ÐµÐºÐ¡!"
+msgstr "ðÁÕÚÁ!"
 
 msgid "Press escape again to return to menu"
-msgstr "ÑŽÐ¡Ð¶ÐÐ©Ð´Ð¥ Ð¥Ð½Ð¥ Ð²Ð¡Ðº escape Ð¤Ð¬Ð± Ð·Ð¯ÐºÐ·Ð²Ð¡Ð´Ð¡ Ð· ÐÐ¥Ð®Ð "
+msgstr "îÁÖÍÉÔÅ ÅÝÅ ÒÁÚ escape ÄÌÑ ×ÏÚ×ÒÁÔÁ × ÍÅÎÀ"
 
 msgid "Press space bar to return to game"
-msgstr "ÑŽÐ¡Ð¶ÐÐ©Ð´Ð¥ Ð°Ð²Ð¯Ð¢Ð¥Ð¬ Ð¤Ð¬Ð± Ð·Ð¯ÐºÐ·Ð²Ð¡Ð´Ð¡ Ð« Ð©Ð§Ð²Ð¥"
+msgstr "îÁÖÍÉÔÅ ÐÒÏÂÅÌ ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë ÉÇÒÅ"
 
 msgid "Sound Effects Volume"
-msgstr "Ñ‡Ð²Ð¯ÐÐ«Ð¯Ð³Ð´Ð¸ ÐºÐ·ÐµÐ«Ð¯Ð·Ð¹Ð¨ Ð¼Ð¦Ð¦Ð¥Ð«Ð´Ð¯Ð·"
+msgstr "çÒÏÍËÏÓÔØ Ú×ÕËÏ×ÙÈ ÜÆÆÅËÔÏ×"
 
 msgid "Music Volume"
-msgstr "Ñ‡Ð²Ð¯ÐÐ«Ð¯Ð³Ð´Ð¸ ÐÐµÐºÐ¹Ð«Ð©"
+msgstr "çÒÏÍËÏÓÔØ ÍÕÚÙËÉ"
 
 msgid "Edit Word Lists"
-msgstr "Ñ’Ð¥Ð¤Ð¡Ð«Ð´Ð©Ð²Ð¯Ð·Ð¡Ð®Ð©Ð¥ Ð³Ð°Ð©Ð³Ð«Ð¡ Ð³Ð¬Ð¯Ð·"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÐÉÓËÁ ÓÌÏ×"
 
 msgid "Fish"
-msgstr "Ñ’Ð¹Ð¢"
+msgstr "òÙÂ"
 
 msgid "Lives"
-msgstr "Ñ–Ð©ÐºÐ®Ð¥Ðª"
+msgstr "öÉÚÎÅÊ"
 
 msgid "Level"
-msgstr "Ñ•Ð²Ð¯Ð·Ð¥Ð®Ð¸"
+msgstr "õÒÏ×ÅÎØ"
 
 msgid "Alphabet"
-msgstr "ÑÐ¬Ð¦Ð¡Ð·Ð©Ð´"
+msgstr "áÌÆÁ×ÉÔ"
 
 msgid "Short Words"
-msgstr "Ñ‹Ð¯Ð²Ð¯Ð´Ð«Ð©Ð¥ Ð³Ð¬Ð¯Ð·Ð¡"
+msgstr "ëÏÒÏÔËÉÅ ÓÌÏ×Á"
 
 msgid "Medium Words"
-msgstr "Ñ“Ð²Ð¥Ð¤Ð®Ð©Ð¥ Ð³Ð¬Ð¯Ð·Ð¡"
+msgstr "óÒÅÄÎÉÅ ÓÌÏ×Á"
 
 msgid "Long Words"
-msgstr "Ñ„Ð¬Ð©Ð®Ð®Ð¹Ð¥ Ð³Ð¬Ð¯Ð·Ð¡"
+msgstr "äÌÉÎÎÙÅ ÓÌÏ×Á"
 
 # "Space Cadet" is level 1 in comet zap
 msgid "Space Cadet"
-msgstr "Ñ‹Ð¯Ð³ÐÐ©Ð¾Ð¥Ð³Ð«Ð©Ðª Ð«Ð¡Ð¤Ð¥Ð´"
+msgstr "ëÏÓÍÉÞÅÓËÉÊ ËÁÄÅÔ"
 
 # "Pilot" is level 2 in comet zap
 msgid "Pilot"
-msgstr "â„–Ð©Ð¬Ð¯Ð´"
+msgstr "ðÉÌÏÔ"
 
 # "Ace" is level 3 in comet zap
 msgid "Ace"
-msgstr "ÑÐ³"
+msgstr "áÓ"
 
 # "Commander" is level 4 in comet zap
 msgid "Commander"
-msgstr "Ñ‹Ð¡Ð°Ð©Ð´Ð¡Ð®"
+msgstr "ëÁÐÉÔÁÎ"
 
 #levels for Cascade game:
 msgid "Easy"
-msgstr "ÑŒÐ¥Ð§Ð«Ð©Ðª"
+msgstr "ìÅÇËÉÊ"
 
 msgid "Medium"
-msgstr "Ñ“Ð²Ð¥Ð¤Ð®Ð©Ðª"
+msgstr "óÒÅÄÎÉÊ"
 
 msgid "Hard"
-msgstr "Ñ“Ð¬Ð¯Ð¶Ð®Ð¹Ðª"
+msgstr "óÌÏÖÎÙÊ"
 
 #types of games
 msgid "Comet Zap"
-msgstr "â„–Ð¡Ð¤Ð¥Ð®Ð©Ð¥ Ð«Ð¯ÐÐ¥Ð´"
+msgstr "ðÁÄÅÎÉÅ ËÏÍÅÔ"
 
 msgid "Fish Cascade"
-msgstr "Ñ‹Ð¡Ð³Ð«Ð¡Ð¤ Ð²Ð¹Ð¢"
+msgstr "ëÁÓËÁÄ ÒÙÂ"
 
 #general stuff
 msgid "Lessons"
-msgstr "Ñ•Ð²Ð¯Ð«Ð©"
+msgstr "õÒÏËÉ"
 
 msgid "Practice"
-msgstr "â„–Ð²Ð¡Ð«Ð´Ð©Ð«Ð¡"
+msgstr "ðÒÁËÔÉËÁ"
 
 msgid "Instructions"
-msgstr "Ñ‰Ð®Ð³Ð´Ð²ÐµÐ«Ð£Ð©Ð©"
+msgstr "éÎÓÔÒÕËÃÉÉ"
 
 msgid "Main Menu"
-msgstr "Ñ‡Ð¬Ð¡Ð·Ð®Ð¯Ð¥ ÐÐ¥Ð®Ð "
+msgstr "çÌÁ×ÎÏÅ ÍÅÎÀ"
 
 msgid "Options"
-msgstr "â„–Ð¡Ð²Ð¡ÐÐ¥Ð´Ð²Ð¹"
+msgstr "ðÁÒÁÍÅÔÒÙ"
 
 msgid "Quit"
-msgstr "Ñ—Ð¹Ð¨Ð¯Ð¤"
+msgstr "÷ÙÈÏÄ"
 
 msgid "Setup Keyboard"
-msgstr "ÑŽÐ¡Ð³Ð´Ð²Ð¯ÐªÐ«Ð¡ Ð«Ð¬Ð¡Ð·Ð©Ð¡Ð´ÐµÐ²Ð¹"
+msgstr "îÁÓÔÒÏÊËÁ ËÌÁ×ÉÁÔÕÒÙ"
 
 msgid "Setup Screen"
-msgstr "ÑŽÐ¡Ð³Ð´Ð²Ð¯ÐªÐ«Ð¡ Ð¼Ð«Ð²Ð¡Ð®Ð¡"
+msgstr "îÁÓÔÒÏÊËÁ ÜËÒÁÎÁ"
 
 msgid "Setup Language"
-msgstr "Ñ—Ð¹Ð¢Ð¯Ð² Ð±ÐºÐ¹Ð«Ð¡"
+msgstr "÷ÙÂÏÒ ÑÚÙËÁ"
 
 msgid "Choose screen resolution"
-msgstr "Ñ—Ð¹Ð¢Ð¥Ð²Ð©Ð´Ð¥ Ð²Ð¡ÐºÐ²Ð¥Ð»Ð¥Ð®Ð©Ð¥ Ð¼Ð«Ð²Ð¡Ð®Ð¡"
+msgstr "÷ÙÂÅÒÉÔÅ ÒÁÚÒÅÛÅÎÉÅ ÜËÒÁÎÁ"
 
 #work in progress stuff
 msgid "Work In Progress!"
-msgstr "Ñ’Ð¡Ð¢Ð¯Ð´Ð¡ Ð°Ð²Ð¯Ð¤Ð¯Ð¬Ð¶Ð¡Ð¥Ð´Ð³Ð±!"
+msgstr "òÁÂÏÔÁ ÐÒÏÄÏÌÖÁÅÔÓÑ!"
 
 msgid "This feature is not ready yet"
-msgstr "ÑœÐ´Ð¡ Ð¦ÐµÐ®Ð«Ð£Ð©Ð± Ð¥Ð½Ð¥ Ð®Ð¥ Ð§Ð¯Ð´Ð¯Ð·Ð¡"
+msgstr "üÔÁ ÆÕÎËÃÉÑ ÅÝÅ ÎÅ ÇÏÔÏ×Á"
 
 msgid "Discuss the future of TuxTyping at"
-msgstr "ÑÐ¢Ð³ÐµÐ¤Ð©Ð´Ð¥ Ð¢ÐµÐ¤ÐµÐ½Ð¥Ð¥ TuxTyping Ð®Ð¡"
+msgstr "ïÂÓÕÄÉÔÅ ÂÕÄÕÝÅÅ TuxTyping ÎÁ"

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -1,22 +1,22 @@
-# Svenska strÃ¤ngar fÃ¶r TuxType 2
-# Copyright Â© 2003 Free Software Foundation, Inc.
-# GÃ¶ran Uddeborg <goeran at uddeborg.se>, 2003.
+# Svenska strängar för TuxType 2
+# Copyright © 2003 Free Software Foundation, Inc.
+# Göran Uddeborg <goeran at uddeborg.se>, 2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tuxtype2 1.5.1\n"
 "PO-Revision-Date: 2003-07-23 17:44+0200\n"
-"Last-Translator: GÃ¶ran Uddeborg <goeran at uddeborg.se>\n"
+"Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "Congratulations"
 msgstr "Gratulerar"
 
 msgid "Oh No!"
-msgstr "Ã…h nej!"
+msgstr "Åh nej!"
 
 msgid "Sound & Music Disabled"
 msgstr "Ljud och musik avaktiverade"
@@ -25,10 +25,10 @@
 msgstr "Pausat!"
 
 msgid "Press escape again to return to menu"
-msgstr "Tryck escape igen fÃ¶r att komma tillbaka till menyn"
+msgstr "Tryck escape igen för att komma tillbaka till menyn"
 
 msgid "Press space bar to return to game"
-msgstr "Tryck mellanslag fÃ¶r att fortsÃ¤tta spela"
+msgstr "Tryck mellanslag för att fortsätta spela"
 
 msgid "Sound Effects Volume"
 msgstr "Ljudeffektvolym"
@@ -46,7 +46,7 @@
 msgstr "Liv"
 
 msgid "Level"
-msgstr "NivÃ¥"
+msgstr "Nivå"
 
 msgid "Alphabet"
 msgstr "Alfabete"
@@ -65,28 +65,28 @@
 
 # "Commander" is level 4 in comet zap
 msgid "Commander"
-msgstr "KommendÃ¶r"
+msgstr "Kommendör"
 
-# levels for Cascade game:
+#levels for Cascade game:
 msgid "Easy"
-msgstr "LÃ¤tt"
+msgstr "Lätt"
 
 msgid "Medium"
 msgstr "Mellan"
 
 msgid "Hard"
-msgstr "SvÃ¥rt"
+msgstr "Svårt"
 
-# types of games
+#types of games
 msgid "Comet Zap"
 msgstr "Pricka kometer"
 
 msgid "Fish Cascade"
 msgstr "Fiskregn"
 
-# general stuff
+#general stuff
 msgid "Practice"
-msgstr "Ã–vning"
+msgstr "Övning"
 
 msgid "Lessons"
 msgstr "Lektioner"
@@ -98,23 +98,23 @@
 msgstr "Huvudmeny"
 
 msgid "Options"
-msgstr "InstÃ¤llningar"
+msgstr "Inställningar"
 
 msgid "Quit"
 msgstr "Avsluta"
 
 msgid "Setup Keyboard"
-msgstr "StÃ¤ll in tangentbord"
+msgstr "Ställ in tangentbord"
 
 msgid "Setup Language"
-msgstr "StÃ¤ll in sprÃ¥k"
+msgstr "Ställ in språk"
 
-# work in progress stuff
+#work in progress stuff
 msgid "Work In Progress!"
-msgstr "Arbete pÃ¥gÃ¥r!"
+msgstr "Arbete pågår!"
 
 msgid "this feature is not ready yet"
-msgstr "Denna funktion Ã¤r inte fÃ¤rdig Ã¤n"
+msgstr "Denna funktion är inte färdig än"
 
 msgid "Discuss the future of TuxTyping at"
-msgstr "Diskutera TyxeTypes framtid pÃ¥"
+msgstr "Diskutera TyxeTypes framtid på"

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/lang.po	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/lang.po	2006-07-15 16:43:25 UTC (rev 99)
@@ -41,7 +41,7 @@
 msgstr "Nivel"
 
 msgid "Options"
-msgstr "Maoni"
+msgstr "Opciones"
 
 msgid "Alphabet"
 msgstr "Alfabeto"
@@ -89,6 +89,9 @@
 msgid "Main Menu"
 msgstr "Listi ya kwanza"
 
+msgid "Options"
+msgstr "Maoni"
+
 msgid "Quit"
 msgstr "Ondoka"
 

Modified: tuxtype/trunk/tuxtype/globals.h
===================================================================
--- tuxtype/trunk/tuxtype/globals.h	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/globals.h	2006-07-15 16:43:25 UTC (rev 99)
@@ -108,11 +108,10 @@
 #define amask 0xff000000
 #endif
 
-#define menu_font	"GenAI102.ttf" /* "DejaVuSans-Bold.ttf"  or "FreeSansBold.ttf" */ 	/* was menu.ttf */
+#define menu_font	"GenAI101.ttf" /* or "DejaVuSans-Bold.ttf"  or "FreeSansBold.ttf" */ 	/* was menu.ttf */
 #define menu_font_size	20
 
-#define ttf_font	"GenAI102.ttf" /* "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */  	/* was letters.ttf */
-
+#define ttf_font	"GenAI101.ttf" /* or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */  	/* was letters.ttf */
 #define ttf_font_size	20
 
 #define MAX_NUM_WORDS   500

Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/loaders.c	2006-07-15 16:43:25 UTC (rev 99)
@@ -192,8 +192,8 @@
 	/* this works only on debian */ 
 	/* "fallback" (the above _will_ fall): load the font with fixed-path */
 	
-	sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/ttf-gentium/", fontfile ); 
-		if ( checkFile(fn) ) {
+	sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/ttf-gentium/", fontfile );
+	if ( checkFile(fn) ) {
 		/* try to load the font, if successful, return font*/
 
 		loadedFont = TTF_OpenFont( fn, fontsize );

Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/playgame.c	2006-07-15 16:43:25 UTC (rev 99)
@@ -354,7 +354,7 @@
 
 void debugDISPLAY( unsigned char *msg, int x, int y ) {
 	SDL_Surface *m;
-	m = TTF_RenderUTF8_Shaded( font, msg, white, white);
+	m = TTF_RenderText_Solid( font, msg, white );
 	EraseObject(m, x, y);
 	DrawObject(m, x, y);
 }
@@ -992,7 +992,7 @@
     SDL_FillRect(out, NULL, SDL_MapRGB(out->format, 255, 255, 0));
 
     let[0] = ch;
-    temp = TTF_RenderUTF8_Shaded(font, let, black, black);
+    temp = TTF_RenderText_Solid(font, let, black);
     dstrect.w = temp->w;
     dstrect.h = temp->h;
     dstrect.x = 17 - (temp->w) / 2;
@@ -1005,7 +1005,7 @@
     dstrect.x -= 2;
     SDL_BlitSurface(temp, NULL, out, &dstrect);
     SDL_FreeSurface(temp);
-    temp = TTF_RenderUTF8_Blended(font, let, c);
+    temp = TTF_RenderText_Solid(font, let, c);
     dstrect.x++;
     dstrect.y--;
     SDL_BlitSurface(temp, NULL, out, &dstrect);

Modified: tuxtype/trunk/tuxtype/scripting.c
===================================================================
--- tuxtype/trunk/tuxtype/scripting.c	2006-07-08 17:22:51 UTC (rev 98)
+++ tuxtype/trunk/tuxtype/scripting.c	2006-07-15 16:43:25 UTC (rev 99)
@@ -484,14 +484,14 @@
                         for ( toshow=strlen(&curItem->data[shown]); !ok; toshow--) {
                             if (toshow+1>FNLEN) continue;
                             tmp[toshow]=0;
-                            TTF_SizeUTF8( myFont, tmp, &w, &h);
+                            TTF_SizeText( myFont, tmp, &w, &h);
                             
                             if (w+20<screen->w) ok=1;
                         }
                         
                         shown += toshow + 1;
 			//printf("Rendering %s\n", tmp);
-                        img = TTF_RenderUTF8_Blended( myFont, tmp, *col );
+                        img = TTF_RenderText_Blended( myFont, tmp, *col );
 
                         if (img) {
                     
@@ -783,7 +783,7 @@
 
 		sprintf( wordlistFile[c], "%s", wordsFile->d_name );
 
-		filenames[c] = TTF_RenderUTF8_Blended(  font, wordsFile->d_name, white);
+		filenames[c] = TTF_RenderText_Blended(  font, wordsFile->d_name, white);
 		SDL_BlitSurface( filenames[c], NULL, screen, &spot );
                 SDL_FreeSurface(filenames[c]);
 		c++;


