[Tux4kids-commits] r354 - in tuxmath: people/dbruce people/dbruce/tuxmath_dll trunk trunk/data/images/sprites trunk/doc trunk/nsis trunk/po trunk/src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Dec 6 01:53:11 UTC 2007
Author: dbruce-guest
Date: 2007-12-06 01:53:10 +0000 (Thu, 06 Dec 2007)
New Revision: 354
Added:
tuxmath/people/dbruce/tuxmath_dll/
tuxmath/people/dbruce/tuxmath_dll/SDL.dll
tuxmath/people/dbruce/tuxmath_dll/SDL_image.dll
tuxmath/people/dbruce/tuxmath_dll/SDL_mixer.dll
tuxmath/people/dbruce/tuxmath_dll/SDL_ttf.dll
tuxmath/people/dbruce/tuxmath_dll/charset.dll
tuxmath/people/dbruce/tuxmath_dll/iconv.dll
tuxmath/people/dbruce/tuxmath_dll/intl.dll
tuxmath/people/dbruce/tuxmath_dll/jpeg.dll
tuxmath/people/dbruce/tuxmath_dll/libpng12.dll
tuxmath/people/dbruce/tuxmath_dll/libtiff.dll
tuxmath/people/dbruce/tuxmath_dll/ogg.dll
tuxmath/people/dbruce/tuxmath_dll/smpeg.dll
tuxmath/people/dbruce/tuxmath_dll/vorbis.dll
tuxmath/people/dbruce/tuxmath_dll/vorbisfile.dll
tuxmath/people/dbruce/tuxmath_dll/zlib1.dll
tuxmath/trunk/po/en at boldquot.po
tuxmath/trunk/po/en at quot.po
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/doc/changelog
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath.nsi.in
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
tuxmath/trunk/po/cs.po
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nl.po
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/src/Makefile.in
tuxmath/trunk/src/tuxmath.c
tuxmath/trunk/src/tuxmath.h
Log:
work on win32 crossbuild
Added: tuxmath/people/dbruce/tuxmath_dll/SDL.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/SDL.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/SDL_image.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/SDL_image.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/SDL_mixer.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/SDL_mixer.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/SDL_ttf.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/SDL_ttf.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/charset.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/charset.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/iconv.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/iconv.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/intl.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/intl.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/jpeg.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/jpeg.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/libpng12.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/libpng12.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/libtiff.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/libtiff.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/ogg.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/ogg.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/smpeg.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/smpeg.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/vorbis.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/vorbis.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/vorbisfile.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/vorbisfile.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/people/dbruce/tuxmath_dll/zlib1.dll
===================================================================
(Binary files differ)
Property changes on: tuxmath/people/dbruce/tuxmath_dll/zlib1.dll
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/Makefile.am 2007-12-06 01:53:10 UTC (rev 354)
@@ -19,7 +19,7 @@
NSI_DLL_DIR=@NSI_DLL_DIR@
NSI_TUXMATH_CONF_DIR=@NSI_TUXMATH_CONF_DIR@
-NSI_TEMP_INSTALL_DIR=$(abs_top_builddir)/inst_w32
+NSI_TEMP_INSTALL_DIR=$(abs_top_builddir)/_instw32
## Bundle in fonts for distribution tar.gz to be used without package manager:
## i.e. to make tarball to post for individual download - use 'make distcheck' for Debian.
@@ -32,13 +32,46 @@
dist_fonts=$(data_fonts) dist
-## FIXME make better use of autotools here:
-## $(MAKE) $(AM_MAKEFLAGS) \
-## datarootdir=$(top_srcdir)/$(NSI_INSTALL_DIR) install-data
+## For building the NSIS executable Win32 installer - this rule first
+## does a "make install" into NSI_TEMP_INSTALL_DIR, which results in
+## a local copy of the complete unix-style install.
+## Subsequent commands then copy the needed files into NSI_INSTALL_DIR,
+## which has the exact directory structure of the self-contained
+## 'TuxMath' folder that gets installed onto the Windows machine.
install-nsi-local: all
+## create NSI_TEMP_INSTALL_DIR and install to that location:
$(INSTALL) -d $(NSI_TEMP_INSTALL_DIR)
$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(NSI_TEMP_INSTALL_DIR) install
+## create NSI_INSTALL_DIR/data dir and copy data files to that location:
+ $(INSTALL) -d $(top_builddir)/$(NSI_INSTALL_DIR)/data;
+ (cd $(NSI_TEMP_INSTALL_DIR)/$(pkgdatadir); \
+ tar cf - * ) \
+ | ( cd $(top_builddir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR); \
+ tar xf -)
+## create NSI_INSTALL_DIR/doc dir and copy docs to that location:
+ $(INSTALL) -d $(top_builddir)/$(NSI_INSTALL_DIR)/doc;
+ (cd $(NSI_TEMP_INSTALL_DIR)/$(docdir); \
+ tar cf - * ) \
+ | ( cd $(top_builddir)/$(NSI_INSTALL_DIR)/doc; \
+ tar xf -)
+## create NSI_INSTALL_DIR/locale dir and copy locales to that location:
+ $(INSTALL) -d $(top_builddir)/$(NSI_INSTALL_DIR)/locale;
+ (cd $(NSI_TEMP_INSTALL_DIR)/$(localedir); \
+ tar cf - * ) \
+ | ( cd $(top_builddir)/$(NSI_INSTALL_DIR)/locale; \
+ tar xf -)
+## copy executable into NSI_INSTALL_DIR:
+ (cd $(NSI_TEMP_INSTALL_DIR)/$(bindir); \
+ mv *TuxMath.exe TuxMath.exe; \
+ tar cf - TuxMath.exe ) \
+ | ( cd $(top_builddir)/$(NSI_INSTALL_DIR); \
+ tar xf -)
+## Done with NSI_TEMP_INSTALL_DIR so uninstall:
+ $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(NSI_TEMP_INSTALL_DIR) uninstall
+ rm -rf $(NSI_TEMP_INSTALL_DIR)
+## copy needed dll files into NSI_INSTALL_DIR:
+ cp $(NSI_DLL_DIR)/*.dll $(top_builddir)/$(NSI_INSTALL_DIR);
##install-nsi-local: all
## $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/data;
@@ -51,7 +84,7 @@
##
##if NSI_USE_TUXMATH_CONF
## $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
-## cp $(NSI_TUXMATH_CONF_DIR)/*.* $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
+## cp $(NSI_TUXMATH_CONF_DIR)/*.* ##$(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
##endif
install-nsi-am: install-nsi-local
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/configure 2007-12-06 01:53:10 UTC (rev 354)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.5.8.
+# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.5.9.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='Tux Of Math Command'
PACKAGE_TARNAME='tuxmath'
-PACKAGE_VERSION='1.5.8'
-PACKAGE_STRING='Tux Of Math Command 1.5.8'
+PACKAGE_VERSION='1.5.9'
+PACKAGE_STRING='Tux Of Math Command 1.5.9'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="src/tuxmath.c"
@@ -1279,7 +1279,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 Of Math Command 1.5.8 to adapt to many kinds of systems.
+\`configure' configures Tux Of Math Command 1.5.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1350,7 +1350,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Of Math Command 1.5.8:";;
+ short | recursive ) echo "Configuration of Tux Of Math Command 1.5.9:";;
esac
cat <<\_ACEOF
@@ -1460,7 +1460,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Of Math Command configure 1.5.8
+Tux Of Math Command configure 1.5.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1474,7 +1474,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 Of Math Command $as_me 1.5.8, which was
+It was created by Tux Of Math Command $as_me 1.5.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2341,7 +2341,7 @@
# Define the identity of the package.
PACKAGE='tuxmath'
- VERSION='1.5.8'
+ VERSION='1.5.9'
cat >>confdefs.h <<_ACEOF
@@ -14246,7 +14246,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Tux Of Math Command $as_me 1.5.8, which was
+This file was extended by Tux Of Math Command $as_me 1.5.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14299,7 +14299,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Of Math Command config.status 1.5.8
+Tux Of Math Command config.status 1.5.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/configure.ac 2007-12-06 01:53:10 UTC (rev 354)
@@ -1,6 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.5.8],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.5.9],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
AC_CONFIG_SRCDIR([src/tuxmath.c])
AC_PREREQ(2.61)
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-12-06 01:53:10 UTC (rev 354)
@@ -136,7 +136,7 @@
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.5.8
+NAME_VERSION = tuxmath-1.5.9
NSIS = /usr/bin/makensis
NSI_DLL_DIR = /home/dbruce/tuxmath_dll
NSI_INSTALL_DIR = mingw32
@@ -146,9 +146,9 @@
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.5.8
+PACKAGE_STRING = Tux Of Math Command 1.5.9
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.5.8
+PACKAGE_VERSION = 1.5.9
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -162,7 +162,7 @@
STRIP = i586-mingw32msvc-strip
USE_INCLUDED_LIBINTL = yes
USE_NLS = yes
-VERSION = 1.5.8
+VERSION = 1.5.9
WINDRES = /usr/bin/i586-mingw32msvc-windres
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
Modified: tuxmath/trunk/doc/changelog
===================================================================
--- tuxmath/trunk/doc/changelog 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/doc/changelog 2007-12-06 01:53:10 UTC (rev 354)
@@ -1,3 +1,13 @@
+2007.Dec.05 (svn.debian.org/tux4kids - revision 354)
+ Build:
+ * Improvement of Makefile.am code for Windows crossbuild to make
+ better use of autotools.
+ * Addition of tux4kids/tuxmath/people/dbruce/tuxmath_dll directory
+ to make it easier for others to set up crossbuild - intention is
+ to have entire cross-compile setup managed by svn.
+
+ David Bruce <dbruce at tampabay.rr.com>
+
2007.Dec.03 (svn.debian.org/tux4kids - revision 353)
Options:
* Added global config file support for specifying a home directory
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2007-12-06 01:53:10 UTC (rev 354)
@@ -1,8 +1,9 @@
# vim: noai et ts=4 tw=0
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
+# modified more for tuxmath by David Bruce <dbruce at tampabay.rr.com>
-!define PKG_VERSION "1.5.8"
+!define PKG_VERSION "1.5.9"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
@@ -31,7 +32,7 @@
# Licence text
LicenseText "You must agree to this license before installing ${APP_NAME}"
-LicenseData "doc\COPYING.txt"
+LicenseData "mingw32\doc\COPYING.txt"
# Directory browsing
# DirShow show
@@ -50,7 +51,9 @@
SetOutPath $INSTDIR\data
File /r "mingw32\data\*.*"
SetOutPath $INSTDIR\doc
- File "doc\COPYING.txt"
+ File /r "mingw32\doc\*.*"
+ SetOutPath $INSTDIR\locale
+ File /r "mingw32\locale\*.*"
WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
"Install_Dir" \
@@ -83,7 +86,10 @@
0 "" "" \
"Start TuxMath in a Window"
- CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux of Math Command"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" \
+ "$INSTDIR\uninstall.exe" "" \
+ "$INSTDIR\uninstall.exe" 0 "" "" \
+ "Remove Tux of Math Command"
SectionEnd
Section "Desktop Shortcut"
@@ -96,23 +102,14 @@
"Run Tux of Math Command"
SectionEnd
-;Function .onInstSuccess
-; BringToFront
-; MessageBox MB_YESNO|MB_ICONQUESTION \
-; "${APP_NAME} was installed. Would you like to run ${APP_NAME} now ?" \
-; IDNO NoExec
-; Exec '$INSTDIR\${APP_EXE}'
-; NoExec:
-;FunctionEnd
+# Uninstall stuff
-; uninstall stuff
-
UninstallText "This will uninstall ${APP_NAME}. Hit 'Uninstall' to continue."
-; special uninstall section.
+# special uninstall section.
Section "Uninstall"
SetShellVarContext all
- ; remove registry keys
+# remove registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}"
DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
@@ -124,5 +121,3 @@
Delete "$SMPROGRAMS\${APP_NAME}\*.*"
RMDir "$SMPROGRAMS\${APP_NAME}"
SectionEnd
-
-
Modified: tuxmath/trunk/nsis/tuxmath.nsi.in
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi.in 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/nsis/tuxmath.nsi.in 2007-12-06 01:53:10 UTC (rev 354)
@@ -1,6 +1,7 @@
# vim: noai et ts=4 tw=0
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
+# modified more for tuxmath by David Bruce <dbruce at tampabay.rr.com>
!define PKG_VERSION "@VERSION@"
!define PKG_PREFIX "tuxmath"
@@ -31,7 +32,7 @@
# Licence text
LicenseText "You must agree to this license before installing ${APP_NAME}"
-LicenseData "doc\COPYING.txt"
+LicenseData "mingw32\doc\COPYING.txt"
# Directory browsing
# DirShow show
@@ -50,7 +51,9 @@
SetOutPath $INSTDIR\data
File /r "mingw32\data\*.*"
SetOutPath $INSTDIR\doc
- File "doc\COPYING.txt"
+ File /r "mingw32\doc\*.*"
+ SetOutPath $INSTDIR\locale
+ File /r "mingw32\locale\*.*"
WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
"Install_Dir" \
@@ -83,7 +86,10 @@
0 "" "" \
"Start TuxMath in a Window"
- CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux of Math Command"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" \
+ "$INSTDIR\uninstall.exe" "" \
+ "$INSTDIR\uninstall.exe" 0 "" "" \
+ "Remove Tux of Math Command"
SectionEnd
Section "Desktop Shortcut"
@@ -96,23 +102,14 @@
"Run Tux of Math Command"
SectionEnd
-;Function .onInstSuccess
-; BringToFront
-; MessageBox MB_YESNO|MB_ICONQUESTION \
-; "${APP_NAME} was installed. Would you like to run ${APP_NAME} now ?" \
-; IDNO NoExec
-; Exec '$INSTDIR\${APP_EXE}'
-; NoExec:
-;FunctionEnd
+# Uninstall stuff
-; uninstall stuff
-
UninstallText "This will uninstall ${APP_NAME}. Hit 'Uninstall' to continue."
-; special uninstall section.
+# special uninstall section.
Section "Uninstall"
SetShellVarContext all
- ; remove registry keys
+# remove registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}"
DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
@@ -124,5 +121,3 @@
Delete "$SMPROGRAMS\${APP_NAME}\*.*"
RMDir "$SMPROGRAMS\${APP_NAME}"
SectionEnd
-
-
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-12-06 01:53:10 UTC (rev 354)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5.8"
+!define PKG_VERSION "1.5.9"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/po/cs.po
===================================================================
--- tuxmath/trunk/po/cs.po 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/po/cs.po 2007-12-06 01:53:10 UTC (rev 354)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-11-14 19:41+0000\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: 2007-11-12 20:54+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -17,115 +17,115 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: src/titlescreen.c:400
+#: src/titlescreen.c:407
msgid "Work In Progress!"
msgstr "Ve výstavbě!"
-#: src/titlescreen.c:401
+#: src/titlescreen.c:408
msgid "This feature is not ready yet"
msgstr "Tato vlastnost ještě nefunguje"
-#: src/titlescreen.c:402
+#: src/titlescreen.c:409
msgid "Discuss the future of TuxMath at"
msgstr "Diskutuj o budoucnosti TuxMath na"
-#: src/titlescreen.c:403
+#: src/titlescreen.c:410
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:571
+#: src/titlescreen.c:578
msgid "Math Command Training Academy"
msgstr "Akademie vesmírné matematiky"
-#: src/titlescreen.c:572
+#: src/titlescreen.c:579
msgid "Play Arcade Game"
msgstr "Hra"
-#: src/titlescreen.c:573
+#: src/titlescreen.c:580
msgid "Play Custom Game"
msgstr "Vlastní hra"
-#: src/titlescreen.c:574
+#: src/titlescreen.c:581
msgid "Help"
msgstr "Nápověda"
-#: src/titlescreen.c:575
+#: src/titlescreen.c:582
msgid "More Options"
msgstr "Více možností"
-#: src/titlescreen.c:576
+#: src/titlescreen.c:583
msgid "Quit"
msgstr "Ukončit"
-#: src/titlescreen.c:644
+#: src/titlescreen.c:651
msgid "Space Cadet"
msgstr "Nováček"
-#: src/titlescreen.c:645
+#: src/titlescreen.c:652
msgid "Scout"
msgstr "Průzkumník"
-#: src/titlescreen.c:646
+#: src/titlescreen.c:653
msgid "Ranger"
msgstr "Střelec"
-#: src/titlescreen.c:647
+#: src/titlescreen.c:654
msgid "Ace"
msgstr "Borec"
-#: src/titlescreen.c:648
+#: src/titlescreen.c:655
msgid "Hall Of Fame"
msgstr "Síň slávy"
-#: src/titlescreen.c:649
+#: src/titlescreen.c:656
msgid "Main menu"
msgstr "Hlavní menu"
-#: src/titlescreen.c:723
+#: src/titlescreen.c:735
msgid "Edit 'options' file in your home directory"
msgstr "Uprav soubor «options » ve své domovské složce,"
-#: src/titlescreen.c:724
+#: src/titlescreen.c:736
msgid "to create customized game!"
msgstr "abys mohl vytvořit vlastní hru!"
-#: src/titlescreen.c:725
+#: src/titlescreen.c:737
msgid "Press a key or click your mouse to start game."
msgstr "Zmáčkni klávesu nebo klikni tlačítkem myši, abys začal hru"
-#: src/titlescreen.c:726
+#: src/titlescreen.c:738
msgid "See README.txt for more information"
msgstr "Pokud chceš více informací, podívej se na README.txt"
-#: src/titlescreen.c:757
+#: src/titlescreen.c:769
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:758
+#: src/titlescreen.c:770
msgid "Project Info"
msgstr "Info o projektu"
-#: src/titlescreen.c:759
+#: src/titlescreen.c:771
msgid "Credits"
msgstr "Poděkování"
-#: src/titlescreen.c:760
+#: src/titlescreen.c:772
msgid "Main Menu"
msgstr "Hlavní menu"
-#: src/titlescreen.c:804
+#: src/titlescreen.c:816
msgid "TuxMath is free and open-source!"
msgstr "TuxMath je svobodný software!"
-#: src/titlescreen.c:805
+#: src/titlescreen.c:817
msgid "You can help make it better by reporting problems,"
msgstr "I ty ho můžeš vylepšit, když oznámíš chyby, "
-#: src/titlescreen.c:806
+#: src/titlescreen.c:818
msgid "suggesting improvements, or adding code."
msgstr "navrhneš vylepšení nebo přidáš svůj kód"
-#: src/titlescreen.c:807
+#: src/titlescreen.c:819
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
Added: tuxmath/trunk/po/en at boldquot.po
===================================================================
--- tuxmath/trunk/po/en at boldquot.po (rev 0)
+++ tuxmath/trunk/po/en at boldquot.po 2007-12-06 01:53:10 UTC (rev 354)
@@ -0,0 +1,379 @@
+# English translations for Tux Of Math Command package.
+# This file is put in the public domain.
+# Automatically generated, 2007.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tux Of Math Command 1.5.9\n"
+"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
+"PO-Revision-Date: 2007-12-05 18:15-0500\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/titlescreen.c:407
+msgid "Work In Progress!"
+msgstr "Work In Progress!"
+
+#: src/titlescreen.c:408
+msgid "This feature is not ready yet"
+msgstr "This feature is not ready yet"
+
+#: src/titlescreen.c:409
+msgid "Discuss the future of TuxMath at"
+msgstr "Discuss the future of TuxMath at"
+
+#: src/titlescreen.c:410
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:578
+msgid "Math Command Training Academy"
+msgstr "Math Command Training Academy"
+
+#: src/titlescreen.c:579
+msgid "Play Arcade Game"
+msgstr "Play Arcade Game"
+
+#: src/titlescreen.c:580
+msgid "Play Custom Game"
+msgstr "Play Custom Game"
+
+#: src/titlescreen.c:581
+msgid "Help"
+msgstr "Help"
+
+#: src/titlescreen.c:582
+msgid "More Options"
+msgstr "More Options"
+
+#: src/titlescreen.c:583
+msgid "Quit"
+msgstr "Quit"
+
+#: src/titlescreen.c:651
+msgid "Space Cadet"
+msgstr "Space Cadet"
+
+#: src/titlescreen.c:652
+msgid "Scout"
+msgstr "Scout"
+
+#: src/titlescreen.c:653
+msgid "Ranger"
+msgstr "Ranger"
+
+#: src/titlescreen.c:654
+msgid "Ace"
+msgstr "Ace"
+
+#: src/titlescreen.c:655
+msgid "Hall Of Fame"
+msgstr "Hall Of Fame"
+
+#: src/titlescreen.c:656
+msgid "Main menu"
+msgstr "Main menu"
+
+#: src/titlescreen.c:735
+msgid "Edit 'options' file in your home directory"
+msgstr "Edit ‘[1moptions[0m’ file in your home directory"
+
+#: src/titlescreen.c:736
+msgid "to create customized game!"
+msgstr "to create customized game!"
+
+#: src/titlescreen.c:737
+msgid "Press a key or click your mouse to start game."
+msgstr "Press a key or click your mouse to start game."
+
+#: src/titlescreen.c:738
+msgid "See README.txt for more information"
+msgstr "See README.txt for more information"
+
+#: src/titlescreen.c:769
+msgid "Demo"
+msgstr "Demo"
+
+#: src/titlescreen.c:770
+msgid "Project Info"
+msgstr "Project Info"
+
+#: src/titlescreen.c:771
+msgid "Credits"
+msgstr "Credits"
+
+#: src/titlescreen.c:772
+msgid "Main Menu"
+msgstr "Main Menu"
+
+#: src/titlescreen.c:816
+msgid "TuxMath is free and open-source!"
+msgstr "TuxMath is free and open-source!"
+
+#: src/titlescreen.c:817
+msgid "You can help make it better by reporting problems,"
+msgstr "You can help make it better by reporting problems,"
+
+#: src/titlescreen.c:818
+msgid "suggesting improvements, or adding code."
+msgstr "suggesting improvements, or adding code."
+
+#: src/titlescreen.c:819
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr "Number Typing"
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr "Addition: 1 to 3"
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr "Addition: 0 to 5"
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr "Addition: Sums to 10"
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr "Addition: Sums to 15"
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr "Addition: Sums to 20"
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr "Addition: Two Digit Numbers"
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr "Addition: Missing Numbers"
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr "Subtraction: 0 to 10"
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr "Subtraction: 0 to 20"
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Subtraction: Two Digit Numbers"
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr "Addition and Subtraction Review"
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr "Multiplication: 0 to 3"
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr "Multiples of 2"
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr "Multiples of 3"
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr "Multiples of 4"
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr "Multiples of 5"
+
+#: data/missions/lessons/descr_lessons:18
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiplication: 0 to 5"
+msgstr "Multiplication: 0 to 5"
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 6"
+msgstr "Multiples of 6"
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiples of 7"
+msgstr "Multiples of 7"
+
+#: data/missions/lessons/descr_lessons:22
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiplication: 0 to 7"
+msgstr "Multiplication: 0 to 7"
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 8"
+msgstr "Multiples of 8"
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiples of 9"
+msgstr "Multiples of 9"
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 10"
+msgstr "Multiples of 10"
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 10"
+msgstr "Multiplication: 0 to 10"
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 11 and 12"
+msgstr "Multiples of 11 and 12"
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 12"
+msgstr "Multiplication: 0 to 12"
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiples of 13, 14, and 15"
+msgstr "Multiples of 13, 14, and 15"
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Multiplication: 0 to 15"
+msgstr "Multiplication: 0 to 15"
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Multiplication: Missing Numbers"
+msgstr "Multiplication: Missing Numbers"
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 2"
+msgstr "Division by 2"
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 3"
+msgstr "Division by 3"
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division by 4"
+msgstr "Division by 4"
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 5"
+msgstr "Division by 5"
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division: 1 to 5"
+msgstr "Division: 1 to 5"
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 6"
+msgstr "Division by 6"
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 7"
+msgstr "Division by 7"
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 8"
+msgstr "Division by 8"
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division by 9"
+msgstr "Division by 9"
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 10"
+msgstr "Division by 10"
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 10"
+msgstr "Division: 1 to 10"
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 11 and 12"
+msgstr "Division by 11 and 12"
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 12"
+msgstr "Division: 1 to 12"
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Division by 13, 14, and 15"
+msgstr "Division by 13, 14, and 15"
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Division: 1 to 15"
+msgstr "Division: 1 to 15"
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Multiplication and Division Review"
+msgstr "Multiplication and Division Review"
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Typing Negative Numbers"
+msgstr "Typing Negative Numbers"
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtraction: Negative Answers"
+msgstr "Subtraction: Negative Answers"
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Positives"
+msgstr "Adding Negatives to Positives"
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Positives"
+msgstr "Subtracting Negatives From Positives"
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Adding Negatives to Negatives"
+msgstr "Adding Negatives to Negatives"
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Subtracting Negatives From Negatives"
+msgstr "Subtracting Negatives From Negatives"
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Negative and Positive Numbers Review"
+msgstr "Negative and Positive Numbers Review"
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Multiplication and Division of Negatives"
+msgstr "Multiplication and Division of Negatives"
+
+#: data/missions/lessons/descr_lessons:57
+msgid "Multiplication of Positives and Negatives"
+msgstr "Multiplication of Positives and Negatives"
+
+#: data/missions/lessons/descr_lessons:58
+msgid "Division of Positives and Negatives"
+msgstr "Division of Positives and Negatives"
Added: tuxmath/trunk/po/en at quot.po
===================================================================
--- tuxmath/trunk/po/en at quot.po (rev 0)
+++ tuxmath/trunk/po/en at quot.po 2007-12-06 01:53:10 UTC (rev 354)
@@ -0,0 +1,376 @@
+# English translations for Tux Of Math Command package.
+# This file is put in the public domain.
+# Automatically generated, 2007.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tux Of Math Command 1.5.9\n"
+"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
+"PO-Revision-Date: 2007-12-05 18:15-0500\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/titlescreen.c:407
+msgid "Work In Progress!"
+msgstr "Work In Progress!"
+
+#: src/titlescreen.c:408
+msgid "This feature is not ready yet"
+msgstr "This feature is not ready yet"
+
+#: src/titlescreen.c:409
+msgid "Discuss the future of TuxMath at"
+msgstr "Discuss the future of TuxMath at"
+
+#: src/titlescreen.c:410
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:578
+msgid "Math Command Training Academy"
+msgstr "Math Command Training Academy"
+
+#: src/titlescreen.c:579
+msgid "Play Arcade Game"
+msgstr "Play Arcade Game"
+
+#: src/titlescreen.c:580
+msgid "Play Custom Game"
+msgstr "Play Custom Game"
+
+#: src/titlescreen.c:581
+msgid "Help"
+msgstr "Help"
+
+#: src/titlescreen.c:582
+msgid "More Options"
+msgstr "More Options"
+
+#: src/titlescreen.c:583
+msgid "Quit"
+msgstr "Quit"
+
+#: src/titlescreen.c:651
+msgid "Space Cadet"
+msgstr "Space Cadet"
+
+#: src/titlescreen.c:652
+msgid "Scout"
+msgstr "Scout"
+
+#: src/titlescreen.c:653
+msgid "Ranger"
+msgstr "Ranger"
+
+#: src/titlescreen.c:654
+msgid "Ace"
+msgstr "Ace"
+
+#: src/titlescreen.c:655
+msgid "Hall Of Fame"
+msgstr "Hall Of Fame"
+
+#: src/titlescreen.c:656
+msgid "Main menu"
+msgstr "Main menu"
+
+#: src/titlescreen.c:735
+msgid "Edit 'options' file in your home directory"
+msgstr "Edit ‘options’ file in your home directory"
+
+#: src/titlescreen.c:736
+msgid "to create customized game!"
+msgstr "to create customized game!"
+
+#: src/titlescreen.c:737
+msgid "Press a key or click your mouse to start game."
+msgstr "Press a key or click your mouse to start game."
+
+#: src/titlescreen.c:738
+msgid "See README.txt for more information"
+msgstr "See README.txt for more information"
+
+#: src/titlescreen.c:769
+msgid "Demo"
+msgstr "Demo"
+
+#: src/titlescreen.c:770
+msgid "Project Info"
+msgstr "Project Info"
+
+#: src/titlescreen.c:771
+msgid "Credits"
+msgstr "Credits"
+
+#: src/titlescreen.c:772
+msgid "Main Menu"
+msgstr "Main Menu"
+
+#: src/titlescreen.c:816
+msgid "TuxMath is free and open-source!"
+msgstr "TuxMath is free and open-source!"
+
+#: src/titlescreen.c:817
+msgid "You can help make it better by reporting problems,"
+msgstr "You can help make it better by reporting problems,"
+
+#: src/titlescreen.c:818
+msgid "suggesting improvements, or adding code."
+msgstr "suggesting improvements, or adding code."
+
+#: src/titlescreen.c:819
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr "Number Typing"
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr "Addition: 1 to 3"
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr "Addition: 0 to 5"
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr "Addition: Sums to 10"
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr "Addition: Sums to 15"
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr "Addition: Sums to 20"
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr "Addition: Two Digit Numbers"
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr "Addition: Missing Numbers"
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr "Subtraction: 0 to 10"
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr "Subtraction: 0 to 20"
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Subtraction: Two Digit Numbers"
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr "Addition and Subtraction Review"
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr "Multiplication: 0 to 3"
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr "Multiples of 2"
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr "Multiples of 3"
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr "Multiples of 4"
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr "Multiples of 5"
+
+#: data/missions/lessons/descr_lessons:18
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiplication: 0 to 5"
+msgstr "Multiplication: 0 to 5"
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 6"
+msgstr "Multiples of 6"
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiples of 7"
+msgstr "Multiples of 7"
+
+#: data/missions/lessons/descr_lessons:22
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiplication: 0 to 7"
+msgstr "Multiplication: 0 to 7"
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 8"
+msgstr "Multiples of 8"
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiples of 9"
+msgstr "Multiples of 9"
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 10"
+msgstr "Multiples of 10"
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 10"
+msgstr "Multiplication: 0 to 10"
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 11 and 12"
+msgstr "Multiples of 11 and 12"
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 12"
+msgstr "Multiplication: 0 to 12"
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiples of 13, 14, and 15"
+msgstr "Multiples of 13, 14, and 15"
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Multiplication: 0 to 15"
+msgstr "Multiplication: 0 to 15"
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Multiplication: Missing Numbers"
+msgstr "Multiplication: Missing Numbers"
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 2"
+msgstr "Division by 2"
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 3"
+msgstr "Division by 3"
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division by 4"
+msgstr "Division by 4"
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 5"
+msgstr "Division by 5"
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division: 1 to 5"
+msgstr "Division: 1 to 5"
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 6"
+msgstr "Division by 6"
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 7"
+msgstr "Division by 7"
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 8"
+msgstr "Division by 8"
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division by 9"
+msgstr "Division by 9"
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 10"
+msgstr "Division by 10"
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 10"
+msgstr "Division: 1 to 10"
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 11 and 12"
+msgstr "Division by 11 and 12"
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 12"
+msgstr "Division: 1 to 12"
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Division by 13, 14, and 15"
+msgstr "Division by 13, 14, and 15"
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Division: 1 to 15"
+msgstr "Division: 1 to 15"
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Multiplication and Division Review"
+msgstr "Multiplication and Division Review"
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Typing Negative Numbers"
+msgstr "Typing Negative Numbers"
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtraction: Negative Answers"
+msgstr "Subtraction: Negative Answers"
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Positives"
+msgstr "Adding Negatives to Positives"
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Positives"
+msgstr "Subtracting Negatives From Positives"
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Adding Negatives to Negatives"
+msgstr "Adding Negatives to Negatives"
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Subtracting Negatives From Negatives"
+msgstr "Subtracting Negatives From Negatives"
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Negative and Positive Numbers Review"
+msgstr "Negative and Positive Numbers Review"
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Multiplication and Division of Negatives"
+msgstr "Multiplication and Division of Negatives"
+
+#: data/missions/lessons/descr_lessons:57
+msgid "Multiplication of Positives and Negatives"
+msgstr "Multiplication of Positives and Negatives"
+
+#: data/missions/lessons/descr_lessons:58
+msgid "Division of Positives and Negatives"
+msgstr "Division of Positives and Negatives"
Modified: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/po/nb.po 2007-12-06 01:53:10 UTC (rev 354)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-11-14 19:41+0000\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: 2007-04-14 21:38+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -17,115 +17,115 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/titlescreen.c:400
+#: src/titlescreen.c:407
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:401
+#: src/titlescreen.c:408
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar ennå."
-#: src/titlescreen.c:402
+#: src/titlescreen.c:409
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter fremtiden til TuxMath på"
-#: src/titlescreen.c:403
+#: src/titlescreen.c:410
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:571
+#: src/titlescreen.c:578
msgid "Math Command Training Academy"
msgstr "Kadettskole"
-#: src/titlescreen.c:572
+#: src/titlescreen.c:579
msgid "Play Arcade Game"
msgstr "Spill"
-#: src/titlescreen.c:573
+#: src/titlescreen.c:580
msgid "Play Custom Game"
msgstr "Selvlaget spill"
-#: src/titlescreen.c:574
+#: src/titlescreen.c:581
msgid "Help"
msgstr "Hjelp"
-#: src/titlescreen.c:575
+#: src/titlescreen.c:582
msgid "More Options"
msgstr "Flere valg"
-#: src/titlescreen.c:576
+#: src/titlescreen.c:583
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:644
+#: src/titlescreen.c:651
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/titlescreen.c:645
+#: src/titlescreen.c:652
msgid "Scout"
msgstr "Romlærling"
-#: src/titlescreen.c:646
+#: src/titlescreen.c:653
msgid "Ranger"
msgstr "Romvokter"
-#: src/titlescreen.c:647
+#: src/titlescreen.c:654
msgid "Ace"
msgstr "Romsjef"
-#: src/titlescreen.c:648
+#: src/titlescreen.c:655
msgid "Hall Of Fame"
msgstr "Poengliste"
-#: src/titlescreen.c:649
+#: src/titlescreen.c:656
msgid "Main menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:723
+#: src/titlescreen.c:735
msgid "Edit 'options' file in your home directory"
msgstr "Rediger «options»-fila i hjemmemappa di"
-#: src/titlescreen.c:724
+#: src/titlescreen.c:736
msgid "to create customized game!"
msgstr "for å lage ditt eget spill."
-#: src/titlescreen.c:725
+#: src/titlescreen.c:737
msgid "Press a key or click your mouse to start game."
msgstr "Trykk en tast eller med musen for å starte spillet."
-#: src/titlescreen.c:726
+#: src/titlescreen.c:738
msgid "See README.txt for more information"
msgstr "Se «README.txt» for mer informasjon."
-#: src/titlescreen.c:757
+#: src/titlescreen.c:769
msgid "Demo"
msgstr "Demonstrasjon"
-#: src/titlescreen.c:758
+#: src/titlescreen.c:770
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:759
+#: src/titlescreen.c:771
msgid "Credits"
msgstr "Bidragsytere"
-#: src/titlescreen.c:760
+#: src/titlescreen.c:772
msgid "Main Menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:804
+#: src/titlescreen.c:816
msgid "TuxMath is free and open-source!"
msgstr "TuxMath er fri programvare!"
-#: src/titlescreen.c:805
+#: src/titlescreen.c:817
msgid "You can help make it better by reporting problems,"
msgstr "Du kan være med på å gjøre spillet bedre, ved å melde fra"
-#: src/titlescreen.c:806
+#: src/titlescreen.c:818
msgid "suggesting improvements, or adding code."
msgstr "om feil, foreslå forbedringer eller bidra med programkode."
-#: src/titlescreen.c:807
+#: src/titlescreen.c:819
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/nl.po
===================================================================
--- tuxmath/trunk/po/nl.po 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/po/nl.po 2007-12-06 01:53:10 UTC (rev 354)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-11-14 19:41+0000\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Schrijvers Luc <Begasus at skynet.be>\n"
"Language-Team: Dutch <LL at li.org>\n"
@@ -15,115 +15,115 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/titlescreen.c:400
+#: src/titlescreen.c:407
msgid "Work In Progress!"
msgstr "Werk in uitvoering"
-#: src/titlescreen.c:401
+#: src/titlescreen.c:408
msgid "This feature is not ready yet"
msgstr "Deze functie is nog niet beschikbaar"
-#: src/titlescreen.c:402
+#: src/titlescreen.c:409
msgid "Discuss the future of TuxMath at"
msgstr "Praat over de toekomst van TuxMath op"
-#: src/titlescreen.c:403
+#: src/titlescreen.c:410
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:571
+#: src/titlescreen.c:578
msgid "Math Command Training Academy"
msgstr "Reken commando training academie"
-#: src/titlescreen.c:572
+#: src/titlescreen.c:579
msgid "Play Arcade Game"
msgstr "Speel Arcade spel"
-#: src/titlescreen.c:573
+#: src/titlescreen.c:580
msgid "Play Custom Game"
msgstr "Speel je eigen spel"
-#: src/titlescreen.c:574
+#: src/titlescreen.c:581
msgid "Help"
msgstr "Help"
-#: src/titlescreen.c:575
+#: src/titlescreen.c:582
msgid "More Options"
msgstr "Meer opties"
-#: src/titlescreen.c:576
+#: src/titlescreen.c:583
msgid "Quit"
msgstr "Afsluiten"
-#: src/titlescreen.c:644
+#: src/titlescreen.c:651
msgid "Space Cadet"
msgstr "Ruimte kadet"
-#: src/titlescreen.c:645
+#: src/titlescreen.c:652
msgid "Scout"
msgstr "Scout"
-#: src/titlescreen.c:646
+#: src/titlescreen.c:653
msgid "Ranger"
msgstr "Ranger"
-#: src/titlescreen.c:647
+#: src/titlescreen.c:654
msgid "Ace"
msgstr "Ace"
-#: src/titlescreen.c:648
+#: src/titlescreen.c:655
msgid "Hall Of Fame"
msgstr "Hoogste scores"
-#: src/titlescreen.c:649
+#: src/titlescreen.c:656
msgid "Main menu"
msgstr "Hoofdmenu"
-#: src/titlescreen.c:723
+#: src/titlescreen.c:735
msgid "Edit 'options' file in your home directory"
msgstr "Bewerk 'options' bestand in je home folder"
-#: src/titlescreen.c:724
+#: src/titlescreen.c:736
msgid "to create customized game!"
msgstr "voor een eigen spel!"
-#: src/titlescreen.c:725
+#: src/titlescreen.c:737
msgid "Press a key or click your mouse to start game."
msgstr "Druk op een toets of de muis om het spel te starten."
-#: src/titlescreen.c:726
+#: src/titlescreen.c:738
msgid "See README.txt for more information"
msgstr "Lees README.txt voor meer informatie"
-#: src/titlescreen.c:757
+#: src/titlescreen.c:769
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:758
+#: src/titlescreen.c:770
msgid "Project Info"
msgstr "Projekt info"
-#: src/titlescreen.c:759
+#: src/titlescreen.c:771
msgid "Credits"
msgstr "Kredieten"
-#: src/titlescreen.c:760
+#: src/titlescreen.c:772
msgid "Main Menu"
msgstr "Hoofdmenu"
-#: src/titlescreen.c:804
+#: src/titlescreen.c:816
msgid "TuxMath is free and open-source!"
msgstr "TuxMath is gratis en open-source!"
-#: src/titlescreen.c:805
+#: src/titlescreen.c:817
msgid "You can help make it better by reporting problems,"
msgstr "Je kan helpen met het verbeteren door problemen te melden,"
-#: src/titlescreen.c:806
+#: src/titlescreen.c:818
msgid "suggesting improvements, or adding code."
msgstr "suggesties verbeteringen, of code toevoegen."
-#: src/titlescreen.c:807
+#: src/titlescreen.c:819
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/po/nn.po 2007-12-06 01:53:10 UTC (rev 354)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-11-14 19:41+0000\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: 2007-04-14 21:31+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -17,115 +17,115 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/titlescreen.c:400
+#: src/titlescreen.c:407
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:401
+#: src/titlescreen.c:408
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikkje klar enno."
-#: src/titlescreen.c:402
+#: src/titlescreen.c:409
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter framtida til TuxMath på"
-#: src/titlescreen.c:403
+#: src/titlescreen.c:410
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:571
+#: src/titlescreen.c:578
msgid "Math Command Training Academy"
msgstr "Kadettskule"
-#: src/titlescreen.c:572
+#: src/titlescreen.c:579
msgid "Play Arcade Game"
msgstr "Spel"
-#: src/titlescreen.c:573
+#: src/titlescreen.c:580
msgid "Play Custom Game"
msgstr "Sjølvlaga spel"
-#: src/titlescreen.c:574
+#: src/titlescreen.c:581
msgid "Help"
msgstr "Hjelp"
-#: src/titlescreen.c:575
+#: src/titlescreen.c:582
msgid "More Options"
msgstr "Fleire val"
-#: src/titlescreen.c:576
+#: src/titlescreen.c:583
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:644
+#: src/titlescreen.c:651
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/titlescreen.c:645
+#: src/titlescreen.c:652
msgid "Scout"
msgstr "Romlærling"
-#: src/titlescreen.c:646
+#: src/titlescreen.c:653
msgid "Ranger"
msgstr "Romvaktar"
-#: src/titlescreen.c:647
+#: src/titlescreen.c:654
msgid "Ace"
msgstr "Romsjef"
-#: src/titlescreen.c:648
+#: src/titlescreen.c:655
msgid "Hall Of Fame"
msgstr "Poengliste"
-#: src/titlescreen.c:649
+#: src/titlescreen.c:656
msgid "Main menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:723
+#: src/titlescreen.c:735
msgid "Edit 'options' file in your home directory"
msgstr "Rediger «options»-fila i heimemappa di"
-#: src/titlescreen.c:724
+#: src/titlescreen.c:736
msgid "to create customized game!"
msgstr "for å laga ditt eige spel."
-#: src/titlescreen.c:725
+#: src/titlescreen.c:737
msgid "Press a key or click your mouse to start game."
msgstr "Trykk ein tast eller med musa for å starta spelet."
-#: src/titlescreen.c:726
+#: src/titlescreen.c:738
msgid "See README.txt for more information"
msgstr "Sjå «README.txt» for meir informasjon."
-#: src/titlescreen.c:757
+#: src/titlescreen.c:769
msgid "Demo"
msgstr "Demonstrasjon"
-#: src/titlescreen.c:758
+#: src/titlescreen.c:770
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:759
+#: src/titlescreen.c:771
msgid "Credits"
msgstr "Bidragsytarar"
-#: src/titlescreen.c:760
+#: src/titlescreen.c:772
msgid "Main Menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:804
+#: src/titlescreen.c:816
msgid "TuxMath is free and open-source!"
msgstr "TuxMath er fri programvare!"
-#: src/titlescreen.c:805
+#: src/titlescreen.c:817
msgid "You can help make it better by reporting problems,"
msgstr "Du kan vera med på å gjera spelet betre, ved å melda frå"
-#: src/titlescreen.c:806
+#: src/titlescreen.c:818
msgid "suggesting improvements, or adding code."
msgstr "om feil, foreslå forbetringar eller bidra med programkode."
-#: src/titlescreen.c:807
+#: src/titlescreen.c:819
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/po/tuxmath.pot 2007-12-06 01:53:10 UTC (rev 354)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-11-14 19:41+0000\n"
+"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,115 +15,115 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/titlescreen.c:400
+#: src/titlescreen.c:407
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:401
+#: src/titlescreen.c:408
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:402
+#: src/titlescreen.c:409
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:403
+#: src/titlescreen.c:410
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: src/titlescreen.c:571
+#: src/titlescreen.c:578
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:572
+#: src/titlescreen.c:579
msgid "Play Arcade Game"
msgstr ""
-#: src/titlescreen.c:573
+#: src/titlescreen.c:580
msgid "Play Custom Game"
msgstr ""
-#: src/titlescreen.c:574
+#: src/titlescreen.c:581
msgid "Help"
msgstr ""
-#: src/titlescreen.c:575
+#: src/titlescreen.c:582
msgid "More Options"
msgstr ""
-#: src/titlescreen.c:576
+#: src/titlescreen.c:583
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:644
+#: src/titlescreen.c:651
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:645
+#: src/titlescreen.c:652
msgid "Scout"
msgstr ""
-#: src/titlescreen.c:646
+#: src/titlescreen.c:653
msgid "Ranger"
msgstr ""
-#: src/titlescreen.c:647
+#: src/titlescreen.c:654
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:648
+#: src/titlescreen.c:655
msgid "Hall Of Fame"
msgstr ""
-#: src/titlescreen.c:649
+#: src/titlescreen.c:656
msgid "Main menu"
msgstr ""
-#: src/titlescreen.c:723
+#: src/titlescreen.c:735
msgid "Edit 'options' file in your home directory"
msgstr ""
-#: src/titlescreen.c:724
+#: src/titlescreen.c:736
msgid "to create customized game!"
msgstr ""
-#: src/titlescreen.c:725
+#: src/titlescreen.c:737
msgid "Press a key or click your mouse to start game."
msgstr ""
-#: src/titlescreen.c:726
+#: src/titlescreen.c:738
msgid "See README.txt for more information"
msgstr ""
-#: src/titlescreen.c:757
+#: src/titlescreen.c:769
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:758
+#: src/titlescreen.c:770
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:759
+#: src/titlescreen.c:771
msgid "Credits"
msgstr ""
-#: src/titlescreen.c:760
+#: src/titlescreen.c:772
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:804
+#: src/titlescreen.c:816
msgid "TuxMath is free and open-source!"
msgstr ""
-#: src/titlescreen.c:805
+#: src/titlescreen.c:817
msgid "You can help make it better by reporting problems,"
msgstr ""
-#: src/titlescreen.c:806
+#: src/titlescreen.c:818
msgid "suggesting improvements, or adding code."
msgstr ""
-#: src/titlescreen.c:807
+#: src/titlescreen.c:819
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/src/Makefile.in 2007-12-06 01:53:10 UTC (rev 354)
@@ -59,7 +59,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
Modified: tuxmath/trunk/src/tuxmath.c
===================================================================
--- tuxmath/trunk/src/tuxmath.c 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/src/tuxmath.c 2007-12-06 01:53:10 UTC (rev 354)
@@ -10,7 +10,7 @@
http://www.newbreedsoftware.com/
Part of "Tux4Kids" Project
- http://www.tux4kids.org/
+ http://www.tux4kids.com/
August 26, 2001 - August 28, 2001
@@ -27,22 +27,37 @@
#include "setup.h"
#include "titlescreen.h"
+#ifdef WIN32
+#define TUXLOCALE "./locale"
+#else
+#define TUXLOCALE LOCALEDIR
+#endif
+
int main(int argc, char * argv[])
{
#ifndef MACOSX
- setlocale(LC_ALL, "");
- bindtextdomain(PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
- textdomain(PACKAGE);
+ char *s1, *s2, *s3, *s4;
+ s1 = setlocale(LC_ALL, "");
+ s2 = bindtextdomain(PACKAGE, TUXLOCALE);
+ s3 = bind_textdomain_codeset(PACKAGE, "UTF-8");
+ s4 = textdomain(PACKAGE);
+
#ifdef TUXMATH_DEBUG
+ fprintf(stderr, "PACKAGE = %s\n", PACKAGE);
+ fprintf(stderr, "TUXLOCALE = %s\n", TUXLOCALE);
+ fprintf(stderr, "setlocale(LC_ALL, \"\") returned: %s\n", s1);
+ fprintf(stderr, "bindtextdomain(PACKAGE, TUXLOCALE) returned: %s\n", s2);
+ fprintf(stderr, "bind_textdomain_codeset(PACKAGE, \"UTF-8\") returned: %s\n", s3);
+ fprintf(stderr, "textdomain(PACKAGE) returned: %s\n", s4);
fprintf(stderr, "gettext(\"Help\"): %s\n\n", gettext("Help"));
+ fprintf(stderr, "After gettext() call\n");
#endif
#endif
+ atexit(cleanup); // register it so we clean up even if there is a crash
setup(argc, argv);
- atexit(cleanup); // register it so we clean up even if there is a crash
TitleScreen();
return 0;
}
Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h 2007-12-03 11:24:55 UTC (rev 353)
+++ tuxmath/trunk/src/tuxmath.h 2007-12-06 01:53:10 UTC (rev 354)
@@ -22,7 +22,7 @@
#ifndef TUXMATH_H
#define TUXMATH_H
-#include "config.h"
+#include <config.h>
// Translation stuff:
/* NLS not active on Mac yet: */
@@ -49,7 +49,6 @@
#include "SDL.h"
#include "SDL_ttf.h"
-#include "config.h"
#ifndef NOSOUND
#include "SDL_mixer.h"
More information about the Tux4kids-commits
mailing list