[Tux4kids-commits] r852 - in tuxtype: branches/tuxtype-soc-mh branches/tuxtype-soc-mh/autom4te.cache branches/tuxtype-soc-mh/data branches/tuxtype-soc-mh/data/fonts branches/tuxtype-soc-mh/data/images branches/tuxtype-soc-mh/data/images/backgrounds branches/tuxtype-soc-mh/data/images/cities branches/tuxtype-soc-mh/data/images/comets branches/tuxtype-soc-mh/data/images/icons branches/tuxtype-soc-mh/data/images/menu branches/tuxtype-soc-mh/data/images/status branches/tuxtype-soc-mh/data/images/tux branches/tuxtype-soc-mh/data/scripts branches/tuxtype-soc-mh/data/sounds branches/tuxtype-soc-mh/data/themes branches/tuxtype-soc-mh/data/themes/armenian branches/tuxtype-soc-mh/data/themes/armenian/images branches/tuxtype-soc-mh/data/themes/bokmal/images/status branches/tuxtype-soc-mh/data/themes/brazilian-portuguese branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/images branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/words branches/tuxtype-soc-mh/data/themes/catalan branches/tuxtype-soc-mh/data/themes/catalan/words branches/tuxtype-soc-mh/data/themes/czech branches/tuxtype-soc-mh/data/themes/czech/words branches/tuxtype-soc-mh/data/themes/dansk branches/tuxtype-soc-mh/data/themes/dansk/sounds branches/tuxtype-soc-mh/data/themes/dansk/words branches/tuxtype-soc-mh/data/themes/deutsch branches/tuxtype-soc-mh/data/themes/deutsch/words branches/tuxtype-soc-mh/data/themes/espanol branches/tuxtype-soc-mh/data/themes/espanol/images branches/tuxtype-soc-mh/data/themes/espanol/words branches/tuxtype-soc-mh/data/themes/euskara branches/tuxtype-soc-mh/data/themes/euskara/images branches/tuxtype-soc-mh/data/themes/euskara/words branches/tuxtype-soc-mh/data/themes/french branches/tuxtype-soc-mh/data/themes/french/words branches/tuxtype-soc-mh/data/themes/greek branches/tuxtype-soc-mh/data/themes/greek/words branches/tuxtype-soc-mh/data/themes/italian branches/tuxtype-soc-mh/data/themes/italian/images branches/tuxtype-soc-mh/data/themes/italian/words branches/tuxtype-soc-mh/data/themes/jamaican branches/tuxtype-soc-mh/data/themes/jamaican/images branches/tuxtype-soc-mh/data/themes/jamaican/words branches/tuxtype-soc-mh/data/themes/lithuanian branches/tuxtype-soc-mh/data/themes/lithuanian/images branches/tuxtype-soc-mh/data/themes/lithuanian/images/status branches/tuxtype-soc-mh/data/themes/lithuanian/sounds branches/tuxtype-soc-mh/data/themes/lithuanian/words branches/tuxtype-soc-mh/data/themes/malayalam branches/tuxtype-soc-mh/data/themes/malayalam/images branches/tuxtype-soc-mh/data/themes/malayalam/images/keyboard branches/tuxtype-soc-mh/data/themes/malayalam/images/status branches/tuxtype-soc-mh/data/themes/nederlands branches/tuxtype-soc-mh/data/themes/nederlands/words branches/tuxtype-soc-mh/data/themes/nynorsk branches/tuxtype-soc-mh/data/themes/nynorsk/images branches/tuxtype-soc-mh/data/themes/nynorsk/images/status branches/tuxtype-soc-mh/data/themes/nynorsk/words branches/tuxtype-soc-mh/data/themes/russian branches/tuxtype-soc-mh/data/themes/russian/images branches/tuxtype-soc-mh/data/themes/russian/images/status branches/tuxtype-soc-mh/data/themes/russian/words branches/tuxtype-soc-mh/data/themes/svenska branches/tuxtype-soc-mh/data/themes/svenska/words branches/tuxtype-soc-mh/data/themes/swahili branches/tuxtype-soc-mh/data/themes/swahili/words branches/tuxtype-soc-mh/data/themes/wolof branches/tuxtype-soc-mh/data/themes/wolof/images branches/tuxtype-soc-mh/data/themes/wolof/words branches/tuxtype-soc-mh/data/words branches/tuxtype-soc-mh/doc branches/tuxtype-soc-mh/doc/en branches/tuxtype-soc-mh/src trunk trunk/data/images trunk/data/sounds trunk/doc trunk/po trunk/src

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Fri Jan 23 12:35:48 UTC 2009


Author: dbruce-guest
Date: 2009-01-23 12:35:47 +0000 (Fri, 23 Jan 2009)
New Revision: 852

Added:
   tuxtype/trunk/data/images/title1.png
   tuxtype/trunk/data/images/title1.png.old
   tuxtype/trunk/data/sounds/harp.wav
Removed:
   tuxtype/trunk/data/images/title1.png
Modified:
   tuxtype/branches/tuxtype-soc-mh/aclocal.m4
   tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.0
   tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.1
   tuxtype/branches/tuxtype-soc-mh/autom4te.cache/requests
   tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.0
   tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.1
   tuxtype/branches/tuxtype-soc-mh/configure
   tuxtype/branches/tuxtype-soc-mh/data/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/fonts/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/backgrounds/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/cities/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/comets/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/icons/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/menu/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/status/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/images/tux/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/scripts/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/sounds/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/bokmal/images/status/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/czech/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/czech/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/sounds/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/french/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/french/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/greek/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/greek/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/italian/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/italian/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/italian/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/keyboard/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/status/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/russian/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/status/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/russian/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/images/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/data/words/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/doc/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/doc/en/Makefile.in
   tuxtype/branches/tuxtype-soc-mh/src/Makefile.in
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/ChangeLog~
   tuxtype/trunk/configure
   tuxtype/trunk/configure.ac
   tuxtype/trunk/data/sounds/Makefile.am
   tuxtype/trunk/data/sounds/Makefile.in
   tuxtype/trunk/doc/INSTALL
   tuxtype/trunk/doc/INSTALL-Win32
   tuxtype/trunk/doc/README
   tuxtype/trunk/po/ar.po
   tuxtype/trunk/po/as.po
   tuxtype/trunk/po/ca.po
   tuxtype/trunk/po/cs.po
   tuxtype/trunk/po/da.po
   tuxtype/trunk/po/de.po
   tuxtype/trunk/po/el.po
   tuxtype/trunk/po/en at boldquot.po
   tuxtype/trunk/po/en at quot.po
   tuxtype/trunk/po/en_GB.po
   tuxtype/trunk/po/es.po
   tuxtype/trunk/po/eu.po
   tuxtype/trunk/po/fr.po
   tuxtype/trunk/po/gu.po
   tuxtype/trunk/po/hi.po
   tuxtype/trunk/po/it.po
   tuxtype/trunk/po/ja.po
   tuxtype/trunk/po/kn.po
   tuxtype/trunk/po/lt.po
   tuxtype/trunk/po/ml.gmo
   tuxtype/trunk/po/ml.po
   tuxtype/trunk/po/nb.po
   tuxtype/trunk/po/ne.po
   tuxtype/trunk/po/nl.po
   tuxtype/trunk/po/nn.po
   tuxtype/trunk/po/or.po
   tuxtype/trunk/po/pt.po
   tuxtype/trunk/po/ru.po
   tuxtype/trunk/po/sv.po
   tuxtype/trunk/po/sw.po
   tuxtype/trunk/po/ta.po
   tuxtype/trunk/po/te.po
   tuxtype/trunk/po/tr.po
   tuxtype/trunk/po/tuxtype.pot
   tuxtype/trunk/po/wo.po
   tuxtype/trunk/src/audio.c
   tuxtype/trunk/src/loaders.c
   tuxtype/trunk/src/playgame.h
   tuxtype/trunk/src/practice.c
   tuxtype/trunk/src/titlescreen.c
Log:
added opening sound from tuxpaint, and some code cleanup


Modified: tuxtype/branches/tuxtype-soc-mh/aclocal.m4
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/aclocal.m4	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/aclocal.m4	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file 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.
@@ -11,12 +11,15 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -47,8 +50,10 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -320,7 +325,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -368,13 +373,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -479,16 +484,17 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -760,7 +766,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 

Modified: tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.0
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.0	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.0	2009-01-23 12:35:47 UTC (rev 852)
@@ -6739,21 +6739,22 @@
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6790,7 +6791,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

Modified: tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.1
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.1	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/autom4te.cache/output.1	2009-01-23 12:35:47 UTC (rev 852)
@@ -6739,21 +6739,22 @@
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6790,7 +6791,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

Modified: tuxtype/branches/tuxtype-soc-mh/autom4te.cache/requests
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/autom4te.cache/requests	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/autom4te.cache/requests	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te Wed Jan 17 19:57:31 PST 2007.
+# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008.
 # It contains the lists of macros which have been traced.
 # It can be safely removed.
 
@@ -11,63 +11,6 @@
                       ],
                       [
                         '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'aclocal.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_INIT' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'm4_sinclude' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'include' => 1,
-                        'LT_INIT' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AH_OUTPUT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'sinclude' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'm4_include' => 1,
-                        'AC_SUBST_TRACE' => 1
-                      }
-                    ], 'Autom4te::Request' ),
-             bless( [
-                      '1',
-                      1,
-                      [
-                        '/usr/share/autoconf'
-                      ],
-                      [
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
                         '/usr/share/aclocal-1.10/amversion.m4',
                         '/usr/share/aclocal-1.10/auxdir.m4',
                         '/usr/share/aclocal-1.10/cond.m4',
@@ -126,6 +69,63 @@
                         'AU_DEFUN' => 1,
                         'AM_MAKE_INCLUDE' => 1
                       }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '1',
+                      1,
+                      [
+                        '/usr/share/autoconf'
+                      ],
+                      [
+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
+                        'aclocal.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'AM_PROG_F77_C_O' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_INIT' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'LT_INIT' => 1,
+                        'include' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AH_OUTPUT' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_pattern_allow' => 1,
+                        'sinclude' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'm4_include' => 1,
+                        'AC_SUBST_TRACE' => 1
+                      }
                     ], 'Autom4te::Request' )
            );
 

Modified: tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.0
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.0	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.0	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,5 +1,664 @@
-m4trace:aclocal.m4:863: -1- m4_include([acinclude.m4])
-m4trace:configure.ac:2: -1- AC_INIT([Tux Typing], [1.5.16], [tux4kids-tuxtype-dev at lists.alioth.debian.org], [tuxtype])
+m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+m4trace:/usr/share/aclocal-1.10/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+m4trace:/usr/share/aclocal-1.10/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+m4trace:/usr/share/aclocal-1.10/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+m4trace:/usr/share/aclocal-1.10/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+m4trace:/usr/share/aclocal-1.10/depend.m4:139: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+m4trace:/usr/share/aclocal-1.10/depend.m4:147: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+m4trace:/usr/share/aclocal-1.10/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])
+m4trace:/usr/share/aclocal-1.10/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+m4trace:/usr/share/aclocal-1.10/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+m4trace:/usr/share/aclocal-1.10/init.m4:113: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+m4trace:/usr/share/aclocal-1.10/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+m4trace:/usr/share/aclocal-1.10/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+m4trace:/usr/share/aclocal-1.10/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+m4trace:/usr/share/aclocal-1.10/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+m4trace:/usr/share/aclocal-1.10/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+m4trace:/usr/share/aclocal-1.10/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+m4trace:/usr/share/aclocal-1.10/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+m4trace:/usr/share/aclocal-1.10/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+m4trace:/usr/share/aclocal-1.10/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+m4trace:/usr/share/aclocal-1.10/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4trace:/usr/share/aclocal-1.10/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+m4trace:/usr/share/aclocal-1.10/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+m4trace:/usr/share/aclocal-1.10/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+m4trace:/usr/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
+m4trace:/usr/share/aclocal-1.10/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+])
+m4trace:acinclude.m4:11: -1- AC_DEFUN([AM_PATH_SDL], [dnl 
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+            sdl_prefix="$withval", sdl_prefix="")
+AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+		    , enable_sdltest=yes)
+
+  if test x$sdl_exec_prefix != x ; then
+     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+     if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+     fi
+  fi
+  if test x$sdl_prefix != x ; then
+     sdl_args="$sdl_args --prefix=$sdl_prefix"
+     if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+     fi
+  fi
+
+  AC_REQUIRE([AC_CANONICAL_TARGET])
+  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+  no_sdl=""
+  if test "$SDL_CONFIG" = "no" ; then
+    no_sdl=yes
+  else
+    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+
+    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_sdltest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_CXXFLAGS="$CXXFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $SDL_CFLAGS"
+      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+      LIBS="$LIBS $SDL_LIBS"
+dnl
+dnl Now check if the installed SDL is sufficiently new. (Also sanity
+dnl checks the results of sdl-config to some extent
+dnl
+      rm -f conf.sdltest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "SDL.h"
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  /* This hangs on some systems (?)
+  system ("touch conf.sdltest");
+  */
+  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_sdl_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_sdl_version");
+     exit(1);
+   }
+
+   if (($sdl_major_version > major) ||
+      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_sdl" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$SDL_CONFIG" = "no" ; then
+       echo "*** The sdl-config script installed by SDL could not be found"
+       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+       echo "*** full path to sdl-config."
+     else
+       if test -f conf.sdltest ; then
+        :
+       else
+          echo "*** Could not run SDL test program, checking why..."
+          CFLAGS="$CFLAGS $SDL_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+          LIBS="$LIBS $SDL_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     SDL_CFLAGS=""
+     SDL_CXXFLAGS=""
+     SDL_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(SDL_CFLAGS)
+  AC_SUBST(SDL_LIBS)
+  rm -f conf.sdltest
+])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -7,357 +666,177 @@
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?m4_])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^dnl$])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.ac:2: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([SHELL])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.ac:2: -1- AC_SUBST([PATH_SEPARATOR])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_NAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_STRING])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:2: -1- AC_SUBST([exec_prefix], [NONE])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([exec_prefix])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.ac:2: -1- AC_SUBST([prefix], [NONE])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([prefix])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.ac:2: -1- AC_SUBST([program_transform_name], [s,x,x,])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([program_transform_name])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.ac:2: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([bindir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.ac:2: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([sbindir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.ac:2: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([libexecdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([datarootdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([datadir], ['${datarootdir}'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([datadir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.ac:2: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([sysconfdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([sharedstatedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.ac:2: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([localstatedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.ac:2: -1- AC_SUBST([includedir], ['${prefix}/include'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([includedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.ac:2: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([oldincludedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.ac:2: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-				     ['${datarootdir}/doc/${PACKAGE}'])])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([docdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([infodir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.ac:2: -1- AC_SUBST([htmldir], ['${docdir}'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([htmldir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.ac:2: -1- AC_SUBST([dvidir], ['${docdir}'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([dvidir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.ac:2: -1- AC_SUBST([pdfdir], ['${docdir}'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([pdfdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([psdir], ['${docdir}'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([psdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([libdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.ac:2: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([localedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:2: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([mandir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-#undef PACKAGE_NAME])
-m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME])
-m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-#undef PACKAGE_VERSION])
-m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING])
-m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT])
-m4trace:configure.ac:2: -1- AC_SUBST([DEFS])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([DEFS])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:2: -1- AC_SUBST([ECHO_C])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([ECHO_C])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:2: -1- AC_SUBST([ECHO_N])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([ECHO_N])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:2: -1- AC_SUBST([ECHO_T])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([ECHO_T])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.ac:2: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:2: -1- AC_SUBST([build_alias])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([build_alias])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.ac:2: -1- AC_SUBST([host_alias])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([host_alias])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.ac:2: -1- AC_SUBST([target_alias])
-m4trace:configure.ac:2: -1- AC_SUBST_TRACE([target_alias])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:4: -1- AC_CANONICAL_BUILD
-m4trace:configure.ac:4: -1- AC_REQUIRE_AUX_FILE([config.sub])
-m4trace:configure.ac:4: -1- AC_REQUIRE_AUX_FILE([config.guess])
-m4trace:configure.ac:4: -1- AC_SUBST([build], [$ac_cv_build])
-m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:4: -1- AC_SUBST([build_cpu], [$[1]])
-m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build_cpu])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:4: -1- AC_SUBST([build_vendor], [$[2]])
-m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build_vendor])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:4: -1- AC_SUBST([build_os])
-m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build_os])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:5: -1- AC_CANONICAL_HOST
-m4trace:configure.ac:5: -1- AC_SUBST([host], [$ac_cv_host])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:5: -1- AC_SUBST([host_cpu], [$[1]])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_cpu])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:5: -1- AC_SUBST([host_vendor], [$[2]])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_vendor])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:5: -1- AC_SUBST([host_os])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_os])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:6: -1- AC_CANONICAL_TARGET
-m4trace:configure.ac:6: -1- AC_SUBST([target], [$ac_cv_target])
-m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target$])
-m4trace:configure.ac:6: -1- AC_SUBST([target_cpu], [$[1]])
-m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target_cpu])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target_cpu$])
-m4trace:configure.ac:6: -1- AC_SUBST([target_vendor], [$[2]])
-m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target_vendor])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target_vendor$])
-m4trace:configure.ac:6: -1- AC_SUBST([target_os])
-m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target_os])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target_os$])
 m4trace:configure.ac:12: -1- AM_INIT_AUTOMAKE([foreign])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:12: -1- AM_AUTOMAKE_VERSION([1.10])
-m4trace:configure.ac:12: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.ac:12: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.ac:12: -1- AM_AUTOMAKE_VERSION([1.10.1])
+m4trace:configure.ac:12: -1- _AM_AUTOCONF_VERSION([2.61])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_DATA])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__isrc])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__isrc$])
 m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:12: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CYGPATH_W])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:12: -1- _AM_SET_OPTIONS([foreign])
+m4trace:configure.ac:12: -1- _AM_SET_OPTION([foreign])
+m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([foreign])
 m4trace:configure.ac:12: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
-aclocal.m4:666: _AM_SET_OPTIONS is expanded from...
-aclocal.m4:393: AM_INIT_AUTOMAKE is expanded from...
+/usr/share/aclocal-1.10/options.m4:25: _AM_SET_OPTIONS is expanded from...
+/usr/share/aclocal-1.10/init.m4:26: AM_INIT_AUTOMAKE is expanded from...
 configure.ac:12: the top level])
-m4trace:configure.ac:12: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([PACKAGE])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:12: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([VERSION])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:12: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
+m4trace:configure.ac:12: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([no-define])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:12: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-#undef PACKAGE])
-m4trace:configure.ac:12: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:12: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-#undef VERSION])
-m4trace:configure.ac:12: -1- AC_REQUIRE_AUX_FILE([missing])
-m4trace:configure.ac:12: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([ACLOCAL])
+m4trace:configure.ac:12: -1- AM_SANITY_CHECK
+m4trace:configure.ac:12: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.ac:12: -1- AM_MISSING_HAS_RUN
+m4trace:configure.ac:12: -1- AM_AUX_DIR_EXPAND
 m4trace:configure.ac:12: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:12: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AUTOCONF])
+m4trace:configure.ac:12: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:12: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AUTOMAKE])
+m4trace:configure.ac:12: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:12: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AUTOHEADER])
+m4trace:configure.ac:12: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:12: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([MAKEINFO])
+m4trace:configure.ac:12: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:12: -1- AC_SUBST([install_sh])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([install_sh])
+m4trace:configure.ac:12: -1- AM_PROG_INSTALL_SH
 m4trace:configure.ac:12: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:12: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:12: -1- AM_PROG_INSTALL_STRIP
 m4trace:configure.ac:12: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:12: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:12: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([mkdir_p])
+m4trace:configure.ac:12: -1- AM_PROG_MKDIR_P
 m4trace:configure.ac:12: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:12: -1- AC_SUBST([AWK])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AWK])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:12: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__leading_dot])
+m4trace:configure.ac:12: -1- AM_SET_LEADING_DOT
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:12: -1- AC_SUBST([AMTAR])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AMTAR])
+m4trace:configure.ac:12: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.ac:12: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.ac:12: -1- _AM_PROG_TAR([v7])
+m4trace:configure.ac:12: -1- AM_MISSING_PROG([AMTAR], [tar])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__tar])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__tar])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__untar])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__untar])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:13: -1- AC_CONFIG_HEADERS([config.h])
-m4trace:configure.ac:17: -1- AC_SUBST([CC])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:12: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([no-dependencies])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:17: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CFLAGS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:17: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([LDFLAGS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:17: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:17: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:17: -1- AC_SUBST([CC])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:17: -1- AC_SUBST([CC])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:17: -1- AC_SUBST([CC])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:17: -1- AC_SUBST([CC])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:17: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([ac_ct_CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:17: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([EXEEXT])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:17: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([OBJEXT])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:17: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.ac:17: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:17: -1- AM_SET_DEPDIR
 m4trace:configure.ac:17: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:17: -1- AC_SUBST([am__include])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.ac:17: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:17: -1- AM_MAKE_INCLUDE
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:17: -1- AC_SUBST([am__quote])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__quote])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:17: -1- AM_DEP_TRACK
 m4trace:configure.ac:17: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:17: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([AMDEP_TRUE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:17: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([AMDEP_FALSE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^AMDEP_FALSE$])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:17: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:17: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CCDEPMODE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CCDEPMODE$])
 m4trace:configure.ac:17: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:17: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:17: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:18: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:18: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
 m4trace:configure.ac:18: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:18: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
 m4trace:configure.ac:18: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:18: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL_DATA])
 m4trace:configure.ac:18: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:19: -1- AC_SUBST([LN_S], [$as_ln_s])
-m4trace:configure.ac:19: -1- AC_SUBST_TRACE([LN_S])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:20: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.ac:20: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:38: -1- AC_SUBST([SDL_CONFIG])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SDL_CONFIG])
+m4trace:configure.ac:38: -1- AM_PATH_SDL([$SDL_VERSION], [:], [{ { echo "$as_me:$LINENO: error: *** SDL version $SDL_VERSION not found!" >&5
+echo "$as_me: error: *** SDL version $SDL_VERSION not found!" >&2;}
+   { (exit 1); exit 1; }; }])
 m4trace:configure.ac:38: -1- m4_pattern_allow([^SDL_CONFIG$])
 m4trace:configure.ac:38: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from...
@@ -367,227 +846,37 @@
 You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from...
 acinclude.m4:11: AM_PATH_SDL is expanded from...
 configure.ac:38: the top level])
-m4trace:configure.ac:38: -1- AC_SUBST([SDL_CFLAGS])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SDL_CFLAGS])
 m4trace:configure.ac:38: -1- m4_pattern_allow([^SDL_CFLAGS$])
-m4trace:configure.ac:38: -1- AC_SUBST([SDL_LIBS])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SDL_LIBS])
 m4trace:configure.ac:38: -1- m4_pattern_allow([^SDL_LIBS$])
-m4trace:configure.ac:42: -1- AH_OUTPUT([HAVE_LIBSDL_MIXER], [/* Define to 1 if you have the `SDL_mixer\' library (-lSDL_mixer). */
-#undef HAVE_LIBSDL_MIXER])
-m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_MIXER])
 m4trace:configure.ac:42: -1- m4_pattern_allow([^HAVE_LIBSDL_MIXER$])
-m4trace:configure.ac:43: -1- AH_OUTPUT([HAVE_LIBSDL_TTF], [/* Define to 1 if you have the `SDL_ttf\' library (-lSDL_ttf). */
-#undef HAVE_LIBSDL_TTF])
-m4trace:configure.ac:43: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_TTF])
 m4trace:configure.ac:43: -1- m4_pattern_allow([^HAVE_LIBSDL_TTF$])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_LIBSDL_IMAGE], [/* Define to 1 if you have the `SDL_image\' library (-lSDL_image). */
-#undef HAVE_LIBSDL_IMAGE])
-m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_IMAGE])
 m4trace:configure.ac:44: -1- m4_pattern_allow([^HAVE_LIBSDL_IMAGE$])
-m4trace:configure.ac:47: -1- AH_OUTPUT([HAVE_LIBSDL_PANGO], [/* Define to 1 if you have the `SDL_Pango\' library (-lSDL_Pango). */
-#undef HAVE_LIBSDL_PANGO])
-m4trace:configure.ac:47: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_PANGO])
 m4trace:configure.ac:47: -1- m4_pattern_allow([^HAVE_LIBSDL_PANGO$])
 m4trace:configure.ac:69: -1- AM_CONDITIONAL([BUILD_MINGW32], [test "$native_win32" = yes])
-m4trace:configure.ac:69: -1- AC_SUBST([BUILD_MINGW32_TRUE])
-m4trace:configure.ac:69: -1- AC_SUBST_TRACE([BUILD_MINGW32_TRUE])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^BUILD_MINGW32_TRUE$])
-m4trace:configure.ac:69: -1- AC_SUBST([BUILD_MINGW32_FALSE])
-m4trace:configure.ac:69: -1- AC_SUBST_TRACE([BUILD_MINGW32_FALSE])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^BUILD_MINGW32_FALSE$])
 m4trace:configure.ac:69: -1- _AM_SUBST_NOTMAKE([BUILD_MINGW32_TRUE])
 m4trace:configure.ac:69: -1- _AM_SUBST_NOTMAKE([BUILD_MINGW32_FALSE])
-m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([BUILD_MINGW32])
 m4trace:configure.ac:73: -1- m4_pattern_allow([^BUILD_MINGW32$])
-m4trace:configure.ac:73: -1- AH_OUTPUT([BUILD_MINGW32], [/* Native MinGW32 build */
-#undef BUILD_MINGW32])
-m4trace:configure.ac:78: -1- AC_SUBST([WINDRES])
-m4trace:configure.ac:78: -1- AC_SUBST_TRACE([WINDRES])
 m4trace:configure.ac:78: -1- m4_pattern_allow([^WINDRES$])
-m4trace:configure.ac:83: -1- AC_SUBST([CPP])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([CPP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:83: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:83: -1- AC_SUBST([CPP])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([CPP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:83: -1- AC_SUBST([GREP])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([GREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:83: -1- AC_SUBST([GREP])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([GREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:83: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([EGREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:83: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:83: -1- AC_SUBST_TRACE([EGREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:83: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:83: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H])
-m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H])
-m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([const])
 m4trace:configure.ac:87: -1- m4_pattern_allow([^const$])
-m4trace:configure.ac:87: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
-#undef const])
-m4trace:configure.ac:88: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
-   calls it, or to nothing if \'inline\' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif])
-m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
-#undef HAVE_ATEXIT])
-m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
-#undef HAVE_MEMSET])
-m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
-#undef HAVE_STRCHR])
-m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
-#undef HAVE_STRSTR])
-m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if you have the `malloc\' function. */
-#undef HAVE_MALLOC])
-m4trace:configure.ac:100: -1- AC_CONFIG_FILES([Makefile
-data/Makefile
-data/fonts/Makefile
-data/images/Makefile
-data/images/backgrounds/Makefile
-data/images/cities/Makefile
-data/images/comets/Makefile
-data/images/hands/Makefile
-data/images/icons/Makefile
-data/images/keyboard/Makefile
-data/images/menu/Makefile
-data/images/status/Makefile
-data/images/tux/Makefile
-data/scripts/Makefile
-data/sounds/Makefile
-data/themes/Makefile
-data/themes/armenian/Makefile
-data/themes/armenian/images/Makefile
-data/themes/bokmal/Makefile
-data/themes/bokmal/words/Makefile
-data/themes/bokmal/images/Makefile
-data/themes/bokmal/images/status/Makefile
-data/themes/brazilian-portuguese/Makefile
-data/themes/brazilian-portuguese/images/Makefile
-data/themes/brazilian-portuguese/words/Makefile
-data/themes/catalan/Makefile
-data/themes/catalan/words/Makefile
-data/themes/czech/Makefile
-data/themes/czech/words/Makefile
-data/themes/dansk/Makefile
-data/themes/dansk/sounds/Makefile
-data/themes/dansk/words/Makefile
-data/themes/deutsch/Makefile
-data/themes/deutsch/words/Makefile
-data/themes/espanol/Makefile
-data/themes/espanol/images/Makefile
-data/themes/espanol/words/Makefile
-data/themes/euskara/Makefile
-data/themes/euskara/images/Makefile
-data/themes/euskara/words/Makefile
-data/themes/french/Makefile
-data/themes/french/words/Makefile
-data/themes/greek/Makefile
-data/themes/greek/words/Makefile
-data/themes/italian/Makefile
-data/themes/italian/images/Makefile
-data/themes/italian/words/Makefile
-data/themes/jamaican/Makefile
-data/themes/jamaican/images/Makefile
-data/themes/jamaican/words/Makefile
-data/themes/lithuanian/Makefile
-data/themes/lithuanian/images/Makefile
-data/themes/lithuanian/images/status/Makefile
-data/themes/lithuanian/sounds/Makefile
-data/themes/lithuanian/words/Makefile
-data/themes/malayalam/Makefile
-data/themes/malayalam/images/Makefile
-data/themes/malayalam/images/status/Makefile
-data/themes/malayalam/images/keyboard/Makefile
-data/themes/malayalam/scripts/Makefile
-data/themes/malayalam/words/Makefile
-data/themes/nederlands/Makefile
-data/themes/nederlands/words/Makefile
-data/themes/nepali/Makefile
-data/themes/nepali/words/Makefile
-data/themes/nynorsk/Makefile
-data/themes/nynorsk/images/Makefile
-data/themes/nynorsk/images/status/Makefile
-data/themes/nynorsk/words/Makefile
-data/themes/russian/Makefile
-data/themes/russian/images/Makefile
-data/themes/russian/images/status/Makefile
-data/themes/russian/words/Makefile
-data/themes/svenska/Makefile
-data/themes/svenska/words/Makefile
-data/themes/swahili/Makefile
-data/themes/swahili/words/Makefile
-data/themes/wolof/Makefile
-data/themes/wolof/images/Makefile
-data/themes/wolof/words/Makefile
-data/words/Makefile
-doc/Makefile
-doc/en/Makefile
-src/Makefile
-nsis/tuxtype.nsi
-tuxtype.spec])
-m4trace:configure.ac:189: -1- AC_SUBST([NSI_INSTALL_DIR])
-m4trace:configure.ac:189: -1- AC_SUBST_TRACE([NSI_INSTALL_DIR])
 m4trace:configure.ac:189: -1- m4_pattern_allow([^NSI_INSTALL_DIR$])
 m4trace:configure.ac:194: -1- AM_CONDITIONAL([NSI_BUILD], [test "$dll_path" = no])
-m4trace:configure.ac:194: -1- AC_SUBST([NSI_BUILD_TRUE])
-m4trace:configure.ac:194: -1- AC_SUBST_TRACE([NSI_BUILD_TRUE])
 m4trace:configure.ac:194: -1- m4_pattern_allow([^NSI_BUILD_TRUE$])
-m4trace:configure.ac:194: -1- AC_SUBST([NSI_BUILD_FALSE])
-m4trace:configure.ac:194: -1- AC_SUBST_TRACE([NSI_BUILD_FALSE])
 m4trace:configure.ac:194: -1- m4_pattern_allow([^NSI_BUILD_FALSE$])
 m4trace:configure.ac:194: -1- _AM_SUBST_NOTMAKE([NSI_BUILD_TRUE])
 m4trace:configure.ac:194: -1- _AM_SUBST_NOTMAKE([NSI_BUILD_FALSE])
-m4trace:configure.ac:199: -1- AC_SUBST([NSI_DLL_DIR])
-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([NSI_DLL_DIR])
 m4trace:configure.ac:199: -1- m4_pattern_allow([^NSI_DLL_DIR$])
-m4trace:configure.ac:202: -1- AC_SUBST([NSIS])
-m4trace:configure.ac:202: -1- AC_SUBST_TRACE([NSIS])
 m4trace:configure.ac:202: -1- m4_pattern_allow([^NSIS$])
-m4trace:configure.ac:205: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
 m4trace:configure.ac:205: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-m4trace:configure.ac:205: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([LTLIBOBJS])
 m4trace:configure.ac:205: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:205: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+m4trace:configure.ac:205: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS

Modified: tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.1
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.1	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/autom4te.cache/traces.1	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,661 +1,5 @@
-m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-m4trace:/usr/share/aclocal-1.10/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-m4trace:/usr/share/aclocal-1.10/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-m4trace:/usr/share/aclocal-1.10/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-m4trace:/usr/share/aclocal-1.10/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-m4trace:/usr/share/aclocal-1.10/depend.m4:139: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-m4trace:/usr/share/aclocal-1.10/depend.m4:147: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-m4trace:/usr/share/aclocal-1.10/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])
-m4trace:/usr/share/aclocal-1.10/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-m4trace:/usr/share/aclocal-1.10/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-m4trace:/usr/share/aclocal-1.10/init.m4:113: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-m4trace:/usr/share/aclocal-1.10/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-m4trace:/usr/share/aclocal-1.10/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-m4trace:/usr/share/aclocal-1.10/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-m4trace:/usr/share/aclocal-1.10/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-m4trace:/usr/share/aclocal-1.10/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-m4trace:/usr/share/aclocal-1.10/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-m4trace:/usr/share/aclocal-1.10/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-m4trace:/usr/share/aclocal-1.10/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-m4trace:/usr/share/aclocal-1.10/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-m4trace:/usr/share/aclocal-1.10/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-m4trace:/usr/share/aclocal-1.10/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-m4trace:/usr/share/aclocal-1.10/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-m4trace:/usr/share/aclocal-1.10/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-m4trace:/usr/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
-m4trace:/usr/share/aclocal-1.10/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-])
-m4trace:acinclude.m4:11: -1- AC_DEFUN([AM_PATH_SDL], [dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
-            sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
-		    , enable_sdltest=yes)
-
-  if test x$sdl_exec_prefix != x ; then
-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-     fi
-  fi
-  if test x$sdl_prefix != x ; then
-     sdl_args="$sdl_args --prefix=$sdl_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
-     fi
-  fi
-
-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-  no_sdl=""
-  if test "$SDL_CONFIG" = "no" ; then
-    no_sdl=yes
-  else
-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sdltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SDL_CFLAGS"
-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-      LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
-      rm -f conf.sdltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.sdltest");
-  */
-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_sdl_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sdl_version");
-     exit(1);
-   }
-
-   if (($sdl_major_version > major) ||
-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sdl" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
-     else
-       if test -f conf.sdltest ; then
-        :
-       else
-          echo "*** Could not run SDL test program, checking why..."
-          CFLAGS="$CFLAGS $SDL_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-          LIBS="$LIBS $SDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          CXXFLAGS="$ac_save_CXXFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SDL_CFLAGS=""
-     SDL_CXXFLAGS=""
-     SDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SDL_CFLAGS)
-  AC_SUBST(SDL_LIBS)
-  rm -f conf.sdltest
-])
+m4trace:aclocal.m4:869: -1- m4_include([acinclude.m4])
+m4trace:configure.ac:2: -1- AC_INIT([Tux Typing], [1.5.16], [tux4kids-tuxtype-dev at lists.alioth.debian.org], [tuxtype])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -663,177 +7,357 @@
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?m4_])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^dnl$])
 m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.ac:2: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([SHELL])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.ac:2: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_NAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_STRING])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:2: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:2: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([exec_prefix])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.ac:2: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([prefix])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.ac:2: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([program_transform_name])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.ac:2: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([bindir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.ac:2: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([sbindir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.ac:2: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([libexecdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([datarootdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([datadir], ['${datarootdir}'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([datadir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.ac:2: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([sysconfdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([sharedstatedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.ac:2: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([localstatedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.ac:2: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([includedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.ac:2: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([oldincludedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.ac:2: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+				     ['${datarootdir}/doc/${PACKAGE}'])])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([docdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([infodir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.ac:2: -1- AC_SUBST([htmldir], ['${docdir}'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([htmldir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.ac:2: -1- AC_SUBST([dvidir], ['${docdir}'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([dvidir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.ac:2: -1- AC_SUBST([pdfdir], ['${docdir}'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([pdfdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([psdir], ['${docdir}'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([psdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([libdir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.ac:2: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([localedir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:2: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([mandir])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
+#undef PACKAGE_NAME])
+m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME])
+m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
+#undef PACKAGE_VERSION])
+m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING])
+m4trace:configure.ac:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:2: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT])
+m4trace:configure.ac:2: -1- AC_SUBST([DEFS])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([DEFS])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.ac:2: -1- AC_SUBST([ECHO_C])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([ECHO_C])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:2: -1- AC_SUBST([ECHO_N])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([ECHO_N])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:2: -1- AC_SUBST([ECHO_T])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([ECHO_T])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.ac:2: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:2: -1- AC_SUBST([build_alias])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([build_alias])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.ac:2: -1- AC_SUBST([host_alias])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([host_alias])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.ac:2: -1- AC_SUBST([target_alias])
+m4trace:configure.ac:2: -1- AC_SUBST_TRACE([target_alias])
 m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:4: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:4: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:4: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:4: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:4: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build_cpu])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:4: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build_vendor])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:4: -1- AC_SUBST([build_os])
+m4trace:configure.ac:4: -1- AC_SUBST_TRACE([build_os])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:5: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:5: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:5: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_cpu])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:5: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_vendor])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:5: -1- AC_SUBST([host_os])
+m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_os])
 m4trace:configure.ac:5: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:6: -1- AC_CANONICAL_TARGET
+m4trace:configure.ac:6: -1- AC_SUBST([target], [$ac_cv_target])
+m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target$])
+m4trace:configure.ac:6: -1- AC_SUBST([target_cpu], [$[1]])
+m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target_cpu])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target_cpu$])
+m4trace:configure.ac:6: -1- AC_SUBST([target_vendor], [$[2]])
+m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target_vendor])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target_vendor$])
+m4trace:configure.ac:6: -1- AC_SUBST([target_os])
+m4trace:configure.ac:6: -1- AC_SUBST_TRACE([target_os])
 m4trace:configure.ac:6: -1- m4_pattern_allow([^target_os$])
 m4trace:configure.ac:12: -1- AM_INIT_AUTOMAKE([foreign])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:12: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:12: -1- AM_AUTOMAKE_VERSION([1.10])
-m4trace:configure.ac:12: -1- _AM_AUTOCONF_VERSION([2.61])
+m4trace:configure.ac:12: -1- AM_AUTOMAKE_VERSION([1.10.1])
+m4trace:configure.ac:12: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_DATA])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:12: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__isrc])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__isrc$])
 m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:12: -1- AC_SUBST([CYGPATH_W])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CYGPATH_W])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:12: -1- _AM_SET_OPTIONS([foreign])
-m4trace:configure.ac:12: -1- _AM_SET_OPTION([foreign])
-m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([foreign])
 m4trace:configure.ac:12: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
-/usr/share/aclocal-1.10/options.m4:25: _AM_SET_OPTIONS is expanded from...
-/usr/share/aclocal-1.10/init.m4:26: AM_INIT_AUTOMAKE is expanded from...
+aclocal.m4:672: _AM_SET_OPTIONS is expanded from...
+aclocal.m4:398: AM_INIT_AUTOMAKE is expanded from...
 configure.ac:12: the top level])
+m4trace:configure.ac:12: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([PACKAGE])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:12: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([VERSION])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:12: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:12: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:12: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
+#undef PACKAGE])
+m4trace:configure.ac:12: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:12: -1- AM_SANITY_CHECK
-m4trace:configure.ac:12: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:12: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:12: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:12: -1- AH_OUTPUT([VERSION], [/* Version number of package */
+#undef VERSION])
+m4trace:configure.ac:12: -1- AC_REQUIRE_AUX_FILE([missing])
+m4trace:configure.ac:12: -1- AC_SUBST([ACLOCAL])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([ACLOCAL])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:12: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:12: -1- AC_SUBST([AUTOCONF])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AUTOCONF])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:12: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:12: -1- AC_SUBST([AUTOMAKE])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AUTOMAKE])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:12: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:12: -1- AC_SUBST([AUTOHEADER])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AUTOHEADER])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:12: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:12: -1- AC_SUBST([MAKEINFO])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([MAKEINFO])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:12: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:12: -1- AC_SUBST([install_sh])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([install_sh])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:12: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:12: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([STRIP])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:12: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:12: -1- AM_PROG_MKDIR_P
+m4trace:configure.ac:12: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:12: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([mkdir_p])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:12: -1- AC_SUBST([AWK])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AWK])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:12: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:12: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:12: -1- AC_SUBST([am__leading_dot])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__leading_dot])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:12: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:12: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:12: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:12: -1- AM_MISSING_PROG([AMTAR], [tar])
+m4trace:configure.ac:12: -1- AC_SUBST([AMTAR])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AMTAR])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:12: -1- AC_SUBST([am__tar])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__tar])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:12: -1- AC_SUBST([am__untar])
+m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__untar])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:12: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-m4trace:configure.ac:12: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:13: -1- AC_CONFIG_HEADERS([config.h])
+m4trace:configure.ac:17: -1- AC_SUBST([CC])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:17: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CFLAGS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:17: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([LDFLAGS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:17: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:17: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:17: -1- AC_SUBST([CC])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:17: -1- AC_SUBST([CC])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:17: -1- AC_SUBST([CC])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:17: -1- AC_SUBST([CC])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:17: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([ac_ct_CC])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:17: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([EXEEXT])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:17: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([OBJEXT])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:17: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:17: -1- AM_SET_DEPDIR
+m4trace:configure.ac:17: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([DEPDIR])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:17: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:17: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:17: -1- AC_SUBST([am__include])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__include])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:17: -1- AC_SUBST([am__quote])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__quote])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:17: -1- AM_DEP_TRACK
 m4trace:configure.ac:17: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:17: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([AMDEP_TRUE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:17: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([AMDEP_FALSE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^AMDEP_FALSE$])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:17: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:17: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CCDEPMODE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^CCDEPMODE$])
 m4trace:configure.ac:17: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:17: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:17: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
 m4trace:configure.ac:17: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
 m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:18: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:18: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
 m4trace:configure.ac:18: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:18: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
 m4trace:configure.ac:18: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:18: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL_DATA])
 m4trace:configure.ac:18: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:19: -1- AC_SUBST([LN_S], [$as_ln_s])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([LN_S])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:20: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.ac:20: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:38: -1- AM_PATH_SDL([$SDL_VERSION], [:], [{ { echo "$as_me:$LINENO: error: *** SDL version $SDL_VERSION not found!" >&5
-echo "$as_me: error: *** SDL version $SDL_VERSION not found!" >&2;}
-   { (exit 1); exit 1; }; }])
+m4trace:configure.ac:38: -1- AC_SUBST([SDL_CONFIG])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SDL_CONFIG])
 m4trace:configure.ac:38: -1- m4_pattern_allow([^SDL_CONFIG$])
 m4trace:configure.ac:38: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from...
@@ -843,37 +367,227 @@
 You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from...
 acinclude.m4:11: AM_PATH_SDL is expanded from...
 configure.ac:38: the top level])
+m4trace:configure.ac:38: -1- AC_SUBST([SDL_CFLAGS])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SDL_CFLAGS])
 m4trace:configure.ac:38: -1- m4_pattern_allow([^SDL_CFLAGS$])
+m4trace:configure.ac:38: -1- AC_SUBST([SDL_LIBS])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SDL_LIBS])
 m4trace:configure.ac:38: -1- m4_pattern_allow([^SDL_LIBS$])
+m4trace:configure.ac:42: -1- AH_OUTPUT([HAVE_LIBSDL_MIXER], [/* Define to 1 if you have the `SDL_mixer\' library (-lSDL_mixer). */
+#undef HAVE_LIBSDL_MIXER])
+m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_MIXER])
 m4trace:configure.ac:42: -1- m4_pattern_allow([^HAVE_LIBSDL_MIXER$])
+m4trace:configure.ac:43: -1- AH_OUTPUT([HAVE_LIBSDL_TTF], [/* Define to 1 if you have the `SDL_ttf\' library (-lSDL_ttf). */
+#undef HAVE_LIBSDL_TTF])
+m4trace:configure.ac:43: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_TTF])
 m4trace:configure.ac:43: -1- m4_pattern_allow([^HAVE_LIBSDL_TTF$])
+m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_LIBSDL_IMAGE], [/* Define to 1 if you have the `SDL_image\' library (-lSDL_image). */
+#undef HAVE_LIBSDL_IMAGE])
+m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_IMAGE])
 m4trace:configure.ac:44: -1- m4_pattern_allow([^HAVE_LIBSDL_IMAGE$])
+m4trace:configure.ac:47: -1- AH_OUTPUT([HAVE_LIBSDL_PANGO], [/* Define to 1 if you have the `SDL_Pango\' library (-lSDL_Pango). */
+#undef HAVE_LIBSDL_PANGO])
+m4trace:configure.ac:47: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSDL_PANGO])
 m4trace:configure.ac:47: -1- m4_pattern_allow([^HAVE_LIBSDL_PANGO$])
 m4trace:configure.ac:69: -1- AM_CONDITIONAL([BUILD_MINGW32], [test "$native_win32" = yes])
+m4trace:configure.ac:69: -1- AC_SUBST([BUILD_MINGW32_TRUE])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([BUILD_MINGW32_TRUE])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^BUILD_MINGW32_TRUE$])
+m4trace:configure.ac:69: -1- AC_SUBST([BUILD_MINGW32_FALSE])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([BUILD_MINGW32_FALSE])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^BUILD_MINGW32_FALSE$])
 m4trace:configure.ac:69: -1- _AM_SUBST_NOTMAKE([BUILD_MINGW32_TRUE])
 m4trace:configure.ac:69: -1- _AM_SUBST_NOTMAKE([BUILD_MINGW32_FALSE])
+m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([BUILD_MINGW32])
 m4trace:configure.ac:73: -1- m4_pattern_allow([^BUILD_MINGW32$])
+m4trace:configure.ac:73: -1- AH_OUTPUT([BUILD_MINGW32], [/* Native MinGW32 build */
+#undef BUILD_MINGW32])
+m4trace:configure.ac:78: -1- AC_SUBST([WINDRES])
+m4trace:configure.ac:78: -1- AC_SUBST_TRACE([WINDRES])
 m4trace:configure.ac:78: -1- m4_pattern_allow([^WINDRES$])
+m4trace:configure.ac:83: -1- AC_SUBST([CPP])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([CPP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:83: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:83: -1- AC_SUBST([CPP])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([CPP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:83: -1- AC_SUBST([GREP])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([GREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:83: -1- AC_SUBST([GREP])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([GREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:83: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([EGREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:83: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([EGREP])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:83: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
 m4trace:configure.ac:83: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:83: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H])
+m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H])
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([const])
 m4trace:configure.ac:87: -1- m4_pattern_allow([^const$])
+m4trace:configure.ac:87: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
+#undef const])
+m4trace:configure.ac:88: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
+   calls it, or to nothing if \'inline\' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif])
+m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
+#undef HAVE_ATEXIT])
+m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
+#undef HAVE_MEMSET])
+m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+#undef HAVE_STRCHR])
+m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
+#undef HAVE_STRSTR])
+m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if you have the `malloc\' function. */
+#undef HAVE_MALLOC])
+m4trace:configure.ac:100: -1- AC_CONFIG_FILES([Makefile
+data/Makefile
+data/fonts/Makefile
+data/images/Makefile
+data/images/backgrounds/Makefile
+data/images/cities/Makefile
+data/images/comets/Makefile
+data/images/hands/Makefile
+data/images/icons/Makefile
+data/images/keyboard/Makefile
+data/images/menu/Makefile
+data/images/status/Makefile
+data/images/tux/Makefile
+data/scripts/Makefile
+data/sounds/Makefile
+data/themes/Makefile
+data/themes/armenian/Makefile
+data/themes/armenian/images/Makefile
+data/themes/bokmal/Makefile
+data/themes/bokmal/words/Makefile
+data/themes/bokmal/images/Makefile
+data/themes/bokmal/images/status/Makefile
+data/themes/brazilian-portuguese/Makefile
+data/themes/brazilian-portuguese/images/Makefile
+data/themes/brazilian-portuguese/words/Makefile
+data/themes/catalan/Makefile
+data/themes/catalan/words/Makefile
+data/themes/czech/Makefile
+data/themes/czech/words/Makefile
+data/themes/dansk/Makefile
+data/themes/dansk/sounds/Makefile
+data/themes/dansk/words/Makefile
+data/themes/deutsch/Makefile
+data/themes/deutsch/words/Makefile
+data/themes/espanol/Makefile
+data/themes/espanol/images/Makefile
+data/themes/espanol/words/Makefile
+data/themes/euskara/Makefile
+data/themes/euskara/images/Makefile
+data/themes/euskara/words/Makefile
+data/themes/french/Makefile
+data/themes/french/words/Makefile
+data/themes/greek/Makefile
+data/themes/greek/words/Makefile
+data/themes/italian/Makefile
+data/themes/italian/images/Makefile
+data/themes/italian/words/Makefile
+data/themes/jamaican/Makefile
+data/themes/jamaican/images/Makefile
+data/themes/jamaican/words/Makefile
+data/themes/lithuanian/Makefile
+data/themes/lithuanian/images/Makefile
+data/themes/lithuanian/images/status/Makefile
+data/themes/lithuanian/sounds/Makefile
+data/themes/lithuanian/words/Makefile
+data/themes/malayalam/Makefile
+data/themes/malayalam/images/Makefile
+data/themes/malayalam/images/status/Makefile
+data/themes/malayalam/images/keyboard/Makefile
+data/themes/malayalam/scripts/Makefile
+data/themes/malayalam/words/Makefile
+data/themes/nederlands/Makefile
+data/themes/nederlands/words/Makefile
+data/themes/nepali/Makefile
+data/themes/nepali/words/Makefile
+data/themes/nynorsk/Makefile
+data/themes/nynorsk/images/Makefile
+data/themes/nynorsk/images/status/Makefile
+data/themes/nynorsk/words/Makefile
+data/themes/russian/Makefile
+data/themes/russian/images/Makefile
+data/themes/russian/images/status/Makefile
+data/themes/russian/words/Makefile
+data/themes/svenska/Makefile
+data/themes/svenska/words/Makefile
+data/themes/swahili/Makefile
+data/themes/swahili/words/Makefile
+data/themes/wolof/Makefile
+data/themes/wolof/images/Makefile
+data/themes/wolof/words/Makefile
+data/words/Makefile
+doc/Makefile
+doc/en/Makefile
+src/Makefile
+nsis/tuxtype.nsi
+tuxtype.spec])
+m4trace:configure.ac:189: -1- AC_SUBST([NSI_INSTALL_DIR])
+m4trace:configure.ac:189: -1- AC_SUBST_TRACE([NSI_INSTALL_DIR])
 m4trace:configure.ac:189: -1- m4_pattern_allow([^NSI_INSTALL_DIR$])
 m4trace:configure.ac:194: -1- AM_CONDITIONAL([NSI_BUILD], [test "$dll_path" = no])
+m4trace:configure.ac:194: -1- AC_SUBST([NSI_BUILD_TRUE])
+m4trace:configure.ac:194: -1- AC_SUBST_TRACE([NSI_BUILD_TRUE])
 m4trace:configure.ac:194: -1- m4_pattern_allow([^NSI_BUILD_TRUE$])
+m4trace:configure.ac:194: -1- AC_SUBST([NSI_BUILD_FALSE])
+m4trace:configure.ac:194: -1- AC_SUBST_TRACE([NSI_BUILD_FALSE])
 m4trace:configure.ac:194: -1- m4_pattern_allow([^NSI_BUILD_FALSE$])
 m4trace:configure.ac:194: -1- _AM_SUBST_NOTMAKE([NSI_BUILD_TRUE])
 m4trace:configure.ac:194: -1- _AM_SUBST_NOTMAKE([NSI_BUILD_FALSE])
+m4trace:configure.ac:199: -1- AC_SUBST([NSI_DLL_DIR])
+m4trace:configure.ac:199: -1- AC_SUBST_TRACE([NSI_DLL_DIR])
 m4trace:configure.ac:199: -1- m4_pattern_allow([^NSI_DLL_DIR$])
+m4trace:configure.ac:202: -1- AC_SUBST([NSIS])
+m4trace:configure.ac:202: -1- AC_SUBST_TRACE([NSIS])
 m4trace:configure.ac:202: -1- m4_pattern_allow([^NSIS$])
+m4trace:configure.ac:205: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
 m4trace:configure.ac:205: -1- m4_pattern_allow([^LIB@&t at OBJS$])
+m4trace:configure.ac:205: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([LTLIBOBJS])
 m4trace:configure.ac:205: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:205: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
-m4trace:configure.ac:205: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([MKDIR_P])

Modified: tuxtype/branches/tuxtype-soc-mh/configure
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/configure	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/configure	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Typing 1.5.17.
+# Generated by GNU Autoconf 2.61 for Tux Typing 1.5.16.
 #
 # Report bugs to <tux4kids-tuxtype-dev at lists.alioth.debian.org>.
 #
@@ -6739,21 +6739,22 @@
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6790,7 +6791,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

Modified: tuxtype/branches/tuxtype-soc-mh/data/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/fonts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/fonts/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/fonts/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -64,31 +64,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -100,19 +88,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/backgrounds/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/backgrounds/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/cities/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/cities/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/cities/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/comets/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/comets/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/comets/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/icons/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/icons/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/icons/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/menu/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/menu/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/menu/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/status/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/status/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/images/tux/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/images/tux/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/images/tux/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/scripts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/scripts/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/scripts/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/sounds/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/sounds/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/armenian/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/bokmal/images/status/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/bokmal/images/status/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/brazilian-portuguese/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/catalan/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/czech/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/czech/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/czech/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/czech/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/czech/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/czech/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/sounds/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/sounds/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/dansk/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/deutsch/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/espanol/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/euskara/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/french/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/french/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/french/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/french/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/french/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/greek/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/greek/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/greek/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/greek/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/italian/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/italian/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/italian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/italian/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/italian/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/italian/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/italian/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/jamaican/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -76,31 +76,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -112,19 +100,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/status/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/images/status/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/sounds/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/sounds/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/lithuanian/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/keyboard/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/keyboard/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/keyboard/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/status/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/malayalam/images/status/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/nederlands/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/status/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/images/status/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/nynorsk/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/russian/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/russian/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/status/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/russian/images/status/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/russian/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/russian/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/svenska/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/swahili/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/images/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/images/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/themes/wolof/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/data/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/data/words/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/data/words/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/doc/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/doc/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/doc/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -87,31 +87,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -123,19 +111,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/doc/en/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/doc/en/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/doc/en/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -75,31 +75,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -111,19 +99,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/branches/tuxtype-soc-mh/src/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-soc-mh/src/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/branches/tuxtype-soc-mh/src/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -37,11 +37,7 @@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -58,7 +54,8 @@
 	snow.$(OBJEXT) scripting.$(OBJEXT) SDL_extras.$(OBJEXT) \
 	pixels.$(OBJEXT) pause.$(OBJEXT) ConvertUTF.$(OBJEXT) \
 	options.$(OBJEXT) iconv_string.$(OBJEXT) profiles.$(OBJEXT) \
-	profilesgui.$(OBJEXT) highscores.$(OBJEXT) wordsperminute.$(OBJEXT)
+	profilesgui.$(OBJEXT) highscores.$(OBJEXT) \
+	wordsperminute.$(OBJEXT)
 tuxtype_OBJECTS = $(am_tuxtype_OBJECTS)
 tuxtype_LDADD = $(LDADD)
 tuxtype_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tuxtype_LDFLAGS) \
@@ -94,30 +91,19 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NSIS = @NSIS@
 NSI_DLL_DIR = @NSI_DLL_DIR@
 NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
@@ -129,18 +115,14 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/ChangeLog	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,3 +1,15 @@
+14 Jan 2009 - svn revision 844
+Version 1.7.2
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - fixed crashing bug in cascade game in fullscreen due to size of blit
+          queue not being big enough.
+        - fixed drawing glitch in cascade game where words with terminal 'W' had
+          not been getting fully erased in redraw
+        - changed title graphic to "TuxType" instead of "TuxType2"
+        - added opening sound "harp.wav" from Tux Paint.
+        - added rest of fonts needed for remaining Indic languages
+        - changed "warning" output from image loader so it only prints if debug on.
+
 12 Jan 2009 - svn revision 841
 Version 1.7.1
 [ David Bruce <davidstuartbruce at gmail.com> ]

Modified: tuxtype/trunk/ChangeLog~
===================================================================
--- tuxtype/trunk/ChangeLog~	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/ChangeLog~	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,3 +1,27 @@
+12 Jan 2009 - svn revision 844
+Version 1.7.2
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - fixed crashing bug in cascade game in fullscreen due to size of blit
+          queue not being big enough.
+        - fixed drawing glitch in cascade game where words with terminal 'W' had
+          not been getting fully erased in redraw
+        - changed title graphic to "TuxType" instead of "TuxType2"
+        - added opening sound "harp.wav" from Tux Paint.
+        - added rest of fonts needed for remaining Indic languages
+        - changed "warning" output from image loader so it only prints if debug on.
+
+12 Jan 2009 - svn revision 841
+Version 1.7.1
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - additional code to work around unreliability of setlocale() under 
+          Windows. We now set LANG for both the C compiler and OS as well, using
+          Bruno Haible's my_setenv() function from the GNU Gettext FAQ. Tuxtype
+          now starts in the correct language for the underlying OS, and also
+          switches translations with theme changes. It does not yet automatically
+          pick the correct theme on startup to match the current LANG.
+        - additional code in ConvertToUTF8() to handle Windows' 16-bit wchar_t vs.
+          unix's 32-bit wchar_t.
+
 10 Jan 2009 - svn revision 830
 [ David Bruce <davidstuartbruce at gmail.com> ]
         - adaptation of menu code for lessons activity so as to be consistent with

Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/configure	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.1.
+# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.2.
 #
 # Report bugs to <tux4kids-tuxtype-dev at lists.alioth.debian.org>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='Tux Typing'
 PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.7.1'
-PACKAGE_STRING='Tux Typing 1.7.1'
+PACKAGE_VERSION='1.7.2'
+PACKAGE_STRING='Tux Typing 1.7.2'
 PACKAGE_BUGREPORT='tux4kids-tuxtype-dev at lists.alioth.debian.org'
 
 ac_unique_file="src/playgame.c"
@@ -1286,7 +1286,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Tux Typing 1.7.1 to adapt to many kinds of systems.
+\`configure' configures Tux Typing 1.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1357,7 +1357,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Tux Typing 1.7.1:";;
+     short | recursive ) echo "Configuration of Tux Typing 1.7.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1469,7 +1469,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Tux Typing configure 1.7.1
+Tux Typing configure 1.7.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1483,7 +1483,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Tux Typing $as_me 1.7.1, which was
+It was created by Tux Typing $as_me 1.7.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2307,7 +2307,7 @@
 
 # Define the identity of the package.
  PACKAGE='tuxtype'
- VERSION='1.7.1'
+ VERSION='1.7.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18188,7 +18188,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Tux Typing $as_me 1.7.1, which was
+This file was extended by Tux Typing $as_me 1.7.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18241,7 +18241,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Tux Typing config.status 1.7.1
+Tux Typing config.status 1.7.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: tuxtype/trunk/configure.ac
===================================================================
--- tuxtype/trunk/configure.ac	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/configure.ac	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Typing],[1.7.1],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
+AC_INIT([Tux Typing],[1.7.2],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
 AC_CONFIG_SRCDIR([src/playgame.c])
 
 AC_PREREQ(2.61)

Deleted: tuxtype/trunk/data/images/title1.png
===================================================================
(Binary files differ)

Added: tuxtype/trunk/data/images/title1.png
===================================================================
--- tuxtype/trunk/data/images/title1.png	                        (rev 0)
+++ tuxtype/trunk/data/images/title1.png	2009-01-23 12:35:47 UTC (rev 852)
@@ -0,0 +1,96 @@
+‰PNG
+
+   
+IHDR   Ê   6   †5Ê   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs    d_‘   tIMEÙ
+1žÜ”û    IDATxÚí½w˜$Wyïÿ9§Rç8=ywf£6IZå°Ê !!	0¾dKŽ8Û?ø:±q ‚Á‘ƒd‚A"!!¡¼»Ú]mžÝɱsªªsÿèS35£•Xžßµ¾ªç©§{zº«ê¼çÍï÷¼ž?ž?ž?ž?ž?ž?ž?ž?ž?ž?ž?ž?ž;‡ø/¼¦ñÿ÷ô«ú”Öòè® ÿÿAºü±B ¤>-ý·µâs©™Àš@KŸíÿŒ!C42õ{K¿—€ú_ at CWŸ- ¡éâ=Ïž¿8‚„¡'ÛÔÛúŒ}ÆôgNˆ!< , ³ÀPÒŒáý‚ÒÎÑC†”„{TŸNè½úÒ4¨ sš.óšV­ç¸"!E¶ŒÞÿ4h>Ëÿ,}“	A4tÆ€„>ã¡×@hájif˜ŽO‡5sT~(Œ€‘Ðxã!H„^Ãô	‹¡-m]ÓaLÓå p\Ó¤õ@Fô«zÞ†ÓÿËh>#Ø@
+È=úÌ ˆXHP¢N,&ìˆ#¸m¤»-K±Šï׊ÍÖ±=ªY=ti†Û£‰Ûü¡WBÓ& K—¦S2$ÁÐ'&œX\˜¶-£ÉˆŒg,#Ým-ª`·Õn{rÁ/Ïôµ0¢]2ÿ9¦(b at Z½GßÑBQ¦µBœû±Œ?³ ­!rÀjà`°J%"ŽŽpbQ3?1sý¶‘ÌYöª-¶=|ša¤
+RFâÈxFH;ºÌ¹SžOkdgÏÌÇþ°«uìI(‡,Jû9Æ'²°I X¯i³Vÿ‘@ˆ(Òˆ˜]ƒQ3×ïÈxÚ²û6ØÎú³L3¿J
+;"ŒxFÈhr¹Ó« =s¼0ûßvWï¿-¢…c(jíü\Q"BI^}3°NÓ ªeN[çô9ªÇÑüŸ$(–Ö–CÀÙÀÙ2žÙݲcµÝ¿!nuÛf~@š¹~if{…°œ¥_`Ä@ÆFLbF%¦#±ãB€ß‚Ò‘†uº‘¹ö×û¦>ôÛëQþqà0TŸÃ‚"4#€­À¹˜öéÑSÎßèmÍš]««°Ê4óÒÈô#–ZöK3a`F†#±b†)PÔ&\*Ö È¿ô÷ÓµG¿=¤•9í~èx¥ùR)`8WDâç&λþL«gM¥Œöøvå¡o̪FuèÓB%´t‘Ý0óÖ¤ lq^êò×\š½ö×zÌÂjCZa€°ÀHu&ÛNJ¬¸aHLËÀ±l»!P^(9«¿ÊøØэç˜Â°òÊmö…̶¡	ú\¶&ÃÀYÑ-;®ÊÝô["k¶ÛÒ±Àa€™ •˜q‰0°ìmÇÂRI”àPK&%1ìSÛ·««OØ}ë2ÍÏ÷Ýúžf(køóVíYl6’ùó{ç£/Š¬?#*|ðÛ™«ß”žþøŸæŽëßUµEié÷¿ð‚bhBôëìþuÛº^ñÇ}voN$Ö™$lÃB(CHBH”¥+ Ê{ö”šeÙø¥	„ŒP­Rú¾Æs˜N¶ŽÏ†„ÝœÅoŽm>ÓŽd"ض…¡¤Ha (%:tQËér¢4£!$Ô¦©aêø&­_-þkê]?ëah«Ú¬KîxÙ™±SÎŽÆÖÖÅñš‚é½s›ìyó{3Çþü%«ýz¥¤Ý°£Ú%«?ÇÝëŸÉ¢äÁèæóû­tNdÖEèÈá·*¢¿”O¾Ðo”·
+†	2”8¢Ã5ÒX&˜öÈ|æÿÿФ¦ÖîývßÚáèêMv¤Û`x}ß5Nž.€×îüm˜aº€ð=„!¡lÒÿM!<½~ãé§öO’¦¤wÜØkD¡«7I”8ʆÈæ#G¬Ú â§]–.?ðõ>ëæB^Ã/¼ )Ï$Fù¶`4L”+:“ùljq1µ£?ÞÇôÝ_#¹ù4Ö^ÿL§ó!õiÛ „¥ å³\U„òõ¬È×û¡ßšú4BîJà²x!Ù
+]„î¡B×m…˜(ÈÆ;ÖOÅ…TB6%~[vè"~:]P07Râð'?ŒSèeÍ+^N<éÐLékH0Ì >ã°T¯2žÁ¿¡ñË>Mç@ Z6õYׯφ0õo3@Úê4…€X4Ú™ Ò61ý2žÌau
+:dKãÚõ’,Ggø+æôÿ†2!+h†>·Nð› ~
+RÙêd‚ù`‚P	Bú×
+5¨ÏרOÎàVK^¸
+ºJ£Ôb¼äUà5i×X‘hljH)0²]  @g¯z–ðä†-\ pA:6bŒ@P‚N-…‹¥A
+ `š²>ús±¨H”² PÈPÖj@£Ø¤1[¢:vœÞs·M-͋׆±;þ“Ä7!Ic¾B¢«#(†	FÔÁ·-ŒT^êy‰iËèçž]­Pl‘P»JÉÚ½Më3£¯¯4ãE΢{+D£à~jãÙPõ6&YbsÕ¨‚“¡šÅ´°ôéç!¬”Â5#÷g°vfH(™0,GDTuJ»šsïdÒÃ`Rk
+}ÙÊB›Ýÿô÷é^Ì\Va ¿ÝƲ–¢|ä8ÎÚíHC 0Áõ1×Ã4 UܱÀňZŠ¥
+~eJk"´¥sBXקi®œþM$¤9=MŒr(¨âŽKt_i†Náï˜~­²Ž#Å]„ Ï…}ý8­j+Û‹Õ;L«\%‘Î,Ò¥Z¬C,‹áØ(¥P®·H ©<Xîztº®Ç4£ÇàêçÈèñv…4¶¥ÇQÓ§§ÇÔ;ºõµlý½’®wŒ:ÃV
+ý¾PsÜ:øQŠ£³dVå‘5ŸÊþ}DN[…ߨš›5ú÷­ƒ6C÷ª†,~P°¬†æ¸©ÿ¯žA±'€l¨¦ÄwP#±
+¥A)2®ã¨`*Dçg-8ê*!D'Æ0D'îh•ÊĶ^‚™ïEµ˜É4†±Ü'ræ°rÝ€B­J
+Ù×A+H»“.¶r½fküPè×!BŸªå¬ÖE¸¬pà2Tôw…®ïä„mç„4â «0èË‘|waºîÎN”@UôDHÀÁ0£Â´Ñq}嫦j5f@v;5ÃP
+¦‹Ôî¨ëƒpR¤N=¯8ƒ™í²͎‚ÑSë7˜™íª	ZÕúrÀœm¡$˜¹ž@I¬Ò)ú‚Úcš™+úÿý:? $¡çÓÓt©j 9aGº’g^ÙÛz~R)Üòœ¿p÷çæÛ3£³º@8¥éhÖyý÷´~ïê9‰Fõ±ï·s/xsì®2“MÒuÎyŒ}çNd×0^ežÊ#w+ý<]Àéºî$V0i%déú
+}ÿYýLSZI‚ã…,j\_•ÎHkË•Õôè¸öB:2šˆ ´RTH>JµüzµˆòGé¾
+¹®•°53ŸÉçAL!”þ¼r3‘¤úÄ=˜©Öæ³0Dç{éukUdÆ 5u»0Hur–îu 
+°"VGsZ–¡tŠ¾çڐ4›šÖ!¡ø¶[/HËXÒD)šã‡ÚÅ~¥èUš ‰Ó/Ng.e*²f›mÄ“B˜6f*·¨¯½jIÍëÖöÄgÿ®šÜ~™]wªe÷¯5íÞ!iæz¤ÐÙ¿ÙPå¿UŸýúGFÚ³ãéP
+ ¸¨M…]×Ë«71âIpÌßýz^ñÖ¥ØE?…[«"m·8…OQŸ­â»>¦Ý!žNáù.Ò²±¤c÷¬î¦ñªÅ­±CãZPŽègIÃ2žZ“8õ¢Á؆ÓSöÀ”ðuþ»Ÿ«UwÝ_Å÷üøÖó£©ó¯I$Ϻʱ{‡¤Ô©ß„®ëß’<ö·¿Ú]yüžUšY
+`òf´pEÄV\©Ù¯~Àmtâ›ÏůW¹óÛXÝÃ8¹^¦>ÿ÷¸s Ž‘ÌöFםÖ]¿Ý6Ó¹E~+?tw½²óGU|¯²nÈMžÑ÷=ÐÚ~Z?›ÔB2 ùç4„Øènܘ8mGŸÝ³:†_‰Ö䈊m=ÏJóBS˜ËC¿Ý¢üÀ7ÛcyÇ WšÍk¾[±æ3e½!3Û%¤Ã‹.‚[¯"-o~+“Ch­j†²:Ґ(	Å{n§pÃ[¨«'KäúR ÀoÔ1%)¥‘ʧ¤m¯GÈ^|¯Øž˜ÖMÈxª7sñ
+kó×¼.XgÇBZT«jCÏË+5ú¡·µÓ^k¤w¼Ä0b6fR`';¶i	"	“VS10%ºnx‹:ÿE¶Ó·¦cÕ,&8‰4;©ÜƬ/¢7ÇÍtvÝñ÷ÿ^  Ót0i6 ŒXRšiJíž{­6²ñ&:¢]V3Üû†mSüÉwˆ®?§0ÀôîÃôo_׉[
+0}ºoú
+Ñûªß3…í˜WíVWé¡»ûÇ>úg^qv5P1RùL×uoXŸákÓF2+eÄ@ÁäCfÇ‹â½_MËX’ä™—I#ê`Ä Ñg’ëŠb“©‘Åc0ü¶FüF-¨ºÖô¨ªí{¸]Ùy_£¶÷¡²»0=²*iÆ6nÌ\üÒˆÓÕ×±¬ñ‰mçu|âÙqJ|»­,Üð«‘ô/ŽñÂ2‘¶¾IòWÿJ´y쩬ò<Õ<Vœñ«»îoÎÿKEw~zJ+ˆ=ÀºÒ?©ù´8
+832´éœîWüöÆÔ9/ˆÉHTHÏV>(í?D{$vÔX–5¨OÌK®·T«Öwü_ÿ”_Õnؤï"ôÆ<AÉ|#ï¸HV‡ñ”•#‡0z·à•ç5沬ê¹B@ãè“”¾›ô×pô›w1ÝÝM«\¢U®`	Xý»ÿ$ÍdÎvÄAˆ¬j·WÍÿˍ‰Ïþý¬j6¼Á›ÿº7s鍎ĺ%Ùî(±ˆMËõ™>^§lôŠ·ü…måzˆ®²éŽ‘°cH¡c5µ”%öŽ¡Ô²ˆ®^ObØ Ðű-ebÈN*N)¨äëzxŠÌùWÛ“Ÿyo_{flµöí§v—–£¤ib[C|åccñ­©c–X†é¤€%¨f¹o|ŒÁ[ÞÅ̾=”ìÇHd™üAÒÝ€3܍hÞÄ0Ž¶0/»Ññk¥Ñ¾-&«µæíÿÑßt–e¦©^ƒt6BĶžÁB¹ÎÄÞ
+¹+^.‘í—ôD‰E"˜Ø(%ñôö94Ë£;ºèÑú
+éÏ‹øÆÓœ®ë^︳“©ùþg÷ôW>Rvç&jHCõ¿ñ…Ü^5b1¬XqI"obš&3GÙǪßx2Ñu[„$
+&É„M4Ú1gs£5¦‚sö6¡Óä"Șº%dúœ+Ì®ëÞ›½ó“]3_ûh·ß¬´Û—Òˆ¬GʲW¼ââþ×½mÐÌäe¤[ísH$iÐö<Ê¥&õz›ÕýYLátj[úXHÔÙ5C梗˜S_þ—\küÈ vãòºþSbóµ†&ÐRøBÂô£;‰&ÏC)IcfšØ IõÉHnß±ÈA°ïP^»ãŠùãŸzŠŸ²]D7‡×¨"퉡HH¶+!‰$
+Pˆòxû¦[¢ÍcûzʏýÐË^ò'Öo0´.EÌŠâúßË §/Æ“{vãôIFI;|Ÿe„X¬éTJ¨f3§M’tâïéØ+ˆ#¢±8bá82=ˆ•ëŽ¶gÆ‚¬“øÏBŠ¶P<p€Rw'¥øäXkÎfþû_-Fˆ.Ué.*•ùï}I¥Ï½R¤Î¾ÕnÑ®—é¹é¥ô¬‰“r¢X¦
+J¢€¤¬rä‰)2¼Èœüì?¤ã[ÏUñMgXÉaƒ¡Õi#JÛÓãÐ•±qM¦ŽÕ1c&ë†s¦Ó¡M€
+ˆD6oD~³ ß÷hymên‹â\“òxŸ°»o±»®þåüÔmÌÔö?®º®y­íÒ».FÊŽbj_Îõ!µ¡Å‡Ž“Ør6 ÉÕ&k‡²HiãzKs“ï²Éö4°¥‰i(íŸúJÑh·˜­±íý¯ÿ;{ÙKûŽ¼ç–xóØþ ˆÛ£‡±©ç•o½¬÷U¿Óc¦ºÖÛôf2,\äµ$$r	¾2ðWäÏ’éFe‘Àîê·[ãGRZ +SÉaAñt Uæ‹~§XxÙ¯Æ<#ÉίV&v꟥ª{~¢„¤SôÔ"C(Àk41$øí†jv÷ýî‹É]õJ3{ñu"¾q;‘‚ 0!‹a	³SÝÆ›sL6^ò«²ó~)¤@-4±D¼3p–Ï0%”'© Sí!yÙ9ÄÖ²ZF»å³ï?da÷c¤.¾¿é2ýØA¬3·‹ßU>xTJ-꣇‰fYÀÁç|íÀ3ÍÉ£ƒvWŸÜ÷ÅÛpçƱú7 …¢ôÐÝ*µýPxmw™ ´*%¤Äo7ð5ÿðßÜâ¥Ï¡‘»üe2}Ε"™°ÈE3øJà…’“N$‚7uï)
++W@š’¨/0‰âz,Ö1© ¿VÄõã4«K®ÚE%"ñÔò$’%
+l'B¦Ï§Uh35[fþ¸ ïWþÀpç§1¢²Ý²‘4¾/ðü%¿Ý²l¼©£ˆž†šj௲Qjù3ÚŽ Þqa<ðüÎ  b˜¬î’K×=RBÈSÄÚ·ÿ{êÀÛy¨==ĵd¯¸ikï/ýF·3Yµ9FÆIáù²SøÒ
+Ðó:×5¤±ÌóQªóy£êÑ8~gë€NÑ,®)zZ]o¥ Ôµv¼öÔcÇÇ>ú—©¾_ú­XêÂë€[)2öñwû~£¦¼jÉ0,‰çú„bùÅrf| é•æÜéÛ>èĆO‰¤NÛ.ú‡Rdã‰E
+h™d!ñ‡ÀÊäñêU‰ß¦6YdtômÆ4CÕA©îÅòìþÔç±óÒk×2|Ö†Nìd
+ŒX”Ìå/Ç«W1¢qJs
+¢ÇŽ’ؼ¶CL‡ØËè×>N”Ô9/Â+ÏÑœi„R—`sÌ«û—?î|ó;{g\&”ç1{×TõÉŸøñÛ¥”B(_-¯úÂxóÓ
+h«f½¾ðƒ¯¿VŽgνҚÛ=B¡Ç‰,)HªÝ]øÕ²BùŒÿø	Lã²½Ls… .±!ÙóÅÿÄŒ§¦ÁÐ¥;Èb?½*¡ÝVÛtì±É¦êŒŽ”hÝà+æ=BîÒ,öŠòêl‹óR:>ΡÚ<=gœF<Þ‰é·hÔaì‰ýL|ïNÜJ	#%³å46\{%ÉhŒ5k-·f«Ö‹ž›nNÿà;û¸™)ƒo~Ç€•‰ˆ¾S¢d#i<_,ÙžÇvgäöOcgóœþæ׍-±úØÁ)Ž|å6ZÅ9â§^„Wž§==$ê¡ÚÎ3
+JM3Oâ{ù™¯}LÎÝõ…~§gU!d{nÒw‹s ¦_+E¤0är×Ë­×0%¨V3ÈçW€„Âö®Q­Z—è0QXãVëà»(¡ðÊójö[Ÿ¥ûú׋©]{9rûç)œ}[^|Éâ$é¯ßJö’눝q9(Eqìåá~²…8ÒnßÄÈÁyÌxa@ߎ!VwåñýNEüÐý»™¸ïGä¯{#HI}d?cŸ|oÓ+ÍÍë:Êd¨þrx¢òؽѽo}ñÆHÿšœ0MÓ«•Ekò¸~­äH‰)åÌÛšŸÃèíFy­ ò?¸ÕÝ?É6ǬL^ì¼õs$†Ö±æâs:/¨xµ˜ ˜¿÷ë~ï«KFWoG¾u7ûŽï'»m;Ûnºz‘ƒøÈplŒ­R(Ï£U©"»—¥Ù‚±½ÇXxrÕãGð«•Ž]I$I®ÝHaûvº‡r$c16®·9К¢^…¦k°ç‹_#±þz6“Ì:ˆ —êû	åÇDòô”g&˜øðGØtӍô¬é^’±§¦Ø÷á÷;õBÒ—¼tëä•lkÏßJ$b1°*Áá=Ót½è—äÔmJ´f'ìU·ü™ítu‰ü›ÞD׋üÔhøìþòTÆ'È^õj”ï2{h”U§-²[õØÉó¯ä½0ËÄçÞç7ǏÔu¦íiü‰‚ù¦ÎpìÑ~yïW‡êGö†¾1 '¤p„D„Mš ¤m#$´ç&Á›šcûSÒ4Œ‘ÁmJï†A,K,ŽCsz@ú=+—7Óç^%rë6c:>†=¹ì0ÏÂýw2ùåªì%×’½ä%"¶fc?Fú…;0È÷¦˜¦®L²kL†y|e¢€#<ÅÔ}÷½è:Ê»dä_Þî·¦G^µ<£…â)u™Ó´	ðp>ž»Ð8¶¿7Tè³€4Bt¹TgYŒe´ç&Ñ“0Ì{µrmòKˆ¯ºåǝ­;hThVªÄâ©ÅÚS½¦T»åú뛽U¿úN;±íÛz^i–êB•t>¾,qPÝ÷0÷ßEò´óHŸ}Â4–¹‡p?3ÞLrà„­ë¹ž‹[)rä»ß§¼n5ë/9Ó4éLsèÉ	¬\~4ÊÂø‰|šL®wqœn­‚)aìSÿ@ü'ߥ÷·»äZœTlÉðàø·ï ë†7àÖkLßù)æïý‰ÍgÒÿ+¿O£YF)…‚t>Ýڏï&}ÎåFíОHö¢kd¤[2Káû²# šMŸ]Ÿ¿
+—™_DãآçP]X@ù¾ƒ€a™L}ýVÆ?õOª=7ÙÐu›#úœAzNXGiëåˆ~?¡Ópyà¤u•u“"ó‹•w¡ërɺÅ¢éo|:Y¸ú•Ñu§Š±Gw±ðÔ>¶]%¦þq»^C:๥¹Ö¡wý†›ØzŽ³é=Ÿ–F<ÖåÒ}šãG½‰Ïÿ›_zä‡Æ–÷Ýn´dœÉýÇܼ
+m]Å\mžÁB¥:C>¾g”ÑoßAöÊ›¨ì~ˆƒuKÛ]˜©jòðˆ>GXZX6©‰WÔ‚Ô­31	ªÝ$¤Ì	‰-VóR*TÇ*(XÐ×X˜¹ó3Ñځ«‡ßúîXrÛvLÇ\¤i‡é—Ñ´Ù8úTcÿŸ¾ÖvÖ$V½åmvöÂÑ(×ÈuÅ—,ŠT¸óSL|îŸñk%²ç^¶|®tm'}ÖÅ”½âC? 9vDùí6ÑÕëÉœw¹HmßAuf‚F¥A*%‘‰!Ë“­—‰á©å…´m¤„úá½Tv> ¬tVô¿æ7;N¯íƒ²c)8ðŽ×QÝû¨xõC{DïËÞdºN3D¿X2BÉóˆ­™s/V¡w Šmt’ˆŽ»µ÷Ž»qÍñ
+§1yûG™üϏ³õß¾L§:à?±4RB{òX ÐËšçwû5Ï>£E	[•bHëdiùë ¶*C"ãáI]*´)Í\óÀ´W^ˆïû£W%^÷ûé®Ü$ìˆÕ)‘j5ã·ZXÉ$Õ½3jƒ£”lMŒ €2ÃÖKW¹ƒgnÔöï´&oûH¢ÿÕ¿!'žÜG~U‰¤M,f“ŒwãÓ©—LçÐ?EþE¯¢qüûÿ÷›]·8WÖB±x\퀦AP te]K†ªÃ[€‚ørE6(bMçšví¦tmÿΔ[œ‰
+¡DÄ1–&•eã”Ï4`4G*Oü8—¿øÃtì§ÏC ¿„@IJåbAY0yûGX¸ÿ./ ¸K.ÜÿmcËû¿"£C½Ä━i,©p”¾‡ÂկĀÛÔÐhßÕY|!„Bt¡‹c`Äâ¨v3’Ðt‹³Ò¯WV*-Ú-W§“!’NP«»èj¬lH—¤K¢ÔRà~䱃TÆÆH{“ÿù1F>ðçÊH¤•ß¨H•I |µl>B<(­#z¾ÇC¨†g…£Œà€‚FOéÜr	h𚘠R-ä²tsÀ€‡ZÓãS#ü‹¦W™GšbÑï$
+!ªÝƒÕʈN:6\›Úr	¹8غÈâøç?جy
+«gˆÑGwwj;|Í6Mö~âCä_p­é1ö½ã
+¾[œ«iÆøð#`·%„3
+ÜÉYM‹ƒÀ>m¦B¨•5¦Ï¦MQÓ÷00'ÀÇS4ëíå¿•Ë~(Ÿ	 $,Ër9öLj4…5Nr	rQ{a¾óS{Â1)oíï½[8Ù,ù‡¨cvKAcvJ_×gå}÷Ù-Í¢|·S—µjR©e|²H%á_ *íùIeØf§˜«¿MÄQ푾A¬„C!ÅK™¬âB‹cßü
+™s/§øà÷8ö‘wû(ÕRíVÛoTÕÓx-ó…à*“ú:q2X/BhÎVµ4
+ð—RPj¹¦ÐLmÆ“Â+TîŒöá@„ ²²³8±Kš3@za(Ðé\¿ÝÄ\"t[–ç5jíæøáH|ý)Bu ^Kµ :>FæÒk1¢QFoýGÕ=€&iáØ­·¸ÒO
+)7ìk‡P§®º, –k0)DËOiÈ€öBšoÍŽ» Œv½$Ña¼ 0D¦†{€[{Š&81c)&ZAK!ô¢†Pâí&	CК
+Æ¥ìBŸÜø¶“[ÏÉ^ÉP>
+¢,W.­r[Bsüè2æBSûð)”§„T´š­e|d?„Ýs„PŠ¼áy.¨Nòƈ	2±h":ñÎþ¯}•Ô9—ÓšŸäÐ{ÿÐ÷õ¦æUC$n/l  IDATl!CÏwb^k…²›'l„!Oç¯XÙAyJ¹.íz+«;™èJ:¬ˆKiA+óBÐ\$pià§l;±· ÃçR¬h ¥ø.~³Njoõ¿òÍNîâŠx—`Ë–>lS.ë·fë0…<Ò€þWß,¬l+P«aØ·:	º,£ò\„P´ÊÕe÷å³|Ì¢ØÒñ^V¿o ÕÖÔñ¶´Zõæâx-»³Ìڌǰ2ùðâºna‰ôéçfâ1{‰žËj±úKZ¤4²;^Ýöo·'Ò§!sýû²ÒZL»Ž>¶³w­éQ£‡;Œ+—_S„¯	´g&”4Ò4–æzåó…zuøBN¯K U© N’(5ˆYÖâÿæf*ÔŠ%¬LŽ£ÿúª=7ÕÖB·€ ¶zK¨ÖeE…àüî3 ”OZPdÓï f{vBIËÄk·¥ßÐ9m¦
+íïְ€dç!„+¤Pøþ"q¥€x:@‘Ütj°+¤XÜ–R,Cø>¸ÊoãUËód¬|wfàU7ÛNZ²f0EÄê@˜*5—Z½S ”R0´¦€)Û$×obè-¬ýèÖÀ̵:‘Ö‚.ÊB¡ êìöÌ„/¤ÀõüE-&5bXyí0Œ¾G£¦Wëñ6šc#-! ¶P\Ô¼¦!pŒQlx}Ð*¨×ÊäW­ýÝ¿*DúW	'*IE­¥{ŠgE| 9¥Xî2GW¯§üÙ?››Þõa+1<(zW[lìËaiúIÅ£?¸‹ØêuLÝù¼j™°¦Ÿš;¢¨|Ñ™;õ´ï„¾4
+Œ(ÏEà¶Ü%¾’it T1ÇDJ¹8†Ñûï#}æ…”Ÿ|ˆÙÞ釬C‹Ùyó÷>éeÐæI®s4ãôhØw¼53щQLc	N.ÀŠ:	kóOåÔ7oËLßýÕa¿Ùhé )Ê~¯ÕÄu=,í?¥òZ3`eòñ„å·ZñÌÙ;äÀ«~Õ2¢ñ¼ƒ%;ٍ–ë¡œÂ÷°s]²v`¾úf'RÈ‹|C.’ åCË…Þÿ~’«×pö+oÀ¶$шÅðPžÃÇæé½á5¢¼û‘ÔäŸÖn”­a{´;6»r½bUh,´Þ#Ý.ÎIÚ
+D4Ú©khÝdE¤½×þ’ÒˆN}ã½­Ù©­ú:s€[~òÑ*~;W¯·¨W$“¤€D>Kŀ^¹èdιØé~Ñˤ•ÍK†û’b)mÈåš}1ž!©×q¡”°å]BHKºcä£IZÿ&JÝçÑü+™‹^H{n’ñ/~”ÄæÓ	¯ËéÄ‚+%Ѹðu)‚å¡{ËÀe_¾.)íôFT½"¤%R,õ¦Õn·” Û¡öš®Oul”ÄÐ&¿r+ÒЁ÷™È]xU*ÒÓ+¤)–]†èq’FÂ>A±µjHóp¤o0ãt÷B€Ûl-{¤€t/8ä/¸HdξÐ|í-ƒûþü·Íʾ]±NQ§=7­¬tFÔ+uâ:³áX‚H<‚‘˳å]6"ý«ŒHß*̈I2#Y݇ ËÑjíëÅN'Øöޏ‹Ù{¿c/<rŸÕwã/K'!H&ð:Ö›'ﺇÈÚ-Èî>?º›SÎ=òIªå:Ó¥6ëÞúNÓoÖ
+¥Øn¹˜ñj• áßcÀÞP¯V(hhÕ3™î‹¯=%
+·ÝD(ÕQi at f ›úlkãzâkÿD¾æ-™CïÿË
+Sw~Y:ˆÖôD¹üÄO¼Ô¶3£îbëÅgcHØ´ŽýG&É_|ù‹®’ '
+=]=ÉÒtðà™²^œ(C¬±ˆ'%ÝÙùX¢S„ÓxÌ[<ôÁÝ|F$ʁ÷ü	F<¡
+W^'“,ú»†è0¸“ïæôÝ&F>ö>ß°YÈP2fÙóNß lŽ½å÷£ý/½iÆ’v‹|ß4
+[jÆîx"J@£ÖBÅ’øÕ¥wR&gÇ7lÍõ½ôµvþ¢«L;éÐß!nËe¥ö“´*cž„4E´[²YÚÎöá·üÞöÞë_²29!HtE1„N7›ÏÚžKÕksl¦Šam”Ã7ÿa÷®?xcß[Pí–W=°ÛOnÚ*Ç÷<E®«ÃŽ):}³
+è•— €DÜ ?%‰ãKWߣ+ãìËO§Önq|JÒ}Õu¢ûªë„4 §Û!n9"Ðè,ÓO<Jáê› ˜9´®Éyº{³ `õê.š‡')Ë4[þú–[)uՏÍý÷¿ïž½÷®„#”Äh¯X‡žÒu¥Óz¯ÕŽU¯ýµ¡ØÐ:CˆwY˜rÉõtÑß›¦í{/V˜µòbí¯ýQráÁ¬nÍN7iå¹ÅãŸûpeÛ{>’.ÍÖ9ôø^ÖoßD6c[¬‡J½r}⋤ã`X®®<-w³´¶^‘õZ\[¤™Û¯½¬£ ,W-\¾ÇŽÏñøûßKî7bw÷sø_ßMkvBõ‰;…ÉâD!™\J"$¢&›¯8›¢ë±Y˦wüƒ†´Á‰,;
+	fÔÂJÆ9ëwŠc·þ«9øª7‹xO’BÆÆ2$Ɉ‰§¿¿zà ™UÆçë4¦`¸ ÝÇéîÁˆ8lzûß¡PFlõzÃîîÃ0ñ¤`u!N:–ÀÕ>ï	‚ùŸ¶Ä8
+Ô~š y°¾ëòkNü•›Ó‘”IoÞ!i[$#ñÅ5“ˆÒ n9uÙ<ql?éíg›ÑUÃéúу
+ =þÕÏÖ{®»)Y¬·ØsÿÃl8ïS²jUž‹r=¤ Û²hIK==‚ŽFãÄ¢qjsã¸Ýù”ƒc˜$"1ښͅ^z=­VC]¿‰#‡ÈuŸiH¤!Ù¸®‡ÙZ‰z¥M­¥œIßþ·½½êªMí…¹y6>®3[ínWŠ¬>uÝï¼}8Ò•–…¼E&j“r¢‹¨ØÅÙ1m,`(ïP<´§·WdÏ¿45yÇ—2ÚÅ›»÷®Ééï~-Þý¢ÌÑý{X9ÊÖk®"îĈGbµÍêÙ“+jY.BðQ+bÔX"±˜o^\‰éÃl¹É®/|‰ÊØ1z^õ&¼Z½ïüM5õí¯¨­÷ïÂ)dèsèO$±‡f Œ”‚B¡‹‚òyìøüdš¾n›®h”h$ºÈ'Ž	ç]9“•
+S2ÍЛÞ*ŒXKù¬*t¡„XÖ4Lƒ\"p
+v?ú$sÃ}är	RɃg¬§\÷q.¾¨3)Ž ·È'Ò‘Ê°h¯Í…ß9Ÿ=W¬ù7ÆÉXGgYúRÛÏîÂbRi|!i>˽¤eÒ=‚¹v3V:cÕõÒûò®Çæ&îøR´çúWš3#™½õ³¬½ú
+ÝY,à Û\LA ôÄ/V€—˜ÏóVÔfuw%;°”FèyÖž¶VÓå‘?‘íÆt`Ó¦­˜fh"„$ŸÈ@ÜÇ÷=‰‘ˉäigæîùΠVÉPë Jï&ÞäæÓVËdR¦ÒÃ]]¸BvR'Ï@%ÔKøÑ$vwOÐùÞÓë^œýû§1%E_×U/6š3Óüèß>ÈàeW2¸y={	4éúŠ™Ù“>ƶ«.Æ6õJM¡ð…BéõP*ô™w±òTê.Ó#cûÞÝTŽ!³ã*
+g_ÈÂcrø}ïò+{žpßÈd·Ý$bfq-‡ö‰¤UH,åR©UIFò˜±èÓøÄr"¤Éñ‡÷bp½ó#SLöæI§¢ˆIV_Áììj™wÜÉ©/½žtÂfÍ`x¾ò:™i"¤Ä²Ã'˜%Ðô9)oJœŒëe„º•D•P†ç»Lì?NòÌrÅS( íAÝõ™dìÓ˜›%5¼ßu¨ú$¨æ¡úKÇw›…Þ—¾Æð{zÙýÕ¯@qìégPغ•TW_Aqj†ñ~Lsr‚óoyQË íÃÔl‰§¾ü%S“\ü‡¿O"jœ $¨(Iyß“¤Ïï¢1_¡ÒßEÒê”Zàtñ¡© ¼ûq"g]„‹èb,ß¾B…²]QÊ·>Ó{Òßݍ%Ÿ>;®
+WQœ/1þØãLßw…›~¯Ùj	A-§â–Kæ¾w¾U–÷î,¬zã¯[É+^ÌøÁ½ºã+H©5ʧ].a¤³$Ï<ßóP‹…%…ZfA:F6çjt|Ž‰»™{øAZå"ʍ$O;‹ÄŽ+¨;Âþ¿y›?õõ/·•ÛºÓ‹ÖÌdÞó|sÿ}rÊ—µ–XÚSÐòÕ†Ë䣏`m=ƒý?Áæç5¯¥Â…§8¼÷0壇IÄ’´çgqúúyäSŸÆJe°´µð]Ú荙)º®ÿ% ¾õV6^}ý]HÃÔKáCVVk)O#ԍPÐÇ_aqOØl*ȦŽŒ += =wïwk…_›£^œ'¿m†aPž™¥U©0óÈÃTíG!q†×‘Ør*©­§3ß=~uß®`ôa âU+êàßþ™?}×ù×Ýl§Î<WHÇ¡Q\`ïß 55
+Ì|‰Í§âñØí_ÅÊu1yÏwQN”ì%W=;ƃÿ±¾¤³Ô¹U.Óš™¦zä ¹koÂSmp,~r말–½LP‚£>>Šµvf»FsjÂcyƒ8ÿ«A} ]|ôrcnRIÓ}évú.¼'§2·@«T¢xà ó=Œ×naõßr*¹—½šúä1fZ#>¢³ƒ†ò<gôÖ1õ/gû^ý§ûº—ÉÜ
+/ïÔñôª3ŠŽ=Á¢Oï‚!|­A¾ðPøKßñû¾üìS¶‘¾æz„aÐœcî{˜¾ó«þÂ}?pµ€”´¥+±ÑÏLf/¿²Pµ#ÜóÞ÷âä»ðj5Ú¥"^»j5Á‰¾àŒt’ù‘Y~ô'Ò?€’v¥Buä(­™)ŒB/¹+¯fö»ßfâ‹·ªïzŸˆ_t9Êót½r‰cë7’”õ£‡1qb\Êžo“#ŽCïùç“Èe‰Åc  ÕhQZ(2»gÓ÷ßKîÔS9ë¥/YŒ‘|:ôÐpëpO4±ÂµvN¦2OÖP¦øÑôü}?Èf/¾Ü(MM0ùÅ/àU«Ø}˜ÙÖæ­tŸ~«…[*RÙ»SÍ}ïÛÞì]ß,)Ï×Xš]úº³(U.=üÀšòãwE†ÖÆs—]e¥Ï½@Dׯ±M›1`ÍÉQâ§lÁ[5L­\"wã+:0ƒˆ®&vá%¸øí¥¶P¢»‡ÈÐâ]F»\bôSÿN÷õ/'qÑexO[î†À9ëÜÎB°¯ßîUž|"è´?{‚žZgXfÛ3ÓSãŸûøðª[ÞšðŒ!öë[¸sÓ™<VO/f.Oþ¿Œò}üzÚ¡Ló«þÔíŸo´¦&fµ€]V­ÅzD{vÆù—¿KŒæcvdõ°4bñÅ	Už+6þÍû°²90Ä¢$wZ¯°(Bá	µì;V>‡Ý×ÇÄ—>Ãìw¯ç‚VPE- GõYzËO<âýÐ?Fû_ó†xæÚ…ßl „@:‘âÓuñÛ-Z“Ìýè{¤Ï» zºi•Š(ßGtu“\³‰à5šÌýè»ù§wy­‰1ï‰×½ŒìE—ÉÈÀ*¹Ò1ò
+jû÷©âƒ÷)+_`Ý;þÚHžq6~£Ááÿ˜Öè~¥‚ò<„iauˆ¬]O溉Dl|¡Ý9éX(|ŒTJœÀÝZ),œ¬E©ë	<¬Ú­5Þñ©Â
+7º^|½ݼE xõõ£‡”»sÒÃ?QÕ=»üú‘C®rÝ £Æ˜††<®_ZsÎ ›”뮯|ªgôàS©Ñþ[„¥Nz–iŠÌE—]W_+…aR9Êì·¿áמÚã;}"õµÒLežæqºÅyÕž™aáÇ÷úíé)ü³ŸÙ‹/—"Œï_&*B•w=îVw?QÒAüÁP ¿²‹`Kã“F€ƒcŸüH¡vhÿÚÞ×ü¯hdõjé¬Yƒï¶i=Bí`Y•w>Ne×ã~í©}ž_¯¹,mtH+-ŒÝº.ôßêtb›i·çfšOF†ÖH,Cš‘NõÞ×Z¸^*¢$‹F°Ü{!Œ#æ1ñÅOS?ðT°Â5X‡€iZ¸Àj|_Ž}ìCæô×nÎ\xqÚˆÆ
+…nqAyÕ*^¥L{fZ5ÇG}¥é³Ï“©³Ï_Fs·´ #GUýÈ!¿~à©Å‡ZcíÉ/}f*ãV¯R6vßüZ+{Ñe‘Â
+/3ck7ˆØ)›=
+¥íÙÜù9„mv,*Kîv»ÙÀ¹ø­ÆÉt<i‹ÒЂò$õªsâ3Ÿ¨O~ñ3Ya •¯‚…ZÂ6hn¶ qL53ìÖDÖ½Lkmµ_W¨{uý"Zÿb*׵濗=ÿý»¬PWGðšcÇûAã>–õ-\r¯==ÅÔmŸ7BÍÜD(î0c@.èótdEã¼ð’„¢v%Sž›ÿÁÝîü¿×+-;ŽÀ@)á·Z
+¥¼L&èD9ÍÒ>"{´ÐdM½ÿëWw¿ì¬|—Ð^X üЃ~ñÇ?ò+O<æ·ÆÇ|€ø–­RÄ¢8{™oX™‡D†æôÄ¢=éòKÁ¼¿è‚¨0ê’]º†¬Ç™×L»„í™éâôWoë%:ä
+šk$ò}fñûÂínÃx¹FˆJ;È´FWKàwbGÏËÎÿàîÌü=ߍ	˲„iI!D	å¹"}áÅbÃ{ß/ì\z™ßìP†À­UË;a®H>3ÌþDGKê€~è*°QµÛýªÝN…Ì“jjVÔ?©…ì˜fŠÀ×m‡ÚXNj­UÐÚ4«‰´QµYj•g©h¸®dŽìaáÛ¡:,o¹)O`=ƒ”ð~}Ž†º.®T"U­}×Ï2ƒï¯ñ›@ØeôWciã¤`%ݘ¦Ë‚s_|Û©g÷ÿúon±SIat‰[Èâ¬0ò7Þh¸¥"µ½{Týà2—\&„-H¦b¸ÚÑò•¢2>Š}zõ‘#‡eàŸ@X‹¢$øÂgí{Þ+Š?ü1þÑ7¼r)XÌÛx¨Ñ`+¤ Ft:§™Ú<X4ܨ.Üt<ÜŸaZßcZÓ'” -®±¢+d—¾¯(…jµÕjÉ-·LgÍ°é_ØŽÕÉré:‘çµñ—\Sr¥ÕÊÜÔÏ"(CLè‹‹–zuÁÍ	TÀE=ùóú}QP3„ÎtC¿™Ó“’X¡MÌ¡ƒ}$íPìÄ
+ö	˜?¼Ÿ`¥™VhÒä	â± Kát¾òLû(6õ8jë¦lyý¼FHTC´:2.èÏ-Ýí%ï
+ÇɈŚÁþÎlµ]ªí6åZRÌÁîʉäyçaÚ6™t‚l<¶˜înú>­ZSyxµ*ÃþW"}É¥`J¤¶<cÑ·ãJ¾BnÚHdíé§ýÁïv)×íÑs+BŒÐ(XsŒ¥•&.°Þá5çãGôkpÍ Á|ˆ_Ú+2¯	`PØv:yîyƒéK.ݨÚí¨;?'kO>IcdÄozø~Ç!ã[·	,ËXªÊûJÑœŸCôôà5ê+Ñàaeè†áö'#(„×°6IèÁ›!A	4x¸Ó^+D`u‚¨‚Yϳ|k‚ðnÄAš:Ü`90•;ežà¹=ž¾MwØ
+Xùý€@ÐB­gC7B9¦´Š…žÕѦÞfhb¦Œøºåù.c?ù	íÊfº×¯Å±,b¶E,¥7—¥Ùnã¶ÛئIĉàJÑÑŽ
+¦ÇFñâqÜFìK®#uÞyD¢QbÑ(™t
+o©×½«éõ|*Í&GŽŽ¸ð™8çœ|ùþûµÖN…J07´&çhH™…]Ò@¨ÂK
+L–ïí†ø¥¢ýJ°nx_–µ‰3ÏÚ2ôyÝÕevßG¹~£W,ªöÌ4í™e÷õ‹è†
+ˆXÄâÑŽ%à*ŸúÂ|šã£ËÖᬘë`S(Ÿ¬ „»´‹ºN´w‡^G.ØŸ\Ý;{#Vì¿ë8Ù.ê¬p
+i<Ãøܐ©o£²è"ï½wºqüèšÈ†µÆø®Ç9~Ç×Èž>=§ŸN2Ç4$¦ÁŒDµS°/ÔjøäÇI]{-å$ºq#V,š¾>,ËÂË“âžÆ“ØÑbz‘Ëá¬vÊ÷ß4GOñô­ü|& ˆZ1>ñSøJà³°à©Ú|lÛ–
+F.múzH;õv›z³IµÑÀËg…¿vxq£eYôçóX–¹hq«Õ*ž(áÓ8p ¼–©¶yPüg”•ýß±­³Z¡íŸË‡Z¡Vš–)ÕhŒ¼ù–Ñî7¼¾?{Í5fdË&ªSÓìüðõñS6’ܸq± 絚´fç(îÞMýÐaR×^ƒç¶™üè0ôžwS9ʸ€îU«—¢mßÇõ}Z­&óÇŽ1}ïiÍΓ|ÁUx¥2!+`<“+þûödúmÅ}׍(£÷Ý‹qÉ%¤’IÒéÔb§Ï÷Á¨¦iâIKg}¥yà>d_õƒiÏÎz¡Tx)äE„ãsH˜<<Ž Õ|ØÝž˜HþÍ{˜þä'»2×_ç¤.½ÄH\v	2bã•+̍ŽàÍ/tZ9F>‡µ}ÎŽóhON3úž¿S՝;ýòãÊô•Wˆ£÷|Ÿ‘R»·›Öô4­©i¼faHìukq6m$‘LR}ì	Uº÷Þ ¦+±¼{üÏ[	)À-ßÿlëM¯[+º²âɏýÑîn
+;vÏf‰D£¦±Ø‡ÁÕÐS>ÕZã÷ÞKq×.R/ºŠ‰üg¥ Æ¶¼X颂äˆçyô9q–:¹l¡³ÝÃét‘å‘2î¬[ëÄ·ŸnFOÛ*ìþeóæ•Ê´§§Uí±'TåÞû]¯Xtß0ÞùÿEâçž-P
+¿REÆ¢ˆÐ~6îìµÇŸ øÍïx¥ïÝÓPÍæ´ÎâÝE§wÀ!mí~ž[Ê%tÌ´!®I]uÅÅ=¿uKÁ^-¼JÆÞ}¸£ã×Å.tauw/kYÛ÷n¥BäÌÓ‰l:…Æž½~ã--¿VŸÑ%€;ôXë±®<¬çå¹sزn:û|l6è÷ý,mä¬(ȆcªV(›ÔÒÉ–Lì¬íéØ9gYÂ2%®Gkt\µFFhóÝÙ9¥‚Ƭ.üø±®§Ìj­úó<‚͐¶ W 
+ÛÞ˜¼âÒ\úšØΆuÂê) ,+ñ	«!Ý•ctœ…Û¾ªæ>ó…¶_«—ôXï¾¥Ç:óL!Åó‚òÜ:‚ƒA3ê}®ÒÖ&¨ØÇB5ªKT4c/è	ÜK›#¡Â`°…]ð»–¶XØ¥‹,µ“ýyÁ~(ýÀvàmq‡€¬L%cF&mF6m4œõk¤°íå~[³Eí‘ÇUãɽ®_®´Xêôˆ”‡tMë™V²>/(ÏQ7,¨õýÔºXÚz/°,–onÔ°‚Ú•G§x;¨ª‡¥}ëUÈú”ôo¦4ó×L3É­?O‹›¤³ìa#°Y[ÜU,m]ei빕Åä@),è1îÕ‚ò¤Ns—Ÿ-Aõ¼ <·fåFÑ5	oÒê†RÔ5–·Íjw.@Ø¡o §)±T-³|—àç¢{šÑXÜ^:EÞKûru¬ \îG´ÛuT+ˆ Îó‚ò‹/4ÁâÞgÚn<o…+²À]ê\­ÐÙf©Àê=‡ilgÕV$Ø(7’ ÞÔ4ÀØ•XB]›Ç†QÏxüÀêÀYâ¿iº    IEND®B`‚
\ No newline at end of file

Copied: tuxtype/trunk/data/images/title1.png.old (from rev 844, tuxtype/trunk/data/images/title1.png)
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/data/images/title1.png.old
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Modified: tuxtype/trunk/data/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/data/sounds/Makefile.am	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/data/sounds/Makefile.am	2009-01-23 12:35:47 UTC (rev 852)
@@ -11,6 +11,7 @@
   click.wav \
   excuseme.wav \
   explosion.wav \
+  harp.wav \
   kmus1.wav \
   kmus2.wav \
   kmus3.wav \

Modified: tuxtype/trunk/data/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/data/sounds/Makefile.in	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/data/sounds/Makefile.in	2009-01-23 12:35:47 UTC (rev 852)
@@ -235,6 +235,7 @@
   click.wav \
   excuseme.wav \
   explosion.wav \
+  harp.wav \
   kmus1.wav \
   kmus2.wav \
   kmus3.wav \

Added: tuxtype/trunk/data/sounds/harp.wav
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/data/sounds/harp.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tuxtype/trunk/doc/INSTALL
===================================================================
--- tuxtype/trunk/doc/INSTALL	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/doc/INSTALL	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,5 +1,5 @@
-Tux Typing 1.7.1
-January 12, 2009
+Tux Typing 1.7.2
+January 14, 2009
 
 NOTE - this document is reasonably correct but not completely current.
 It will updated as the maintainer's time allows. For GNU/Linux users, you

Modified: tuxtype/trunk/doc/INSTALL-Win32
===================================================================
--- tuxtype/trunk/doc/INSTALL-Win32	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/doc/INSTALL-Win32	2009-01-23 12:35:47 UTC (rev 852)
@@ -1,7 +1,7 @@
 Tux Typing for Windows
 ----------------------
 
-Updated Jan 12 2009
+Updated Jan 14 2009
 
 2006-present Lead Developer:
 	David Bruce <davidstuartbruce at gmail.com>

Modified: tuxtype/trunk/doc/README
===================================================================
--- tuxtype/trunk/doc/README	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/doc/README	2009-01-23 12:35:47 UTC (rev 852)
@@ -9,7 +9,9 @@
 (To install the game on your system, please read the INSTALL file.)
 
     If you are interested in Translation/moving this game to another 
-    language, please send a mail to David Bruce <davidstuartbruce at gmail.com>, 
+    language, please send a mail to 
+
+    David Bruce <davidstuartbruce at gmail.com>, 
     Holger Levsen <debian at layer-acht.org>,  or to:
 
     <tux4kids-tuxtype-dev at lists.alioth.debian.org>
@@ -17,7 +19,7 @@
     Additional information on this subject is covered in "HowToTheme.html"
     in the "doc/en" directory of this package.
 
-This is version 1.7.0 of Tux Typing.
+This is version 1.7.2 of Tux Typing.
 
 In Fish Cascade you control Tux as he searches for fish to eat. Fish fall
 from the top of the screen. These fish have letters on them.  Unforunately

Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ar.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,15 +53,15 @@
 msgstr "G3ank"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Tanta."
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Hard"
 
@@ -78,84 +78,84 @@
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 #, fuzzy
 msgid "Fish Cascade"
 msgstr "Da-Yri dara'"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Edit Word Lists"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Comet Zap"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr ""
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Ace"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Options"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instructions"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Commander"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Setup Language"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "qa.ix tovrs cal"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Main Menu"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 #, fuzzy
 msgid "Work In Progress!"
 msgstr "Work in Progress!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "this feature is not ready yet"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Discuss the future of TuxTyping at"
 

Modified: tuxtype/trunk/po/as.po
===================================================================
--- tuxtype/trunk/po/as.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/as.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-22 12:36+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
 "Language-Team: American English <kde-i18n-doc at lists.kde.org>\n"
@@ -51,15 +51,15 @@
 msgid "Lives"
 msgstr "জীৱন"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "সহজ"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "মাধ্যম"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "কঠোৰ"
 
@@ -75,75 +75,75 @@
 msgid "Oh No!"
 msgstr "অঃ নহয়!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fish Cascade"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "শব্দৰ তালিকা সম্পাদন কৰক"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Comet Zap"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "পাইলট"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "পাঠ"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Ace"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "পৰিকল্পনাৰ তথ্য"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "বিকল্প"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "নিৰ্দেশ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "কামান্ডাৰ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "প্ৰতিষ্ঠাৰ ভাষা"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "বাহিৰ হওক"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "মূখ্য তালিকা"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "কাম চলি আছে‌!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "এই গুণ এতিয়া প্ৰস্তুত নহয়"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "TuxTyping ৰ গুণৰ আলোচনা ইয়াত কৰক"
 

Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ca.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,15 +55,15 @@
 msgstr "Vides"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Fàcil"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Mitg"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Difícil"
 
@@ -80,82 +80,82 @@
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Caiguda de peixos"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Cadet"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Editar les llistes de paraules"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Caiguda de meteorits"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Llissons"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "As"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Opcions"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instruccions"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Comandant"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Configuració de l'idioma"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Sortir"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Menu principal"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Encara en progres!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "Encara no implementat"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Podeu parlar sobre el futur de TuxTyping a"
 

Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/cs.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2007-11-10 16:36+0100\n"
 "Last-Translator: JardaK <krejci at zstenis.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -64,17 +64,17 @@
 msgstr "Životy"
 
 #
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Snadná"
 
 #
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Střední"
 
 #
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Těžká"
 
@@ -94,91 +94,91 @@
 msgstr "Ach jo!"
 
 #
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Vodopád ryb"
 
 #
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Nováček"
 
 #
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Uprav seznamy slov"
 
 #
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Sestřelování komet"
 
 #
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lekce"
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Eso"
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Info o projektu"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Možnosti"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instrukce"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Kapitán"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Vyber jazyk"
 
 #
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Ukončit"
 
 #
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Hlavní menu"
 
 #
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Ve výstavbě!"
 
 #
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Tato vlastnost ještě nefunguje"
 
 #
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskutuj o budoucnosti TuxTyping na"
 

Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/da.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2003-05-08 17:58+0200\n"
 "Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
 "Language-Team: Danish\n"
@@ -53,15 +53,15 @@
 msgstr "Liv"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Let"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Mellem"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "HÃ¥rd"
 
@@ -78,81 +78,81 @@
 msgid "Oh No!"
 msgstr "Ã…h nej!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fiskeregn"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Begynder"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Redigér ordlister"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Plaf kometer"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Trænet"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lektioner"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Meget erfaren"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Indstilling"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instruktioner"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Uovertruffen"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Vælg sprog"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Hovedmenu"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Der arbejdes på sagen!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Denne feature er ikke klar endnu"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskutér TuxTypings fremtid på"
 

Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/de.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2003-06-14 19:00+0000\n"
 "Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
 "Language-Team: German\n"
@@ -53,15 +53,15 @@
 msgstr "Leben"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Einfach"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Schwer"
 
@@ -78,81 +78,81 @@
 msgid "Oh No!"
 msgstr "Oh Nein!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fischregen"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Anfänger"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Wortlisten bearbeiten"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Kometenabwehr"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lektionen"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "As"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Optionen"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Anleitung"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Unbesiegbar"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Sprache einstellen"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Ende"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Hauptmenü"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "In Arbeit!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Diese Option ist noch nicht fertig"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskutiere die Zukunft von TuxTyping auf"
 

Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/el.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,15 +53,15 @@
 msgstr "Ζωές"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "1. Εύκολο"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "2. Κανονικό"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "3. Δύσκολο"
 
@@ -78,81 +78,81 @@
 msgid "Oh No!"
 msgstr "Ωχ! Όχι"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Φάε τα Ψαράκια"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "1. Μαθητευόμενος"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Διόρθωσε τις Λίστες Λέξεων"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Κομήτες"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "2. Πιλότος"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Μαθήματα"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "3. Άσσος"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Πληροφορίες προγράμματος"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Οδηγίες"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "4. Βετεράνος"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Ρύθμιση Γλώσσας"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Τέλος"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Βασικό Μενού"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Εργασία σε εξέλιξη"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Αυτό το κομμάτι δεν είναι ακόμη έτοιμο"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Σχόλια για το TuxTyping"
 

Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/en at boldquot.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -29,10 +29,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tuxtype 1.7.1\n"
+"Project-Id-Version: tuxtype 1.7.2\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
-"PO-Revision-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
+"PO-Revision-Date: 2009-01-14 17:08-0600\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -76,15 +76,15 @@
 msgid "Lives"
 msgstr "Lives"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Easy"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Hard"
 
@@ -100,74 +100,74 @@
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fish Cascade"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Edit Word Lists"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Comet Zap"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr "Phrase Typing"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lessons"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Ace"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Project Info"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Options"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instructions"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Commander"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Setup Language"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Quit"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Main Menu"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Work In Progress!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "This feature is not ready yet"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Discuss the future of TuxTyping at"

Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/en at quot.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -26,10 +26,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tuxtype 1.7.1\n"
+"Project-Id-Version: tuxtype 1.7.2\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
-"PO-Revision-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
+"PO-Revision-Date: 2009-01-14 17:08-0600\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -73,15 +73,15 @@
 msgid "Lives"
 msgstr "Lives"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Easy"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Hard"
 
@@ -97,74 +97,74 @@
 msgid "Oh No!"
 msgstr "Oh No!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fish Cascade"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Edit Word Lists"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Comet Zap"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr "Phrase Typing"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lessons"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Ace"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Project Info"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Options"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instructions"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Commander"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Setup Language"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Quit"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Main Menu"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Work In Progress!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "This feature is not ready yet"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Discuss the future of TuxTyping at"

Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/en_GB.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,15 +52,15 @@
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr ""
 
@@ -76,74 +76,74 @@
 msgid "Oh No!"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr ""
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr ""
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr ""
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr ""
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr ""
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr ""

Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/es.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2007-09-16 19:00+0000\n"
 "Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
 "Language-Team: Spanish\n"
@@ -52,15 +52,15 @@
 msgstr "Vidas"
 
 # niveles para juego de cascada:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Medio"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Difícil"
 
@@ -77,82 +77,82 @@
 msgid "Oh No!"
 msgstr "¡Oh, no!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Cascada de Pescado"
 
 # "Cadete de espacio" es nivel 1 en zapea cometa
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Cadete Espacial"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Revisar las listas de palabras"
 
 # Tipos de juegos
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Cometas"
 
 # "Piloto" es nivel 2 en zapea cometas
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Piloto"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lecciones"
 
 # "As" es nivel 3 en zapea cometas
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "As"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Opciones"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instrucciones"
 
 # "Commandante" es nivel 4 en zapea cometas
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Comandante"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Idioma"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Salir"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Menú Principal"
 
 # work Cosas que estan abajo de construccion.
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "¡Trabajo en Curso!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "Esta función no esta lista todavía"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Charlar del futuro de TuxTyping en"
 

Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/eu.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,15 +53,15 @@
 msgstr "Bizitzak"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Erreza"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Ertaina"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Gaitza"
 
@@ -78,81 +78,81 @@
 msgid "Oh No!"
 msgstr "Oi ez!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Arrainak goitik-behera"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Espazioko mutil-txikia"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Editatu hitz zerrendak"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Kometen suntsipena"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilotua"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Ikasgaiak"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Puntarengoa"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instrukzioak"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Komandantea"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Konfiguratu hizkuntza"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Itxi"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Menu nagusia"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Lanean dihardugu!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Ezaugarri hau ez dago prest oraindik"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "TuxTyping-en etorkizunaz aritu honekin:"
 

Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/fr.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,15 +55,15 @@
 msgstr "Vies"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Facile"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Fort"
 
@@ -80,82 +80,82 @@
 msgid "Oh No!"
 msgstr "Oh Non!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Cascade de Poissons"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Cadet de l'espace"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Editer la Liste de Mots"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Destruction de Comtes"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilote"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Leons"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "As de l'espace"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Options"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instructions"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Commandant"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Rgler la langue"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Menu Principal"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "En cours de construction!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "Cette fonctionnalit n'est pas termine"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Parler du futur de TuxTyping a"
 

Modified: tuxtype/trunk/po/gu.po
===================================================================
--- tuxtype/trunk/po/gu.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/gu.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-28 16:17+0530\n"
 "Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -52,15 +52,15 @@
 msgid "Lives"
 msgstr "જીવો"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "સરળ"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "માધ્યમ"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "સખત"
 
@@ -76,75 +76,75 @@
 msgid "Oh No!"
 msgstr "અરે નહિં!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "માછલી પાણીનાં ધોધમાં"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "જગ્યા કેડેટ"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "શબ્દની યાદીઓમાં ફેરફાર કરો"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "ધૂમકેતુ ને મારવો"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "પાઇલોટ"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "પાઠો"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "એક્કો"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "પ્રોજેક્ટની જાણકારી"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "વિકલ્પો"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "સૂચનાઓ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "સેનાપતિ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "ભાષાને સુયોજિત કરો"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "બહાર નીકળો"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "મુખ્ય મેનુ"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "પ્રગતિમાં કામ છે!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "આ લક્ષણ હજુ તૈયાર નથી"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "TuxTyping ને ભવિષ્યમાં ચર્ચા કરો"
 

Modified: tuxtype/trunk/po/hi.po
===================================================================
--- tuxtype/trunk/po/hi.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/hi.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-28 16:08+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
@@ -56,15 +56,15 @@
 msgid "Lives"
 msgstr "जीवनदान"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "आसान"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "थोड़ा कठिन"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "कठिन"
 
@@ -80,75 +80,75 @@
 msgid "Oh No!"
 msgstr "अरे नहीं!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "प्रपाती मछली"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "स्पेस कैडेट"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "शब्द सूची संपादित करें"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "पुच्छल तारा पकड़ें"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "पाइलट"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "पाठ"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "एक्का"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "परियोजना सूचना"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "विकल्प"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "निर्देश"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "कमांडर"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "सेटअप भाषा"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "छोड़ें"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "मुख्य मेन्यू"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "काम प्रगति पर है!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "यह विशेषता अबतक तैयार नहीं है"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "टक्स टाइपिंग के भविष्य के बारे में यहाँ चर्चा करें"
 

Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/it.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,15 +53,15 @@
 msgstr "Vite"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Facile"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Medio"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Difficile"
 
@@ -78,81 +78,81 @@
 msgid "Oh No!"
 msgstr "Oh No! Prova di nuovo..."
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Pioggia di pesci"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Principiante"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Modifica la lista delle parole"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Disintegratore di comete"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilota"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lezioni"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Pilota provetto"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Istruzioni"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Comandante"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Modifica lingua"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Esci"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Menù principale"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Lavori in corso!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Questa caratteristica non è ancora supportata..."
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Discuti del futuro di TuxTyping su:"
 

Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ja.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,15 +51,15 @@
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr ""
 
@@ -75,74 +75,74 @@
 msgid "Oh No!"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr ""
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr ""
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr ""
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr ""
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr ""
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr ""

Modified: tuxtype/trunk/po/kn.po
===================================================================
--- tuxtype/trunk/po/kn.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/kn.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-27 13:58+0530\n"
 "Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
 "Language-Team: Kannada <en at li.org>\n"
@@ -52,15 +52,15 @@
 msgid "Lives"
 msgstr "ಜೀವಗಳು"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "ಸುಲಭ"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "ಮಧ್ಯಮ"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "ಕಷ್ಟಕರ"
 
@@ -76,75 +76,75 @@
 msgid "Oh No!"
 msgstr "ಒಹ್ ಇಲ್ಲ!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "ಮೀನಿನ ಕ್ಯಾಸ್ಕೇಡ್"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "ಸ್ಪೇಸ್ ಕ್ಯಾಡೆಟ್"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "ಪದಗಳ ಪಟ್ಟಿಯನ್ನು ಸಂಪಾದಿಸು"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "ಧೂಮಕೇತು ಧಾಳಿ"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "ಪೈಲೆಟ್"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "ಪಾಠಗಳು"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "ಏಸ್"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "ಪರಿಯೋಜನೆಯ ಮಾಹಿತಿ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "ಆಯ್ಕೆಗಳು"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "ಸೂಚನೆಗಳು"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "ಕಮಾಂಡರ್"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "ಸೆಟ್‌ಅಪ್ ಭಾಷೆ"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "ಹೊರನಡೆ"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "ಮುಖ್ಯ ಮೆನು"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "ಕೆಲಸವು ಪ್ರಗತಿಯಲ್ಲಿದೆ!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "ಈ ಸವಲತ್ತು ಇನ್ನೂ ತಯಾರಾಗಿಲ್ಲ"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "TuxTyping ನ ಮುಂದಿನ ಭವಿಷ್ಯವನ್ನು ಇಲ್ಲಿ ಚರ್ಚಿಸಿ"
 

Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/lt.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2004-10-20\n"
 "Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -53,15 +53,15 @@
 msgstr "Meškerių:"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Lengvas"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Sunkus"
 
@@ -78,81 +78,81 @@
 msgid "Oh No!"
 msgstr "Deja..."
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Žuvų lietus"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Naujokas"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Modifikuoti žodžių sąrašus"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Kometų lietus"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Patyręs"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Pamokos (dar nÄ—ra)"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Asas"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Apie \"Tuxtype\" (anglų k.)"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Nuostatos"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Nurodymai (dar nÄ—ra)"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Nenugalimas"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Kalbos parinkimas"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Baigti"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Pagrindinis meniu"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Å i programos dalis dar daroma!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Kol kas ji dar nebaigta"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskusijos apie \"Tux Typing\" vyksta adresu:"
 

Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ml.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
@@ -53,15 +53,15 @@
 msgid "Lives"
 msgstr "ആയുസ്സ്"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "എളുപ്പം"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "ഇടത്തരം"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "ബുദ്ധിമുട്ടുള്ളത്"
 
@@ -77,75 +77,75 @@
 msgid "Oh No!"
 msgstr "അയ്യോ!.."
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "വീഴുന്ന മത്സ്യങ്ങള്‍"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "ആകാശ പറവകള്‍ "
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "വാക്കുകളുടെ ശേഖരം"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "വാല്‍ നക്ഷത്രത്തെ പിടിക്കുക"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "ആദ്യ പരിശീലനം"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "പാഠങ്ങള്‍"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "എയ്സ്"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "കളിയുടെ വിവരങ്ങള്‍"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "ഐച്ഛികങ്ങള്‍"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "നിര്‍‌ദ്ദേശങ്ങള്‍ "
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "കമാന്‍ഡര്‍"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "ഭാഷ മാറ്റുക"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "പുറത്തു കടക്കുക"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "പ്രധാന മെനു"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "പണി നടക്കുന്നുണ്ടല്ലോ"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "ഇത് ഇതുവരെ ശരിയാക്കിയിട്ടില്ല."
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "ടക്സ് ടൈപ്പിന്റെ  ഭാവി ചര്‍ച്ചചെയ്യാനായി ഇവിടെ പോകുക"
 

Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/nb.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2005-10-20 21:24+0200\n"
 "Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -53,15 +53,15 @@
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Lett"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Middels"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Vanskelig"
 
@@ -77,75 +77,75 @@
 msgid "Oh No!"
 msgstr "Uff!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fiskefall"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Nybegynner"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Rediger ordliste"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Kometknusing"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Erfaren"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Opplæring"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Profesjonell"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Prosjektinfo"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Oppsett"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Hjelp"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Ekspert"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Språk"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Hovedmeny"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Uferdig!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Denne funksjonen er ikke klar ennå."
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskuter neste versjon av Tux Typing på"
 

Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ne.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -59,17 +59,17 @@
 msgstr "जिवनहरु"
 
 #
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "सजिलो"
 
 #
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "मध्यम"
 
 #
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "कठिन"
 
@@ -89,91 +89,91 @@
 msgstr "हेत्तेरिका!.."
 
 #
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "माछा क्यास्केड ‍"
 
 #
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "‍ स्पेस क्याडेट"
 
 #
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "शब्द शुचिहरुलाई सम्पादन गर्नुहोस ।"
 
 #
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "कमेट ज्याप"
 
 #
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "पाइलट"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "पाठ्य‍क्रमहरु"
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "एस"
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "‍परियोजनाको बारेमा"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "विकल्पहरु‍"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "निर्देशनहरु "
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "कमान्डर‍"
 
 #
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "भाषा समाबिष्ट गर्नुहोस ।"
 
 #
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "बन्द गर्नुहोस ।"
 
 #
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "मुख्य मेनु"
 
 #
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "काम हुदैछ!!!!!!!!"
 
 #
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "यो सुबिधा अहिले उपलब्ध हुनसक्दैन!!!!"
 
 #
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr " टक्शटाइप को भविष्य बारेमा छलफल गर्नुहोस ।"
 

Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/nl.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,15 +55,15 @@
 msgstr "Levens"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Gemakkelijk"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Moeilijker"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Echt Moeilijk"
 
@@ -80,82 +80,82 @@
 msgid "Oh No!"
 msgstr "Oh Nee!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Vallende Vissen"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Leerling-vlieger"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Bewerk de woordenlijsten"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Inslaande Kometen"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Ruimtepiloot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lessen"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Luitenant-Meteoor"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Opties"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instructies"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Opperbevelhebber"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Taal instellen"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Stoppen"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Werk In Uitvoering!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "dit onderdeel is nog niet klaar"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Bespreek de toekomst van TuxTyping op"
 

Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/nn.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2005-02-12 13:13+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -52,15 +52,15 @@
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Lett"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Middels"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Vanskeleg"
 
@@ -76,76 +76,76 @@
 msgid "Oh No!"
 msgstr "Uff!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fiskefall"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Nybegynnar"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Rediger ordliste"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Kometknusing"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Erfaren"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Opplæring"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Profesjonell"
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Prosjektinfo"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Oppsett"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Hjelp"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Ekspert"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Språk"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Hovudmeny"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Uferdig!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Denne funksjonen er ikkje klar enno."
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskuter neste versjon av Tux Typing på"
 

Modified: tuxtype/trunk/po/or.po
===================================================================
--- tuxtype/trunk/po/or.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/or.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-27 17:56+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
 "Language-Team: Oriya\n"
@@ -53,15 +53,15 @@
 msgid "Lives"
 msgstr "ଜୀବନଗୁଡ଼ିକ"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "ସହଜ"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "ମଧ୍ଯମ"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "କଠିନ"
 
@@ -77,75 +77,75 @@
 msgid "Oh No!"
 msgstr "ହେ ଭଗବାନ!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "ମାଛ ସୋପାନୀ"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "ମହାକାଶ ଛାତ୍ରସୈନିକ"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "ଶବ୍ଦ ତାଲିକାଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Comet Zap"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "ଚାଳକ"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "ଶିକ୍ଷା"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "ଉତ୍କୃଷ୍ଟ"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "ପ୍ରକଳ୍ପ ସୂଚନା"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "ବିକଳ୍ପଗୁଡ଼ିକ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "ନିର୍ଦ୍ଦେଶ"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "ସେନାପତି"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "ଭାଷା ବିନ୍ୟାସ କରନ୍ତୁ"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "ବିଦାୟ ନିଅନ୍ତୁ"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "ମୂଖ୍ୟ ତାଲିକା"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "କାର୍ଯ୍ୟ ଚାଲୁଅଛି!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "ଏହି ଅଂଶଟି ଏପର୍ଯ୍ୟନ୍ତ ପ୍ରସ୍ତୁତ ହୋଇନାହିଁ"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "ରେ TuxTyping ର ଭବିଷ୍ୟତ ଆଲୋଚନା କରନ୍ତୁ"
 

Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/pt.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2007-02-07 16:08+0000\n"
 "Last-Translator: Hudson G M Figueredo <kynder at pquilinux.org>\n"
 "Language-Team:  <pt at li.org>\n"
@@ -52,15 +52,15 @@
 msgstr "Vidas"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Médio"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Difícil"
 
@@ -77,82 +77,82 @@
 msgid "Oh No!"
 msgstr "Ah não!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Cascata de peixes"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Cadete espacial"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Editar as listas de palavras"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Destruidor de cometas"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Piloto"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lições"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Super piloto"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Opções"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instruções"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Comandante"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Configurar lingua"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Sair"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Menu principal"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Trabalho em progresso!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "essa caracteristica ainda não está pronta"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Discuta o futuro do TuxType em"
 

Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ru.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,15 +52,15 @@
 msgid "Lives"
 msgstr "Жизней"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Легкий"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Средний"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Сложный"
 
@@ -76,75 +76,75 @@
 msgid "Oh No!"
 msgstr "О, нет!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Каскад рыб"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Космический кадет"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Редактирование списка слов"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Падение комет"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Пилот"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Уроки"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Ас"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Параметры"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Инструкции"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Капитан"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Выбор языка"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Выход"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Главное меню"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Работа продолжается!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Эта функция еще не готова"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Обсудите будущее TuxTyping на"
 

Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/sv.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype2\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-12-02 19:51+0100\n"
 "Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -52,15 +52,15 @@
 msgstr "Liv"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Lätt"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Mellan"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Svårt"
 
@@ -77,81 +77,81 @@
 msgid "Oh No!"
 msgstr "Ã…h nej!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Fiskregn"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Rymdkadett"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Redigera ordlista"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Pricka kometer"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Lektioner"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Flygaress"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Projektinformation"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Inställningar"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Instruktioner"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Kommendör"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Ställ in språk"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Huvudmeny"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Arbete pågår!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Denna funktion är inte färdig än"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Diskutera TyxeTypes framtid på"
 

Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/sw.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,15 +53,15 @@
 msgstr "Vidas"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Rahisi"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Ngumu"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Ngumu zaidi"
 
@@ -78,82 +78,82 @@
 msgid "Oh No!"
 msgstr "Ahhhh"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Samaki zinaanguka"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Kidato cha kwanza"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Edit Word Lists"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Vita vya nyota"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Kidato cha pili"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Madarasa"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Kidato cha tatu"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Maoni"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Nammna ya kutumia"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Kidato cha nne"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Chagua Lugha"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Ondoka"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Listi ya kwanza"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Bado kumalizika"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 #, fuzzy
 msgid "This feature is not ready yet"
 msgstr "Bado ina jengwa"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Toa maoni yako kuhusu TuxTyping"
 

Modified: tuxtype/trunk/po/ta.po
===================================================================
--- tuxtype/trunk/po/ta.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/ta.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-22 12:41+0530\n"
 "Last-Translator: Felix I <ifelix25 at gmail.com>, 2008\n"
 "Language-Team:  <en at li.org>\n"
@@ -51,15 +51,15 @@
 msgid "Lives"
 msgstr "லைவ்ஸ்"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "எளியது"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "நடுத்தரம்"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "கடினம்"
 
@@ -75,75 +75,75 @@
 msgid "Oh No!"
 msgstr "இல்லை!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "ஃபிஷ் கேஸ்கேட்"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "ஸ்பேஸ் கேடெட்"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "சொல் பட்டியல்களை திருத்து"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "கமெட் ஸெப்"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "பைலட்"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "பாடங்கள்"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "ஏஸ்"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "திட்ட விவரம்"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "விருப்பங்கள்"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "தகவல்கள்"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "கமெண்டர்"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "அமைவு மொழி"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "வெளியேறு"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "முதன்மை மெனு"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "பணி நடைபெறுகிறது!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "இந்த வசதி இதுவரை இல்லை"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "TuxTyping எதிர்கால திட்டத்தை இங்கு விவாதிக்கவும்"
 

Modified: tuxtype/trunk/po/te.po
===================================================================
--- tuxtype/trunk/po/te.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/te.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-08-28 17:58+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
@@ -53,15 +53,15 @@
 msgid "Lives"
 msgstr "అవకాశాలు"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "తేలికైన"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "మధ్యతరగతి"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "కష్టమైన"
 
@@ -77,75 +77,75 @@
 msgid "Oh No!"
 msgstr "ఒహ్ కాదు!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "చాప నీటిగుంట"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "వింహగ పక్షులు"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "పదముల జాబితాను సరిచేయి"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "కామెట్ జాప్"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "చోదకుడు(పైలెట్)"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "పాఠములు"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "ఏస్"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "ప్రాజక్ట్‍ సమాచారం"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "ఐచ్చికాలు"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "సూచనలు"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "ఆదేశకుడు"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "భాషను అమర్చు"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "ప్రధాన మెనూ"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "పని జరుగుతోంది!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "ఈ సౌలభ్యం యింకా సిద్ధము కాలేదు"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "TuxTyping యొక్క భవిష్యత్తు యిక్కడ చర్చించండి"
 

Modified: tuxtype/trunk/po/tr.po
===================================================================
--- tuxtype/trunk/po/tr.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/tr.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2008-12-11 15:08+0200\n"
 "Last-Translator: Doruk Fisek <dfisek at fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -51,15 +51,15 @@
 msgid "Lives"
 msgstr "YaÅŸamlar"
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Kolay"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Orta"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Zor"
 
@@ -75,75 +75,75 @@
 msgid "Oh No!"
 msgstr "Oo Hayır!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Balık Çağlayanı"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Uzay Tertibi"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Kelime Listelerini Düzenle"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Kuyruklu Yıldız Vur"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Pilot"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Dersler"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "As"
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Proje Bilgisi"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Yönergeler"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Kumandan"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Ayar Dili"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Ana Menü"
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Çalışmalar Sürüyor!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Bu özellik henüz hazır değil"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Tuxtyping'in geleceğinin tartışıldığı liste :"
 

Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/tuxtype.pot	2009-01-23 12:35:47 UTC (rev 852)
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: tuxtype 1.7.1\n"
+"Project-Id-Version: tuxtype 1.7.2\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,15 +51,15 @@
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr ""
 
@@ -75,74 +75,74 @@
 msgid "Oh No!"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr ""
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr ""
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr ""
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr ""
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr ""
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr ""
 
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr ""
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr ""
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr ""

Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/po/wo.po	2009-01-23 12:35:47 UTC (rev 852)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-01-14 09:48-0600\n"
+"POT-Creation-Date: 2009-01-14 17:08-0600\n"
 "PO-Revision-Date: 2007-09-25 09:50-0000\n"
 "Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
 "org>\n"
@@ -54,15 +54,15 @@
 msgstr "Dund yi"
 
 # levels for Cascade game:
-#: src/playgame.c:1119 src/titlescreen.c:93
+#: src/playgame.c:1119 src/titlescreen.c:95
 msgid "Easy"
 msgstr "Yomb"
 
-#: src/playgame.c:1120 src/titlescreen.c:94
+#: src/playgame.c:1120 src/titlescreen.c:96
 msgid "Medium"
 msgstr "Ci diggante bi"
 
-#: src/playgame.c:1121 src/titlescreen.c:95
+#: src/playgame.c:1121 src/titlescreen.c:97
 msgid "Hard"
 msgstr "Dëgër"
 
@@ -79,82 +79,82 @@
 msgid "Oh No!"
 msgstr "Déedéet!"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Fish Cascade"
 msgstr "Jën yu tegloo"
 
 # "Space Cadet" is level 1 in comet zap
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Space Cadet"
 msgstr "Xale jaww ji"
 
-#: src/titlescreen.c:93
+#: src/titlescreen.c:95
 msgid "Edit Word Lists"
 msgstr "Jagal limu baat yi"
 
 # types of games
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Comet Zap"
 msgstr "Neenal biddeew yi"
 
 # "Pilot" is level 2 in comet zap
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Pilot"
 msgstr "Dawalkat"
 
-#: src/titlescreen.c:94
+#: src/titlescreen.c:96
 msgid "Phrase Typing"
 msgstr ""
 
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Lessons"
 msgstr "Njàng"
 
 # "Ace" is level 3 in comet zap
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Ace"
 msgstr "Jambaaru jaww ji"
 
 #
-#: src/titlescreen.c:95
+#: src/titlescreen.c:97
 msgid "Project Info"
 msgstr "Ci mbirum porose bi"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Options"
 msgstr "Tànneef yi"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Instructions"
 msgstr "Tektal yi"
 
 # "Commander" is level 4 in comet zap
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Commander"
 msgstr "Kelifa"
 
-#: src/titlescreen.c:96
+#: src/titlescreen.c:98
 msgid "Setup Language"
 msgstr "Regle lammiñ wi"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Quit"
 msgstr "Génn"
 
-#: src/titlescreen.c:97
+#: src/titlescreen.c:99
 msgid "Main Menu"
 msgstr "Njël li ëpp solo"
 
 # work in progress stuff
-#: src/titlescreen.c:1136
+#: src/titlescreen.c:1152
 msgid "Work In Progress!"
 msgstr "Ñi ngi koy defar!"
 
-#: src/titlescreen.c:1137
+#: src/titlescreen.c:1153
 msgid "This feature is not ready yet"
 msgstr "Pareegul"
 
-#: src/titlescreen.c:1138
+#: src/titlescreen.c:1154
 msgid "Discuss the future of TuxTyping at"
 msgstr "Wax ci ëlëgu TuxTyping ak"
 

Modified: tuxtype/trunk/src/audio.c
===================================================================
--- tuxtype/trunk/src/audio.c	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/src/audio.c	2009-01-23 12:35:47 UTC (rev 852)
@@ -22,36 +22,50 @@
 static Mix_Music* defaultMusic = NULL; // holds music for audioMusicLoad/unload
 
 
-void PlaySound(Mix_Chunk* snd) {
-	if (!settings.sys_sound) return;
+void PlaySound(Mix_Chunk* snd)
+{
+  if(!snd) return;
+  if (!settings.sys_sound) return;
 
-	Mix_PlayChannel(-1, snd, 0);
+  Mix_PlayChannel(-1, snd, 0);
 }
 
 /* MusicLoad attempts to load and play the music file 
  * Note: loops == -1 means forever
  */
-void MusicLoad(const char *musicFilename, int loops ) {
-	if (!settings.sys_sound) return;
+void MusicLoad(const char* musicFilename, int loops)
+{
+  Mix_Music* tmp_music = NULL;
 
-	MusicUnload(); // make sure defaultMusic is clear
+  if (!settings.sys_sound) return;
+  if (!musicFilename) return;
 
-	defaultMusic = LoadMusic( musicFilename );
-	Mix_PlayMusic( defaultMusic, loops );
+  tmp_music = LoadMusic(musicFilename);
+
+  if (tmp_music)
+  {
+    MusicUnload(); //Unload previous defaultMusic
+    defaultMusic = tmp_music;
+    Mix_PlayMusic(defaultMusic, loops);
+  }
 }
 
+
 /* MusicUnload attempts to unload any music data that was
  * loaded using the audioMusicLoad function
  */
-void MusicUnload( void ) {
-	if (!settings.sys_sound) return;
+void MusicUnload(void)
+{
+  if (!settings.sys_sound) return;
 
-	if ( defaultMusic )
-		Mix_FreeMusic( defaultMusic );
-
-	defaultMusic = NULL;
+  if (defaultMusic)
+  {
+    Mix_FreeMusic(defaultMusic);
+    defaultMusic = NULL;
+  }
 }
 
+
 /* audioMusicPlay attempts to play the passed music data. 
  * if a music file was loaded using the audioMusicLoad
  * it will be stopped and unloaded
@@ -60,6 +74,8 @@
 void MusicPlay(Mix_Music* musicData, int loops)
 { 
   if (!settings.sys_sound) return;
+  if (!musicData) return;
+
   /* Stop previous music before playing new one: */
   MusicUnload();	
   Mix_PlayMusic(musicData, loops);

Modified: tuxtype/trunk/src/loaders.c
===================================================================
--- tuxtype/trunk/src/loaders.c	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/src/loaders.c	2009-01-23 12:35:47 UTC (rev 852)
@@ -265,20 +265,14 @@
   SDL_Surface* tmp_pic = NULL, *final_pic = NULL;
   char fn[FNLEN];
 
-//  oldDebug = settings.debug_on;  // suppress output for now
-//  settings.debug_on = 0;
-
-//  DEBUGCODE { fprintf(stderr, "LoadImage: loading %s\n", datafile ); }
-
   /* Look for image under theme path if desired: */
   if (!settings.use_english && !(mode & IMG_NO_THEME))
   {
     sprintf(fn, "%s/images/%s", settings.theme_data_path, datafile);
-//    DEBUGCODE { fprintf(stderr, "LoadImage: looking in %s\n", fn); }
 
     tmp_pic = IMG_Load(fn);
-    if (tmp_pic != NULL){}
-//      DEBUGCODE { fprintf(stderr, "Graphics file %s successfully loaded\n", fn);}
+    if (tmp_pic != NULL)
+      {}
     else
       DEBUGCODE { fprintf(stderr, "Warning: graphics file %s could not be loaded\n", fn);}
   }
@@ -287,11 +281,10 @@
   if (!tmp_pic)
   {
     sprintf(fn, "%s/images/%s", settings.default_data_path, datafile);
-//    DEBUGCODE { fprintf(stderr, "LoadImage: looking in %s\n", fn); }
 
     tmp_pic = IMG_Load(fn);
-    if (tmp_pic != NULL){}
-//      DEBUGCODE { fprintf(stderr, "Graphics file %s successfully loaded\n", fn);}
+    if (tmp_pic != NULL)
+      {}
     else
       DEBUGCODE { fprintf(stderr, "Warning: graphics file %s could not be loaded\n", fn);}
   }
@@ -300,10 +293,8 @@
   /* Couldn't load image - action depends on whether image is essential: */
   if (!tmp_pic)
   {
-//    if (mode & IMG_NOT_REQUIRED)
     { 
-//      settings.debug_on = oldDebug;
-      fprintf(stderr, "Warning - could not load graphics file %s\n", datafile);
+      DEBUGCODE { (stderr, "Warning - could not load graphics file %s\n", datafile);}
       return NULL;
     }
 
@@ -348,8 +339,6 @@
 
 //  LOG( "LoadImage(): Done\n" );
 
-//  settings.debug_on = oldDebug;
-
   return (final_pic);
 }
 

Modified: tuxtype/trunk/src/playgame.h
===================================================================
--- tuxtype/trunk/src/playgame.h	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/src/playgame.h	2009-01-23 12:35:47 UTC (rev 852)
@@ -64,7 +64,6 @@
 #define SPLAT_ONSCREEN	4
 #define DEFAULT_SPEED	1
 
-/* These aren't maxes - they are multipliers to determine how fast the fish fall */
 #define EASY_SPEED_FACTOR       1.3
 #define MEDIUM_SPEED_FACTOR     3
 #define HARD_SPEED_FACTOR       5

Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/src/practice.c	2009-01-23 12:35:47 UTC (rev 852)
@@ -111,8 +111,8 @@
 SDL_Surface* GetKeypress1(int index);
 SDL_Surface* GetKeypress2(int index);
 SDL_Surface* GetWrongKeypress(int index);
+static void print_load_results(void);
 
-
 /************************************************************************/
 /*                                                                      */ 
 /*         "Public" functions (callable throughout program)             */
@@ -122,13 +122,6 @@
 /*  --------  This is the main function for the 'Practice' activity. ------ */
 int Phrases(wchar_t* pphrase )
 {
-
-  /* TODO 
-  * 
-  * 
-  * 
-  */
-
   /* FIXME make variable names more descriptive */
   Uint32 start = 0, a = 0, tuxtime = 0;
   int quit = 0,
@@ -156,7 +149,7 @@
   /* Load all needed graphics, strings, sounds.... */
   if (!practice_load_media())
   {
-    fprintf(stderr, "Phrases() - practice_load_media() failed, returning.\n");
+    fprintf(stderr, "Phrases() - practice_load_media() failed, returning.\n\n");
     return 0;
   }
 
@@ -930,11 +923,10 @@
     ||!accuracy_label_srfc)
   {
     fprintf(stderr, "practice_load_media() - failed to load needed media \n");
-    practice_unload_media;
+    print_load_results();
     return 0;
   }
 
-
   /* Now render letters for glyphs in alphabet: */
   /* This is used for keyboard graphic */
   RenderLetters(smallfont);
@@ -946,6 +938,53 @@
 }
 
 
+
+static void print_load_results(void)
+{
+  LOG("\npractice - print_load_results:\n");
+ /* Get out if anything failed to load: */
+  if (!CurrentBkgd())
+    { LOG("CurrentBkgd() did not load\n");}
+  if (!hands)
+    { LOG("hands did not load\n");}
+  if (!tux_win)
+    { LOG("tux_win did not load\n");}
+  if (!tux_stand)
+    { LOG("tux_stand did not load\n");}
+  if (!wrong)
+    { LOG("wrong did not load\n");}
+  if (!smallfont)
+    { LOG("smallfont did not load\n");}
+  if (!medfont)
+    { LOG("medfont did not load\n");}
+  if (!bigfont)
+    { LOG("bigfont did not load\n");}
+  if (!keyboard)
+    { LOG("keyboard did not load\n");}
+  if (!hand_shift[0])
+    { LOG("hand_shift[0] did not load\n");}
+  if (!hand_shift[1])
+    { LOG("hand_shift[1] did not load\n");}
+  if (!hand_shift[2])
+    { LOG("hand_shift[2] did not load\n");}
+  if (!time_label_srfc)
+    { LOG("time_label_srfc did not load\n");}
+  if (!chars_label_srfc)
+    { LOG("chars_label_srfc did not load\n");}
+  if (!cpm_label_srfc)
+    { LOG("cpm_label_srfc did not load\n");}
+  if (!wpm_label_srfc)
+    { LOG("wpm_label_srfc did not load\n");}
+  if (!time_label_srfc)
+    { LOG("time_label_srfc did not load\n");}
+  if (!errors_label_srfc)
+    { LOG("errors_label_srfc did not load\n");}
+  if (!accuracy_label_srfc)
+    { LOG("accuracy_label_srfc did not load\n");}
+
+  LOG("End print_load_results()\n\n");
+}
+
 static void recalc_positions(void)
 {
   int text_height = TTF_FontHeight(smallfont);

Modified: tuxtype/trunk/src/titlescreen.c
===================================================================
--- tuxtype/trunk/src/titlescreen.c	2009-01-23 12:29:32 UTC (rev 851)
+++ tuxtype/trunk/src/titlescreen.c	2009-01-23 12:35:47 UTC (rev 852)
@@ -21,11 +21,12 @@
 #include "funcs.h"
 #include "titlescreen.h"
 #include "SDL_extras.h"
+#include "ConvertUTF.h"
 
 /* --- media for menus --- */
 
 /* images of regular and selected text of menu items: */
-static SDL_Surface* reg_text[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1] = {NULL};
+static SDL_Surface* reg_text[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1] = {{NULL}};
 static SDL_Surface* sel_text[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1] = {NULL};
 /* this will contain pointers to all of the menu 'icons' */
 static sprite* menu_gfx[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1] = {NULL};
@@ -41,6 +42,7 @@
 static sprite* Tux = NULL;
 static Mix_Chunk* snd_move = NULL;
 static Mix_Chunk* snd_select = NULL;
+static Mix_Chunk* snd_welcome = NULL; 
 static TTF_Font* font = NULL;
 
 /* --- locations we need --- */
@@ -130,10 +132,10 @@
   int redraw = 0;
   int key_menu = 1;
   int old_key_menu = 5;
-  wchar_t phrase[128];
-  FILE *fp;
-  unsigned char fn[FNLEN];
-  int found = 0;
+//  wchar_t phrase[128];
+//  FILE *fp;
+//  unsigned char fn[FNLEN];
+//  int found = 0;
   unsigned char str[1000];
 
 
@@ -146,7 +148,7 @@
   
   /* FIXME phrase(s) should come from file */
 
-  ConvertFromUTF8(phrase, "The quick brown fox jumps over the lazy dog.");
+//  ConvertFromUTF8(phrase, "The quick brown fox jumps over the lazy dog.");
 
 //  wcscpy(phrase, "Now is the time for all good men to come to the aid of their country.");
   start = SDL_GetTicks();
@@ -156,7 +158,13 @@
   * Display the Standby screen.... 
   */
   show_logo();
+  snd_welcome = LoadSound("harp.wav");
 
+  if (snd_welcome && settings.menu_sound)
+  {
+    PlaySound(snd_welcome);
+  }
+
   /* Load media and menu data: */
   if (!load_media())
   {
@@ -214,8 +222,14 @@
     SDL_BlitSurface(CurrentBkgd(), &Tuxdest, screen, &Tuxdest);
     SDL_BlitSurface(CurrentBkgd(), &Titledest, screen, &Titledest);
 
+
     Tuxdest.y -= Tux->frame[0]->h / (PRE_ANIM_FRAMES * PRE_FRAME_MULT);
     Titledest.x -= (screen->w) / (PRE_ANIM_FRAMES * PRE_FRAME_MULT);
+    /* Don't go past 0; */
+    if (Tuxdest.y < 0)
+      Tuxdest.y = 0;
+    if (Titledest.x < 0)
+      Titledest.x = 0;
 
     SDL_BlitSurface(Tux->frame[0], NULL, screen, &Tuxdest);
     SDL_BlitSurface(title, NULL, screen, &Titledest);
@@ -866,7 +880,7 @@
   {
     SDL_Rect logo_rect;
     SDL_Surface* t4k_logo = LoadImage("standby.png", IMG_REGULAR|IMG_NO_THEME);
-    
+
     if (t4k_logo) /* Avoid segfault */
     { 
       logo_rect.x = screen->w/2 - t4k_logo->w/2;  // Center horizontally
@@ -1073,19 +1087,21 @@
   LOG("Entering unload_media():\n");
 
   /* --- unload sounds --- */
-  if (settings.menu_sound){
- 
-    if (snd_move)
-    { 
-      Mix_FreeChunk(snd_move);
-      snd_move = NULL;
-    }
-    if (snd_select)
-    { 
-      Mix_FreeChunk(snd_select);
-      snd_select = NULL;
-    }
+  if (snd_move)
+  { 
+    Mix_FreeChunk(snd_move);
+    snd_move = NULL;
   }
+  if (snd_select)
+  {
+    Mix_FreeChunk(snd_select);
+    snd_select = NULL;
+  }
+  if (snd_welcome)
+  {
+    Mix_FreeChunk(snd_welcome);
+    snd_welcome = NULL; 
+  }
 
   /* --- unload graphics --- */
   if (title)




More information about the Tux4kids-commits mailing list