[Tux4kids-commits] r316 - in tuxmath/trunk: . data/images/sprites data/missions/lessons docs intl m4 po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Mon Nov 12 00:12:21 UTC 2007
Author: dbruce-guest
Date: 2007-11-12 00:12:20 +0000 (Mon, 12 Nov 2007)
New Revision: 316
Added:
tuxmath/trunk/data/missions/lessons/update-po.sh
Removed:
tuxmath/trunk/mkinstalldirs
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/config.guess
tuxmath/trunk/config.h.in
tuxmath/trunk/config.sub
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/data/missions/lessons/Makefile.am
tuxmath/trunk/data/missions/lessons/descr_lessons
tuxmath/trunk/depcomp
tuxmath/trunk/docs/changelog
tuxmath/trunk/install-sh
tuxmath/trunk/intl/ChangeLog
tuxmath/trunk/intl/VERSION
tuxmath/trunk/intl/localename.c
tuxmath/trunk/m4/gettext.m4
tuxmath/trunk/po/LINGUAS
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/src/Makefile.am
tuxmath/trunk/src/Makefile.in
tuxmath/trunk/src/SDL_extras.c
tuxmath/trunk/src/fileops.c
tuxmath/trunk/src/fileops.h
tuxmath/trunk/src/setup.c
tuxmath/trunk/src/titlescreen.c
tuxmath/trunk/src/tuxmath.c
tuxmath/trunk/src/tuxmath.h
Log:
Fix of critical bug that prevented gettext from working since recent gettext overhaul began.
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/Makefile.am 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,16 +1,23 @@
-MAKENSIS=@NSIS@
-
-SUBDIRS = po \
+## Top-level Makefile.am for tuxmath:
+## Process with Automake to create Makefile.in
+SUBDIRS = docs \
intl \
+ po \
src \
- data \
- docs
+ data
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = config.rpath m4/ChangeLog
+datadir = @datadir@
+localedir = $(datadir)/locale
+
+
+
+MAKENSIS=@NSIS@
NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
NSI_DLL_DIR=@NSI_DLL_DIR@
NSI_TUXMATH_CONF_DIR=@NSI_TUXMATH_CONF_DIR@
-##datadir = @datadir@
-##localedir = $(datadir)/locale
## Bundle in fonts for distribution tar.gz to be used without package manager:
@@ -54,9 +61,6 @@
if test -d $(NSI_INSTALL_DIR); then \
rm -fr $(NSI_INSTALL_DIR); \
fi
-# -rm tuxmath- at VERSION@-win32-installer.exe
+ -rm tuxmath- at VERSION@-win32-installer.exe
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = config.rpath m4/ChangeLog
Modified: tuxmath/trunk/config.guess
===================================================================
--- tuxmath/trunk/config.guess 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/config.guess 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2005-08-03'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -160,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -206,8 +208,11 @@
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -325,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -764,12 +769,19 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -779,9 +791,15 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -817,6 +835,9 @@
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -851,7 +872,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,7 +895,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
@@ -919,9 +948,15 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -964,7 +999,7 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
@@ -974,7 +1009,11 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1176,6 +1215,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1185,7 +1233,6 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1311,9 @@
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Modified: tuxmath/trunk/config.h.in
===================================================================
--- tuxmath/trunk/config.h.in 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/config.h.in 2007-11-12 00:12:20 UTC (rev 316)
@@ -289,7 +289,7 @@
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
#undef PRI_MACROS_BROKEN
-/* Name of the Program */
+/* Tux Of Math Command */
#undef PROGRAM_NAME
/* Define if the pthread_in_use() detection is hard. */
Modified: tuxmath/trunk/config.sub
===================================================================
--- tuxmath/trunk/config.sub 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/config.sub 2007-11-12 00:12:20 UTC (rev 316)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,6 +276,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -323,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -367,7 +368,7 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -474,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -682,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -909,6 +914,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -920,6 +929,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1214,7 +1226,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1366,6 +1378,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
@@ -1406,6 +1421,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/configure 2007-11-12 00:12:20 UTC (rev 316)
@@ -578,6 +578,7 @@
PACKAGE_STRING='Tux Of Math Command 1.5.7'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
+ac_unique_file="src/tuxmath.c"
gt_needs=
# Factoring default headers for most tests.
ac_includes_default="\
@@ -1828,7 +1829,8 @@
-#AC_PREREQ(2.61)
+
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -3627,6 +3629,7 @@
+
{ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
# Check whether --enable-nls was given.
@@ -11346,12 +11349,12 @@
if test $gt_api_version -ge 3; then
- gt_revision_test_code='
+ gt_revision_test_code='[
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
+]'
else
gt_revision_test_code=
fi
@@ -12098,7 +12101,6 @@
-
SDL_VERSION=1.2.0
@@ -13803,7 +13805,7 @@
-ac_config_files="$ac_config_files po/Makefile.in intl/Makefile Makefile data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/icons/Makefile data/images/igloos/Makefile data/images/penguins/Makefile data/images/sprites/Makefile data/images/status/Makefile data/images/title/Makefile data/images/tux/Makefile data/missions/Makefile data/missions/arcade/Makefile data/missions/lessons/Makefile data/sounds/Makefile docs/Makefile nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi src/Makefile po/Makefile"
+ac_config_files="$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/icons/Makefile data/images/igloos/Makefile data/images/penguins/Makefile data/images/sprites/Makefile data/images/status/Makefile data/images/title/Makefile data/images/tux/Makefile data/missions/Makefile data/missions/arcade/Makefile data/missions/lessons/Makefile data/sounds/Makefile docs/Makefile nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi src/Makefile intl/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
@@ -14421,8 +14423,6 @@
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES data/fonts/Makefile" ;;
@@ -14445,7 +14445,8 @@
"nsis/tuxmath.nsi") CONFIG_FILES="$CONFIG_FILES nsis/tuxmath.nsi" ;;
"nsis/tuxmath_with_conf.nsi") CONFIG_FILES="$CONFIG_FILES nsis/tuxmath_with_conf.nsi" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+ "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/configure.ac 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,8 +1,9 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_INIT([Tux Of Math Command],[1.5.7],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_CONFIG_SRCDIR([src/tuxmath.c])
-#AC_PREREQ(2.61)
+AC_PREREQ(2.61)
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
AC_CANONICAL_TARGET
@@ -12,7 +13,7 @@
NAME_VERSION=$PACKAGE-$VERSION
-AC_DEFINE_UNQUOTED([PROGRAM_NAME], "$PACKAGE", [Name of the Program])
+AC_DEFINE_UNQUOTED([PROGRAM_NAME], "$PACKAGE", [Tux Of Math Command])
AC_SUBST(NAME_VERSION)
@@ -22,10 +23,10 @@
# Needed for gettext:
AC_GNU_SOURCE
+AM_GNU_GETTEXT_VERSION([0.16])
AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION
+AM_GNU_GETTEXT_INTL_SUBDIR
-
dnl Check for SDL
SDL_VERSION=1.2.0
@@ -138,8 +139,6 @@
AC_PATH_PROG(NSIS, makensis, no, [$PATH])
AC_CONFIG_FILES([
-po/Makefile.in
-intl/Makefile
Makefile
data/Makefile
data/fonts/Makefile
@@ -162,7 +161,8 @@
nsis/tuxmath.nsi
nsis/tuxmath_with_conf.nsi
src/Makefile
-po/Makefile
+intl/Makefile
+po/Makefile.in
])
AC_OUTPUT
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2007-11-12 00:12:20 UTC (rev 316)
@@ -39,7 +39,8 @@
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
+ $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
@@ -53,7 +54,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 =
SOURCES =
Modified: tuxmath/trunk/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.am 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/data/missions/lessons/Makefile.am 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,8 +1,10 @@
## Makefile.am for tuxmath - data/missions/lessons:
## Process with Automake to create Makefile.in
-EXTRA_DIST = descr_lessons \
- lesson00 \
+
+
+
+data_LESSONS = lesson00 \
lesson01 \
lesson02 \
lesson03 \
@@ -59,6 +61,18 @@
lesson53 \
lesson54
+EXTRA_DIST = $(data_LESSONS) \
+ descr_lessons \
+ update-po.sh
+
+all: descr_lessons
+
+# Create a 'source' file holding all the descriptions for the missions.
+# FIXME this could be made less fragile
+descr_lessons: $(data_LESSONS)
+ $(top_srcdir)/data/missions/lessons/update-po.sh
+
+
install-data-local:
$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
Modified: tuxmath/trunk/data/missions/lessons/descr_lessons
===================================================================
--- tuxmath/trunk/data/missions/lessons/descr_lessons 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/data/missions/lessons/descr_lessons 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,178 +1,13 @@
-#include "tuxmath.h"
-_(Number Typing)
-_(Addition: 1 to 3)
-_(Addition: 0 to 5)
-_(Addition: Sums To 10)
-_(Addition: Sums To 15)
-_(Addition: Sums To 20)
-_(Addition: Two Digit Numbers)
-_(Addition: Missing Numbers)
-_(Subtraction: 0 to 10)
-_(Subtraction: Two Digit Numbers)
-_(Addition and Subtraction Review)
-_(Multiplication: 0 to 3)
-_(Multiples of 2)
-_(Multiples of 3)
-_(Multiples of 4)
-_(Multiples of 5)
-_(Multiplication: 0 to 5)
-_(Multiples of 6)
-_(Multiples of 7)
-_(Multiplication: 0 to 7)
-_(Multiples of 8)
-_(Multiples of 9)
-_(Multiples of 10)
-_(Multiplication: 0 to 10)
-_(Multiples of 11 and 12)
-_(Multiplication: 0 to 12)
-_(Multiples of 13, 14, and 15)
-_(Multiplication: 0 to 15)
-_(Multiplication: Missing Numbers)
-_(Division by 2)
-_(Division by 3)
-_(Division by 4)
-_(Division by 5)
-_(Division: 1 to 5)
-_(Division by 6)
-_(Division by 7)
-_(Division by 8)
-_(Division by 9)
-_(Division by 10)
-_(Division: 1 to 10)
-_(Division by 11 and 12)
-_(Division: 1 to 12)
-_(Division by 13, 14 and 15)
-_(Division: 1 to 15)
-_(Multiplication/Division Super Review!)
-_(Typing Negative Numbers)
-_(Subtraction: Negative Answers)
-_(Adding Negatives To Positives)
-_(Subtracting Negatives From Positives)
-_(Adding Negatives To Negatives)
-_(Subtracting Negatives From Negatives)
-_(Neg/Pos Review)
-_(Multiplication And Division Of Negatives)
-_(Multiplication Of Positives And Negatives)
-_(Division Of Positives And Negatives)
-_(Number Typing)
-_(Addition: 1 to 3)
-_(Addition: 0 to 5)
-_(Addition: Sums To 10)
-_(Addition: Sums To 15)
-_(Addition: Sums To 20)
-_(Addition: Two Digit Numbers)
-_(Addition: Missing Numbers)
-_(Subtraction: 0 to 10)
-_(Subtraction: Two Digit Numbers)
-_(Addition and Subtraction Review)
-_(Multiplication: 0 to 3)
-_(Multiples of 2)
-_(Multiples of 3)
-_(Multiples of 4)
-_(Multiples of 5)
-_(Multiplication: 0 to 5)
-_(Multiples of 6)
-_(Multiples of 7)
-_(Multiplication: 0 to 7)
-_(Multiples of 8)
-_(Multiples of 9)
-_(Multiples of 10)
-_(Multiplication: 0 to 10)
-_(Multiples of 11 and 12)
-_(Multiplication: 0 to 12)
-_(Multiples of 13, 14, and 15)
-_(Multiplication: 0 to 15)
-_(Multiplication: Missing Numbers)
-_(Division by 2)
-_(Division by 3)
-_(Division by 4)
-_(Division by 5)
-_(Division: 1 to 5)
-_(Division by 6)
-_(Division by 7)
-_(Division by 8)
-_(Division by 9)
-_(Division by 10)
-_(Division: 1 to 10)
-_(Division by 11 and 12)
-_(Division: 1 to 12)
-_(Division by 13, 14 and 15)
-_(Division: 1 to 15)
-_(Multiplication/Division Super Review!)
-_(Typing Negative Numbers)
-_(Subtraction: Negative Answers)
-_(Adding Negatives To Positives)
-_(Subtracting Negatives From Positives)
-_(Adding Negatives To Negatives)
-_(Subtracting Negatives From Negatives)
-_(Neg/Pos Review)
-_(Multiplication And Division Of Negatives)
-_(Multiplication Of Positives And Negatives)
-_(Division Of Positives And Negatives)
_("Number Typing")
_("Addition: 1 to 3")
_("Addition: 0 to 5")
-_("Addition: Sums To 10")
-_("Addition: Sums To 15")
-_("Addition: Sums To 20")
-_("Addition: Two Digit Numbers")
-_("Addition: Missing Numbers")
-_("Subtraction: 0 to 10")
-_("Subtraction: Two Digit Numbers")
-_("Addition and Subtraction Review")
-_("Multiplication: 0 to 3")
-_("Multiples of 2")
-_("Multiples of 3")
-_("Multiples of 4")
-_("Multiples of 5")
-_("Multiplication: 0 to 5")
-_("Multiples of 6")
-_("Multiples of 7")
-_("Multiplication: 0 to 7")
-_("Multiples of 8")
-_("Multiples of 9")
-_("Multiples of 10")
-_("Multiplication: 0 to 10")
-_("Multiples of 11 and 12")
-_("Multiplication: 0 to 12")
-_("Multiples of 13, 14, and 15")
-_("Multiplication: 0 to 15")
-_("Multiplication: Missing Numbers")
-_("Division by 2")
-_("Division by 3")
-_("Division by 4")
-_("Division by 5")
-_("Division: 1 to 5")
-_("Division by 6")
-_("Division by 7")
-_("Division by 8")
-_("Division by 9")
-_("Division by 10")
-_("Division: 1 to 10")
-_("Division by 11 and 12")
-_("Division: 1 to 12")
-_("Division by 13, 14 and 15")
-_("Division: 1 to 15")
-_("Multiplication/Division Super Review!")
-_("Typing Negative Numbers")
-_("Subtraction: Negative Answers")
-_("Adding Negatives To Positives")
-_("Subtracting Negatives From Positives")
-_("Adding Negatives To Negatives")
-_("Subtracting Negatives From Negatives")
-_("Neg/Pos Review")
-_("Multiplication And Division Of Negatives")
-_("Multiplication Of Positives And Negatives")
-_("Division Of Positives And Negatives")
-_("Number Typing")
-_("Addition: 1 to 3")
-_("Addition: 0 to 5")
_("Addition: Sums to 10")
_("Addition: Sums to 15")
_("Addition: Sums to 20")
_("Addition: Two Digit Numbers")
_("Addition: Missing Numbers")
_("Subtraction: 0 to 10")
+_("Subtraction: 0 to 20")
_("Subtraction: Two Digit Numbers")
_("Addition and Subtraction Review")
_("Multiplication: 0 to 3")
@@ -181,64 +16,11 @@
_("Multiples of 4")
_("Multiples of 5")
_("Multiplication: 0 to 5")
-_("Multiples of 6")
-_("Multiples of 7")
-_("Multiplication: 0 to 7")
-_("Multiples of 8")
-_("Multiples of 9")
-_("Multiples of 10")
-_("Multiplication: 0 to 10")
-_("Multiples of 11 and 12")
-_("Multiplication: 0 to 12")
-_("Multiples of 13, 14, and 15")
-_("Multiplication: 0 to 15")
-_("Multiplication: Missing Numbers")
-_("Division by 2")
-_("Division by 3")
-_("Division by 4")
-_("Division by 5")
-_("Division: 1 to 5")
-_("Division by 6")
-_("Division by 7")
-_("Division by 8")
-_("Division by 9")
-_("Division by 10")
-_("Division: 1 to 10")
-_("Division by 11 and 12")
-_("Division: 1 to 12")
-_("Division by 13, 14, and 15")
-_("Division: 1 to 15")
-_("Multiplication and Division Review")
-_("Typing Negative Numbers")
-_("Subtraction: Negative Answers")
-_("Adding Negatives to Positives")
-_("Subtracting Negatives From Positives")
-_("Adding Negatives to Negatives")
-_("Subtracting Negatives From Negatives")
-_("Negative and Positive Numbers Review")
-_("Multiplication and Division of Negatives")
-_("Multiplication of Positives and Negatives")
-_("Division of Positives and Negatives")
-_("Number Typing")
-_("Addition: 1 to 3")
-_("Addition: 0 to 5")
-_("Addition: Sums to 10")
-_("Addition: Sums to 15")
-_("Addition: Sums to 20")
-_("Addition: Two Digit Numbers")
-_("Addition: Missing Numbers")
-_("Subtraction: 0 to 10")
-_("Subtraction: Two Digit Numbers")
-_("Addition and Subtraction Review")
-_("Multiplication: 0 to 3")
-_("Multiples of 2")
-_("Multiples of 3")
-_("Multiples of 4")
-_("Multiples of 5")
_("Multiplication: 0 to 5")
_("Multiples of 6")
_("Multiples of 7")
_("Multiplication: 0 to 7")
+_("Multiplication: 0 to 7")
_("Multiples of 8")
_("Multiples of 9")
_("Multiples of 10")
Added: tuxmath/trunk/data/missions/lessons/update-po.sh
===================================================================
--- tuxmath/trunk/data/missions/lessons/update-po.sh (rev 0)
+++ tuxmath/trunk/data/missions/lessons/update-po.sh 2007-11-12 00:12:20 UTC (rev 316)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Create a 'source' file holding all the descriptions for the missions.
+cd ../../../../trunk/data/missions/lessons
+rm -f ./descr_lessons
+for i in ./lesson*; do
+ head --lines=1 $i | sed 's/^# \(.*\)$/_("\1")/' >> descr_lessons;
+done;
+
+# Update the POT translation template file.
+#intltool-update --pot --gettext-package=tuxmath
+
+# Update all the PO translation files.
+#for i in *.po ; do
+# echo $i
+# msgmerge $i tuxmath.pot > temp.tmp && mv -f temp.tmp $i
+#done
+
Property changes on: tuxmath/trunk/data/missions/lessons/update-po.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: tuxmath/trunk/depcomp
===================================================================
--- tuxmath/trunk/depcomp 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/depcomp 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -91,7 +92,20 @@
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -276,6 +290,46 @@
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
+ # static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
+ # compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/docs/changelog 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,3 +1,15 @@
+
+2007.Nov.11 (svn.debian.org/tux4kids - revision 316)
+
+ Build:
+ * Gettext again works properly, AFAICT (was broken in 1.5.6 and 1.5.7). The intl
+ directory is now included in preparation of trying to get gettext working on
+ Windows - nothing done on that yet. I think we can start adding as many po
+ files as we can get.
+ * Some more removal of dead code and unused variables.
+
+ David Bruce <dbruce at tampabay.rr.com>
+
2007.Oct.30 (svn.debian.org/tux4kids - revision 311)
Code:
Modified: tuxmath/trunk/install-sh
===================================================================
--- tuxmath/trunk/install-sh 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/install-sh 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,7 +1,8 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-#
+
+scriptversion=2006-10-14.15
+
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
@@ -38,18 +39,25 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
@@ -59,211 +67,441 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
+chowncmd=
+chgrpcmd=
+stripcmd=
rmcmd="$rmprog -f"
mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
- -d) dir_arg=true
- shift
- continue;;
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
+Options:
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
- -s) stripcmd="$stripprog"
- shift
- continue;;
+ -d) dir_arg=true
+ shift
+ continue;;
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
+ --help) echo "$usage"; exit $?;;
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
+ -m) mode=$2
+ shift
+ shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
+
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
+
+ -T) no_target_directory=true
+ shift
+ continue;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+ --) shift
+ break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
+ esac
done
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-else
- true
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
fi
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=mkdir
- fi
-else
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call `install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
+fi
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
- if [ -f $src -o -d $src ]
- then
- true
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- true
- fi
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- true
- fi
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
fi
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+for src
+do
+ # Protect names starting with `-'.
+ case $src in
+ -*) src=./$src ;;
+ esac
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
-IFS="${IFS-${defaultIFS}}"
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+ if test -z "$dstarg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
-pathcomp=''
+ dst=$dstarg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst ;;
+ esac
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
else
- true
+ mkdir_mode=
fi
- pathcomp="${pathcomp}/"
-done
-fi
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
-# If we're going to rename the final executable, determine the name now.
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
-# don't allow the sed command to completely eliminate the filename
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
+ shift
+ $posix_glob && set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
else
- true
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
fi
+ prefix=$prefix/
+ done
-# Make a temp file name in the proper directory.
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
- dsttmp=$dstdir/#inst.$$#
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
-# Move or copy the file name to the temp name
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
- $doit $instcmd $src $dsttmp &&
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap "rm -f ${dsttmp}" 0 &&
+ # Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-# and set any options; do chmod last to preserve setuid bits
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
-# Now rename the file to the real destination.
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ } || exit 1
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
+ trap '' 0
+ fi
+done
-fi &&
-
-
-exit 0
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Modified: tuxmath/trunk/intl/ChangeLog
===================================================================
--- tuxmath/trunk/intl/ChangeLog 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/intl/ChangeLog 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,4 +1,4 @@
-2006-11-27 GNU <bug-gnu-gettext at gnu.org>
+2006-10-26 GNU <bug-gnu-gettext at gnu.org>
- * Version 0.16.1 released.
+ * Version 0.16 released.
Modified: tuxmath/trunk/intl/VERSION
===================================================================
--- tuxmath/trunk/intl/VERSION 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/intl/VERSION 2007-11-12 00:12:20 UTC (rev 316)
@@ -1 +1 @@
-GNU gettext library from gettext-0.16.1
+GNU gettext library from gettext-0.16
Modified: tuxmath/trunk/intl/localename.c
===================================================================
--- tuxmath/trunk/intl/localename.c 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/intl/localename.c 2007-11-12 00:12:20 UTC (rev 316)
@@ -1142,7 +1142,7 @@
switch (sub)
{
case SUBLANG_BENGALI_INDIA: return "bn_IN";
-// case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+ case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
}
return "bn";
case LANG_BULGARIAN: return "bg_BG";
@@ -1356,7 +1356,7 @@
switch (sub)
{
case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
-// case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+ case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
}
return "pa";
case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1364,7 +1364,7 @@
switch (sub)
{
case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
-// case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+ case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
}
return "ro";
case LANG_RUSSIAN:
Modified: tuxmath/trunk/m4/gettext.m4
===================================================================
--- tuxmath/trunk/m4/gettext.m4 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/m4/gettext.m4 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,4 +1,4 @@
-# gettext.m4 serial 59 (gettext-0.16.1)
+# gettext.m4 serial 58 (gettext-0.16)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -137,14 +137,12 @@
dnl to fall back to GNU NLS library.
if test $gt_api_version -ge 3; then
- gt_revision_test_code='
+ gt_revision_test_code='[[
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
-changequote(,)dnl
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
+]]'
else
gt_revision_test_code=
fi
Deleted: tuxmath/trunk/mkinstalldirs
===================================================================
--- tuxmath/trunk/mkinstalldirs 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/mkinstalldirs 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-
-errstatus=0
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
Modified: tuxmath/trunk/po/LINGUAS
===================================================================
--- tuxmath/trunk/po/LINGUAS 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/po/LINGUAS 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,3 +1,5 @@
# Set of available languages.
nn
nb
+en at quot
+en at boldquot
Modified: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/po/nb.po 2007-11-12 00:12:20 UTC (rev 316)
@@ -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-06 12:56-0500\n"
+"POT-Creation-Date: 2007-11-12 00:06+0000\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"
@@ -131,368 +131,265 @@
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: data/missions/lessons/descr_lessons:112
-#: data/missions/lessons/descr_lessons:167
-#: data/missions/lessons/descr_lessons:222
+#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Tallskriving"
-#: data/missions/lessons/descr_lessons:113
-#: data/missions/lessons/descr_lessons:168
-#: data/missions/lessons/descr_lessons:223
+#: data/missions/lessons/descr_lessons:2
msgid "Addition: 1 to 3"
msgstr "Addisjon: 1 til 3"
-#: data/missions/lessons/descr_lessons:114
-#: data/missions/lessons/descr_lessons:169
-#: data/missions/lessons/descr_lessons:224
+#: data/missions/lessons/descr_lessons:3
msgid "Addition: 0 to 5"
msgstr "Addisjon: 0 til 5"
-#: data/missions/lessons/descr_lessons:115
-msgid "Addition: Sums To 10"
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
msgstr "Addisjon: Summer til 10"
-#: data/missions/lessons/descr_lessons:116
-msgid "Addition: Sums To 15"
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
msgstr "Addisjon: Summer til 15"
-#: data/missions/lessons/descr_lessons:117
-msgid "Addition: Sums To 20"
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
msgstr "Addisjon: Summer til 20"
-#: data/missions/lessons/descr_lessons:118
-#: data/missions/lessons/descr_lessons:173
-#: data/missions/lessons/descr_lessons:228
+#: data/missions/lessons/descr_lessons:7
msgid "Addition: Two Digit Numbers"
msgstr "Addisjon: Tosifrede tall"
-#: data/missions/lessons/descr_lessons:119
-#: data/missions/lessons/descr_lessons:174
-#: data/missions/lessons/descr_lessons:229
+#: data/missions/lessons/descr_lessons:8
msgid "Addition: Missing Numbers"
msgstr "Addisjon: Manglende tall"
-#: data/missions/lessons/descr_lessons:120
-#: data/missions/lessons/descr_lessons:175
-#: data/missions/lessons/descr_lessons:230
+#: data/missions/lessons/descr_lessons:9
msgid "Subtraction: 0 to 10"
msgstr "Subtraksjon: 0 til 10"
-#: data/missions/lessons/descr_lessons:121
-#: data/missions/lessons/descr_lessons:176
-#: data/missions/lessons/descr_lessons:231
+#: data/missions/lessons/descr_lessons:10
+#, fuzzy
+msgid "Subtraction: 0 to 20"
+msgstr "Subtraksjon: 0 til 10"
+
+#: data/missions/lessons/descr_lessons:11
msgid "Subtraction: Two Digit Numbers"
msgstr "Subtraksjon: Tosifrede tall"
-#: data/missions/lessons/descr_lessons:122
-#: data/missions/lessons/descr_lessons:177
-#: data/missions/lessons/descr_lessons:232
+#: data/missions/lessons/descr_lessons:12
msgid "Addition and Subtraction Review"
msgstr "Gjennomgang: Addisjon og subtraksjon"
-#: data/missions/lessons/descr_lessons:123
-#: data/missions/lessons/descr_lessons:178
-#: data/missions/lessons/descr_lessons:233
+#: data/missions/lessons/descr_lessons:13
msgid "Multiplication: 0 to 3"
msgstr "Multiplikasjon: 0 til 3"
-#: data/missions/lessons/descr_lessons:124
-#: data/missions/lessons/descr_lessons:179
-#: data/missions/lessons/descr_lessons:234
+#: data/missions/lessons/descr_lessons:14
msgid "Multiples of 2"
msgstr "Multiplum av 2"
-#: data/missions/lessons/descr_lessons:125
-#: data/missions/lessons/descr_lessons:180
-#: data/missions/lessons/descr_lessons:235
+#: data/missions/lessons/descr_lessons:15
msgid "Multiples of 3"
msgstr "Multiplum av 3"
-#: data/missions/lessons/descr_lessons:126
-#: data/missions/lessons/descr_lessons:181
-#: data/missions/lessons/descr_lessons:236
+#: data/missions/lessons/descr_lessons:16
msgid "Multiples of 4"
msgstr "Multiplum av 4"
-#: data/missions/lessons/descr_lessons:127
-#: data/missions/lessons/descr_lessons:182
-#: data/missions/lessons/descr_lessons:237
+#: data/missions/lessons/descr_lessons:17
msgid "Multiples of 5"
msgstr "Multiplum av 5"
-#: data/missions/lessons/descr_lessons:128
-#: data/missions/lessons/descr_lessons:183
-#: data/missions/lessons/descr_lessons:238
+#: data/missions/lessons/descr_lessons:18
+#: data/missions/lessons/descr_lessons:19
msgid "Multiplication: 0 to 5"
msgstr "Multiplikasjon: 0 til 5"
-#: data/missions/lessons/descr_lessons:129
-#: data/missions/lessons/descr_lessons:184
-#: data/missions/lessons/descr_lessons:239
+#: data/missions/lessons/descr_lessons:20
msgid "Multiples of 6"
msgstr "Multiplum av 6"
-#: data/missions/lessons/descr_lessons:130
-#: data/missions/lessons/descr_lessons:185
-#: data/missions/lessons/descr_lessons:240
+#: data/missions/lessons/descr_lessons:21
msgid "Multiples of 7"
msgstr "Multiplum av 7"
-#: data/missions/lessons/descr_lessons:131
-#: data/missions/lessons/descr_lessons:186
-#: data/missions/lessons/descr_lessons:241
+#: data/missions/lessons/descr_lessons:22
+#: data/missions/lessons/descr_lessons:23
msgid "Multiplication: 0 to 7"
msgstr "Multiplikasjon: 0 til 7"
-#: data/missions/lessons/descr_lessons:132
-#: data/missions/lessons/descr_lessons:187
-#: data/missions/lessons/descr_lessons:242
+#: data/missions/lessons/descr_lessons:24
msgid "Multiples of 8"
msgstr "Multiplum av 8"
-#: data/missions/lessons/descr_lessons:133
-#: data/missions/lessons/descr_lessons:188
-#: data/missions/lessons/descr_lessons:243
+#: data/missions/lessons/descr_lessons:25
msgid "Multiples of 9"
msgstr "Multiplum av 9"
-#: data/missions/lessons/descr_lessons:134
-#: data/missions/lessons/descr_lessons:189
-#: data/missions/lessons/descr_lessons:244
+#: data/missions/lessons/descr_lessons:26
msgid "Multiples of 10"
msgstr "Multiplum av 10"
-#: data/missions/lessons/descr_lessons:135
-#: data/missions/lessons/descr_lessons:190
-#: data/missions/lessons/descr_lessons:245
+#: data/missions/lessons/descr_lessons:27
msgid "Multiplication: 0 to 10"
msgstr "Multiplikasjon: 0 til 10"
-#: data/missions/lessons/descr_lessons:136
-#: data/missions/lessons/descr_lessons:191
-#: data/missions/lessons/descr_lessons:246
+#: data/missions/lessons/descr_lessons:28
msgid "Multiples of 11 and 12"
msgstr "Multiplum av 11 og 12"
-#: data/missions/lessons/descr_lessons:137
-#: data/missions/lessons/descr_lessons:192
-#: data/missions/lessons/descr_lessons:247
+#: data/missions/lessons/descr_lessons:29
msgid "Multiplication: 0 to 12"
msgstr "Multiplikasjon: 0 til 12"
-#: data/missions/lessons/descr_lessons:138
-#: data/missions/lessons/descr_lessons:193
-#: data/missions/lessons/descr_lessons:248
+#: data/missions/lessons/descr_lessons:30
msgid "Multiples of 13, 14, and 15"
msgstr "Multiplum av 13, 14 og 15"
-#: data/missions/lessons/descr_lessons:139
-#: data/missions/lessons/descr_lessons:194
-#: data/missions/lessons/descr_lessons:249
+#: data/missions/lessons/descr_lessons:31
msgid "Multiplication: 0 to 15"
msgstr "Multiplikasjon: 0 til 15"
-#: data/missions/lessons/descr_lessons:140
-#: data/missions/lessons/descr_lessons:195
-#: data/missions/lessons/descr_lessons:250
+#: data/missions/lessons/descr_lessons:32
msgid "Multiplication: Missing Numbers"
msgstr "Multiplikasjon: Manglende tall"
-#: data/missions/lessons/descr_lessons:141
-#: data/missions/lessons/descr_lessons:196
-#: data/missions/lessons/descr_lessons:251
+#: data/missions/lessons/descr_lessons:33
msgid "Division by 2"
msgstr "Divisjon med 2"
-#: data/missions/lessons/descr_lessons:142
-#: data/missions/lessons/descr_lessons:197
-#: data/missions/lessons/descr_lessons:252
+#: data/missions/lessons/descr_lessons:34
msgid "Division by 3"
msgstr "Divisjon med 3"
-#: data/missions/lessons/descr_lessons:143
-#: data/missions/lessons/descr_lessons:198
-#: data/missions/lessons/descr_lessons:253
+#: data/missions/lessons/descr_lessons:35
msgid "Division by 4"
msgstr "Divisjon med 4"
-#: data/missions/lessons/descr_lessons:144
-#: data/missions/lessons/descr_lessons:199
-#: data/missions/lessons/descr_lessons:254
+#: data/missions/lessons/descr_lessons:36
msgid "Division by 5"
msgstr "Divisjon med 5"
-#: data/missions/lessons/descr_lessons:145
-#: data/missions/lessons/descr_lessons:200
-#: data/missions/lessons/descr_lessons:255
+#: data/missions/lessons/descr_lessons:37
msgid "Division: 1 to 5"
msgstr "Divisjon: 1 til 5"
-#: data/missions/lessons/descr_lessons:146
-#: data/missions/lessons/descr_lessons:201
-#: data/missions/lessons/descr_lessons:256
+#: data/missions/lessons/descr_lessons:38
msgid "Division by 6"
msgstr "Divisjon med 6"
-#: data/missions/lessons/descr_lessons:147
-#: data/missions/lessons/descr_lessons:202
-#: data/missions/lessons/descr_lessons:257
+#: data/missions/lessons/descr_lessons:39
msgid "Division by 7"
msgstr "Divisjon med 7"
-#: data/missions/lessons/descr_lessons:148
-#: data/missions/lessons/descr_lessons:203
-#: data/missions/lessons/descr_lessons:258
+#: data/missions/lessons/descr_lessons:40
msgid "Division by 8"
msgstr "Divisjon med 8"
-#: data/missions/lessons/descr_lessons:149
-#: data/missions/lessons/descr_lessons:204
-#: data/missions/lessons/descr_lessons:259
+#: data/missions/lessons/descr_lessons:41
msgid "Division by 9"
msgstr "Divisjon med 9"
-#: data/missions/lessons/descr_lessons:150
-#: data/missions/lessons/descr_lessons:205
-#: data/missions/lessons/descr_lessons:260
+#: data/missions/lessons/descr_lessons:42
msgid "Division by 10"
msgstr "Divisjon med 10"
-#: data/missions/lessons/descr_lessons:151
-#: data/missions/lessons/descr_lessons:206
-#: data/missions/lessons/descr_lessons:261
+#: data/missions/lessons/descr_lessons:43
msgid "Division: 1 to 10"
msgstr "Divisjon: 1 til 10"
-#: data/missions/lessons/descr_lessons:152
-#: data/missions/lessons/descr_lessons:207
-#: data/missions/lessons/descr_lessons:262
+#: data/missions/lessons/descr_lessons:44
msgid "Division by 11 and 12"
msgstr "Divisjon med 11 og 12"
-#: data/missions/lessons/descr_lessons:153
-#: data/missions/lessons/descr_lessons:208
-#: data/missions/lessons/descr_lessons:263
+#: data/missions/lessons/descr_lessons:45
msgid "Division: 1 to 12"
msgstr "Divisjon: 1 til 12"
-#: data/missions/lessons/descr_lessons:154
-msgid "Division by 13, 14 and 15"
+#: data/missions/lessons/descr_lessons:46
+msgid "Division by 13, 14, and 15"
msgstr "Divisjon med 13, 14 og 15"
-#: data/missions/lessons/descr_lessons:155
-#: data/missions/lessons/descr_lessons:210
-#: data/missions/lessons/descr_lessons:265
+#: data/missions/lessons/descr_lessons:47
msgid "Division: 1 to 15"
msgstr "Divisjon: 1 til 15"
-#: data/missions/lessons/descr_lessons:156
-msgid "Multiplication/Division Super Review!"
+#: data/missions/lessons/descr_lessons:48
+msgid "Multiplication and Division Review"
msgstr "Gjennomgang: Multiplikasjon og divisjon"
-#: data/missions/lessons/descr_lessons:157
-#: data/missions/lessons/descr_lessons:212
-#: data/missions/lessons/descr_lessons:267
+#: data/missions/lessons/descr_lessons:49
msgid "Typing Negative Numbers"
msgstr "Negative tall"
-#: data/missions/lessons/descr_lessons:158
-#: data/missions/lessons/descr_lessons:213
-#: data/missions/lessons/descr_lessons:268
+#: data/missions/lessons/descr_lessons:50
msgid "Subtraction: Negative Answers"
msgstr "Subtraksjon: Negative svar"
-#: data/missions/lessons/descr_lessons:159
-msgid "Adding Negatives To Positives"
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Positives"
msgstr "Addisjon av negative til positive tall"
-#: data/missions/lessons/descr_lessons:160
-#: data/missions/lessons/descr_lessons:215
-#: data/missions/lessons/descr_lessons:270
+#: data/missions/lessons/descr_lessons:52
msgid "Subtracting Negatives From Positives"
msgstr "Subtraksjon av negative fra positive tall"
-#: data/missions/lessons/descr_lessons:161
-msgid "Adding Negatives To Negatives"
+#: data/missions/lessons/descr_lessons:53
+msgid "Adding Negatives to Negatives"
msgstr "Addisjon av negative til negative tall"
-#: data/missions/lessons/descr_lessons:162
-#: data/missions/lessons/descr_lessons:217
-#: data/missions/lessons/descr_lessons:272
+#: data/missions/lessons/descr_lessons:54
msgid "Subtracting Negatives From Negatives"
msgstr "Subtraksjon av negative fra negative tall"
-#: data/missions/lessons/descr_lessons:163
-msgid "Neg/Pos Review"
+#: data/missions/lessons/descr_lessons:55
+msgid "Negative and Positive Numbers Review"
msgstr "Gjennomgang: Negative og positive tall"
-#: data/missions/lessons/descr_lessons:164
-msgid "Multiplication And Division Of Negatives"
+#: data/missions/lessons/descr_lessons:56
+msgid "Multiplication and Division of Negatives"
msgstr "Multiplikasjon og divisjon av negative tall"
-#: data/missions/lessons/descr_lessons:165
-msgid "Multiplication Of Positives And Negatives"
+#: data/missions/lessons/descr_lessons:57
+msgid "Multiplication of Positives and Negatives"
msgstr "Multiplikasjon av positive og negative tall"
-#: data/missions/lessons/descr_lessons:166
-msgid "Division Of Positives And Negatives"
+#: data/missions/lessons/descr_lessons:58
+msgid "Division of Positives and Negatives"
msgstr "Divisjon av positive og negative tall"
-#: data/missions/lessons/descr_lessons:170
-#: data/missions/lessons/descr_lessons:225
-msgid "Addition: Sums to 10"
-msgstr "Addisjon: Summer til 10"
+#~ msgid "Addition: Sums To 10"
+#~ msgstr "Addisjon: Summer til 10"
-#: data/missions/lessons/descr_lessons:171
-#: data/missions/lessons/descr_lessons:226
-msgid "Addition: Sums to 15"
-msgstr "Addisjon: Summer til 15"
+#~ msgid "Addition: Sums To 15"
+#~ msgstr "Addisjon: Summer til 15"
-#: data/missions/lessons/descr_lessons:172
-#: data/missions/lessons/descr_lessons:227
-msgid "Addition: Sums to 20"
-msgstr "Addisjon: Summer til 20"
+#~ msgid "Addition: Sums To 20"
+#~ msgstr "Addisjon: Summer til 20"
-#: data/missions/lessons/descr_lessons:209
-#: data/missions/lessons/descr_lessons:264
-msgid "Division by 13, 14, and 15"
-msgstr "Divisjon med 13, 14 og 15"
+#~ msgid "Division by 13, 14 and 15"
+#~ msgstr "Divisjon med 13, 14 og 15"
-#: data/missions/lessons/descr_lessons:211
-#: data/missions/lessons/descr_lessons:266
-msgid "Multiplication and Division Review"
-msgstr "Gjennomgang: Multiplikasjon og divisjon"
+#~ msgid "Multiplication/Division Super Review!"
+#~ msgstr "Gjennomgang: Multiplikasjon og divisjon"
-#: data/missions/lessons/descr_lessons:214
-#: data/missions/lessons/descr_lessons:269
-msgid "Adding Negatives to Positives"
-msgstr "Addisjon av negative til positive tall"
+#~ msgid "Adding Negatives To Positives"
+#~ msgstr "Addisjon av negative til positive tall"
-#: data/missions/lessons/descr_lessons:216
-#: data/missions/lessons/descr_lessons:271
-msgid "Adding Negatives to Negatives"
-msgstr "Addisjon av negative til negative tall"
+#~ msgid "Adding Negatives To Negatives"
+#~ msgstr "Addisjon av negative til negative tall"
-#: data/missions/lessons/descr_lessons:218
-#: data/missions/lessons/descr_lessons:273
-msgid "Negative and Positive Numbers Review"
-msgstr "Gjennomgang: Negative og positive tall"
+#~ msgid "Neg/Pos Review"
+#~ msgstr "Gjennomgang: Negative og positive tall"
-#: data/missions/lessons/descr_lessons:219
-#: data/missions/lessons/descr_lessons:274
-msgid "Multiplication and Division of Negatives"
-msgstr "Multiplikasjon og divisjon av negative tall"
+#~ msgid "Multiplication And Division Of Negatives"
+#~ msgstr "Multiplikasjon og divisjon av negative tall"
-#: data/missions/lessons/descr_lessons:220
-#: data/missions/lessons/descr_lessons:275
-msgid "Multiplication of Positives and Negatives"
-msgstr "Multiplikasjon av positive og negative tall"
+#~ msgid "Multiplication Of Positives And Negatives"
+#~ msgstr "Multiplikasjon av positive og negative tall"
-#: data/missions/lessons/descr_lessons:221
-#: data/missions/lessons/descr_lessons:276
-msgid "Division of Positives and Negatives"
-msgstr "Divisjon av positive og negative tall"
+#~ msgid "Division Of Positives And Negatives"
+#~ msgstr "Divisjon av positive og negative tall"
#~ msgid "Sound Effects Volume"
#~ msgstr "Lydeffekter"
Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/po/nn.po 2007-11-12 00:12:20 UTC (rev 316)
@@ -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-06 12:56-0500\n"
+"POT-Creation-Date: 2007-11-12 00:06+0000\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"
@@ -131,368 +131,265 @@
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: data/missions/lessons/descr_lessons:112
-#: data/missions/lessons/descr_lessons:167
-#: data/missions/lessons/descr_lessons:222
+#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr "Talskriving"
-#: data/missions/lessons/descr_lessons:113
-#: data/missions/lessons/descr_lessons:168
-#: data/missions/lessons/descr_lessons:223
+#: data/missions/lessons/descr_lessons:2
msgid "Addition: 1 to 3"
msgstr "Addisjon: 1 til 3"
-#: data/missions/lessons/descr_lessons:114
-#: data/missions/lessons/descr_lessons:169
-#: data/missions/lessons/descr_lessons:224
+#: data/missions/lessons/descr_lessons:3
msgid "Addition: 0 to 5"
msgstr "Addisjon: 0 til 5"
-#: data/missions/lessons/descr_lessons:115
-msgid "Addition: Sums To 10"
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
msgstr "Addisjon: Summar til 10"
-#: data/missions/lessons/descr_lessons:116
-msgid "Addition: Sums To 15"
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
msgstr "Addisjon: Summar til 15"
-#: data/missions/lessons/descr_lessons:117
-msgid "Addition: Sums To 20"
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
msgstr "Addisjon: Summar til 20"
-#: data/missions/lessons/descr_lessons:118
-#: data/missions/lessons/descr_lessons:173
-#: data/missions/lessons/descr_lessons:228
+#: data/missions/lessons/descr_lessons:7
msgid "Addition: Two Digit Numbers"
msgstr "Addisjon: Tosifra tal"
-#: data/missions/lessons/descr_lessons:119
-#: data/missions/lessons/descr_lessons:174
-#: data/missions/lessons/descr_lessons:229
+#: data/missions/lessons/descr_lessons:8
msgid "Addition: Missing Numbers"
msgstr "Addisjon: Manglande tal"
-#: data/missions/lessons/descr_lessons:120
-#: data/missions/lessons/descr_lessons:175
-#: data/missions/lessons/descr_lessons:230
+#: data/missions/lessons/descr_lessons:9
msgid "Subtraction: 0 to 10"
msgstr "Subtraksjon: 0 til 10"
-#: data/missions/lessons/descr_lessons:121
-#: data/missions/lessons/descr_lessons:176
-#: data/missions/lessons/descr_lessons:231
+#: data/missions/lessons/descr_lessons:10
+#, fuzzy
+msgid "Subtraction: 0 to 20"
+msgstr "Subtraksjon: 0 til 10"
+
+#: data/missions/lessons/descr_lessons:11
msgid "Subtraction: Two Digit Numbers"
msgstr "Subtraksjon: Tosifra tal"
-#: data/missions/lessons/descr_lessons:122
-#: data/missions/lessons/descr_lessons:177
-#: data/missions/lessons/descr_lessons:232
+#: data/missions/lessons/descr_lessons:12
msgid "Addition and Subtraction Review"
msgstr "Gjennomgang: Addisjon og subtraksjon"
-#: data/missions/lessons/descr_lessons:123
-#: data/missions/lessons/descr_lessons:178
-#: data/missions/lessons/descr_lessons:233
+#: data/missions/lessons/descr_lessons:13
msgid "Multiplication: 0 to 3"
msgstr "Multiplikasjon: 0 til 3"
-#: data/missions/lessons/descr_lessons:124
-#: data/missions/lessons/descr_lessons:179
-#: data/missions/lessons/descr_lessons:234
+#: data/missions/lessons/descr_lessons:14
msgid "Multiples of 2"
msgstr "Multiplum av 2"
-#: data/missions/lessons/descr_lessons:125
-#: data/missions/lessons/descr_lessons:180
-#: data/missions/lessons/descr_lessons:235
+#: data/missions/lessons/descr_lessons:15
msgid "Multiples of 3"
msgstr "Multiplum av 3"
-#: data/missions/lessons/descr_lessons:126
-#: data/missions/lessons/descr_lessons:181
-#: data/missions/lessons/descr_lessons:236
+#: data/missions/lessons/descr_lessons:16
msgid "Multiples of 4"
msgstr "Multiplum av 4"
-#: data/missions/lessons/descr_lessons:127
-#: data/missions/lessons/descr_lessons:182
-#: data/missions/lessons/descr_lessons:237
+#: data/missions/lessons/descr_lessons:17
msgid "Multiples of 5"
msgstr "Multiplum av 5"
-#: data/missions/lessons/descr_lessons:128
-#: data/missions/lessons/descr_lessons:183
-#: data/missions/lessons/descr_lessons:238
+#: data/missions/lessons/descr_lessons:18
+#: data/missions/lessons/descr_lessons:19
msgid "Multiplication: 0 to 5"
msgstr "Multiplikasjon: 0 til 5"
-#: data/missions/lessons/descr_lessons:129
-#: data/missions/lessons/descr_lessons:184
-#: data/missions/lessons/descr_lessons:239
+#: data/missions/lessons/descr_lessons:20
msgid "Multiples of 6"
msgstr "Multiplum av 6"
-#: data/missions/lessons/descr_lessons:130
-#: data/missions/lessons/descr_lessons:185
-#: data/missions/lessons/descr_lessons:240
+#: data/missions/lessons/descr_lessons:21
msgid "Multiples of 7"
msgstr "Multiplum av 7"
-#: data/missions/lessons/descr_lessons:131
-#: data/missions/lessons/descr_lessons:186
-#: data/missions/lessons/descr_lessons:241
+#: data/missions/lessons/descr_lessons:22
+#: data/missions/lessons/descr_lessons:23
msgid "Multiplication: 0 to 7"
msgstr "Multiplikasjon: 0 til 7"
-#: data/missions/lessons/descr_lessons:132
-#: data/missions/lessons/descr_lessons:187
-#: data/missions/lessons/descr_lessons:242
+#: data/missions/lessons/descr_lessons:24
msgid "Multiples of 8"
msgstr "Multiplum av 8"
-#: data/missions/lessons/descr_lessons:133
-#: data/missions/lessons/descr_lessons:188
-#: data/missions/lessons/descr_lessons:243
+#: data/missions/lessons/descr_lessons:25
msgid "Multiples of 9"
msgstr "Multiplum av 9"
-#: data/missions/lessons/descr_lessons:134
-#: data/missions/lessons/descr_lessons:189
-#: data/missions/lessons/descr_lessons:244
+#: data/missions/lessons/descr_lessons:26
msgid "Multiples of 10"
msgstr "Multiplum av 10"
-#: data/missions/lessons/descr_lessons:135
-#: data/missions/lessons/descr_lessons:190
-#: data/missions/lessons/descr_lessons:245
+#: data/missions/lessons/descr_lessons:27
msgid "Multiplication: 0 to 10"
msgstr "Multiplikasjon: 0 til 10"
-#: data/missions/lessons/descr_lessons:136
-#: data/missions/lessons/descr_lessons:191
-#: data/missions/lessons/descr_lessons:246
+#: data/missions/lessons/descr_lessons:28
msgid "Multiples of 11 and 12"
msgstr "Multiplum av 11 og 12"
-#: data/missions/lessons/descr_lessons:137
-#: data/missions/lessons/descr_lessons:192
-#: data/missions/lessons/descr_lessons:247
+#: data/missions/lessons/descr_lessons:29
msgid "Multiplication: 0 to 12"
msgstr "Multiplikasjon: 0 til 12"
-#: data/missions/lessons/descr_lessons:138
-#: data/missions/lessons/descr_lessons:193
-#: data/missions/lessons/descr_lessons:248
+#: data/missions/lessons/descr_lessons:30
msgid "Multiples of 13, 14, and 15"
msgstr "Multiplum av 13, 14 og 15"
-#: data/missions/lessons/descr_lessons:139
-#: data/missions/lessons/descr_lessons:194
-#: data/missions/lessons/descr_lessons:249
+#: data/missions/lessons/descr_lessons:31
msgid "Multiplication: 0 to 15"
msgstr "Multiplikasjon: 0 til 15"
-#: data/missions/lessons/descr_lessons:140
-#: data/missions/lessons/descr_lessons:195
-#: data/missions/lessons/descr_lessons:250
+#: data/missions/lessons/descr_lessons:32
msgid "Multiplication: Missing Numbers"
msgstr "Multiplikasjon: Manglande tal"
-#: data/missions/lessons/descr_lessons:141
-#: data/missions/lessons/descr_lessons:196
-#: data/missions/lessons/descr_lessons:251
+#: data/missions/lessons/descr_lessons:33
msgid "Division by 2"
msgstr "Divisjon med 2"
-#: data/missions/lessons/descr_lessons:142
-#: data/missions/lessons/descr_lessons:197
-#: data/missions/lessons/descr_lessons:252
+#: data/missions/lessons/descr_lessons:34
msgid "Division by 3"
msgstr "Divisjon med 3"
-#: data/missions/lessons/descr_lessons:143
-#: data/missions/lessons/descr_lessons:198
-#: data/missions/lessons/descr_lessons:253
+#: data/missions/lessons/descr_lessons:35
msgid "Division by 4"
msgstr "Divisjon med 4"
-#: data/missions/lessons/descr_lessons:144
-#: data/missions/lessons/descr_lessons:199
-#: data/missions/lessons/descr_lessons:254
+#: data/missions/lessons/descr_lessons:36
msgid "Division by 5"
msgstr "Divisjon med 5"
-#: data/missions/lessons/descr_lessons:145
-#: data/missions/lessons/descr_lessons:200
-#: data/missions/lessons/descr_lessons:255
+#: data/missions/lessons/descr_lessons:37
msgid "Division: 1 to 5"
msgstr "Divisjon: 1 til 5"
-#: data/missions/lessons/descr_lessons:146
-#: data/missions/lessons/descr_lessons:201
-#: data/missions/lessons/descr_lessons:256
+#: data/missions/lessons/descr_lessons:38
msgid "Division by 6"
msgstr "Divisjon med 6"
-#: data/missions/lessons/descr_lessons:147
-#: data/missions/lessons/descr_lessons:202
-#: data/missions/lessons/descr_lessons:257
+#: data/missions/lessons/descr_lessons:39
msgid "Division by 7"
msgstr "Divisjon med 7"
-#: data/missions/lessons/descr_lessons:148
-#: data/missions/lessons/descr_lessons:203
-#: data/missions/lessons/descr_lessons:258
+#: data/missions/lessons/descr_lessons:40
msgid "Division by 8"
msgstr "Divisjon med 8"
-#: data/missions/lessons/descr_lessons:149
-#: data/missions/lessons/descr_lessons:204
-#: data/missions/lessons/descr_lessons:259
+#: data/missions/lessons/descr_lessons:41
msgid "Division by 9"
msgstr "Divisjon med 9"
-#: data/missions/lessons/descr_lessons:150
-#: data/missions/lessons/descr_lessons:205
-#: data/missions/lessons/descr_lessons:260
+#: data/missions/lessons/descr_lessons:42
msgid "Division by 10"
msgstr "Divisjon med 10"
-#: data/missions/lessons/descr_lessons:151
-#: data/missions/lessons/descr_lessons:206
-#: data/missions/lessons/descr_lessons:261
+#: data/missions/lessons/descr_lessons:43
msgid "Division: 1 to 10"
msgstr "Divisjon: 1 til 10"
-#: data/missions/lessons/descr_lessons:152
-#: data/missions/lessons/descr_lessons:207
-#: data/missions/lessons/descr_lessons:262
+#: data/missions/lessons/descr_lessons:44
msgid "Division by 11 and 12"
msgstr "Divisjon med 11 og 12"
-#: data/missions/lessons/descr_lessons:153
-#: data/missions/lessons/descr_lessons:208
-#: data/missions/lessons/descr_lessons:263
+#: data/missions/lessons/descr_lessons:45
msgid "Division: 1 to 12"
msgstr "Divisjon: 1 til 12"
-#: data/missions/lessons/descr_lessons:154
-msgid "Division by 13, 14 and 15"
+#: data/missions/lessons/descr_lessons:46
+msgid "Division by 13, 14, and 15"
msgstr "Divisjon med 13, 14 og 15"
-#: data/missions/lessons/descr_lessons:155
-#: data/missions/lessons/descr_lessons:210
-#: data/missions/lessons/descr_lessons:265
+#: data/missions/lessons/descr_lessons:47
msgid "Division: 1 to 15"
msgstr "Divisjon: 1 til 15"
-#: data/missions/lessons/descr_lessons:156
-msgid "Multiplication/Division Super Review!"
+#: data/missions/lessons/descr_lessons:48
+msgid "Multiplication and Division Review"
msgstr "Gjennomgang: Multiplikasjon og divisjon"
-#: data/missions/lessons/descr_lessons:157
-#: data/missions/lessons/descr_lessons:212
-#: data/missions/lessons/descr_lessons:267
+#: data/missions/lessons/descr_lessons:49
msgid "Typing Negative Numbers"
msgstr "Negative tal"
-#: data/missions/lessons/descr_lessons:158
-#: data/missions/lessons/descr_lessons:213
-#: data/missions/lessons/descr_lessons:268
+#: data/missions/lessons/descr_lessons:50
msgid "Subtraction: Negative Answers"
msgstr "Subtraksjon: Negative svar"
-#: data/missions/lessons/descr_lessons:159
-msgid "Adding Negatives To Positives"
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Positives"
msgstr "Addisjon av negative til positive tal"
-#: data/missions/lessons/descr_lessons:160
-#: data/missions/lessons/descr_lessons:215
-#: data/missions/lessons/descr_lessons:270
+#: data/missions/lessons/descr_lessons:52
msgid "Subtracting Negatives From Positives"
msgstr "Subtraksjon av negative frå positive tal"
-#: data/missions/lessons/descr_lessons:161
-msgid "Adding Negatives To Negatives"
+#: data/missions/lessons/descr_lessons:53
+msgid "Adding Negatives to Negatives"
msgstr "Addisjon av negative til negative tal"
-#: data/missions/lessons/descr_lessons:162
-#: data/missions/lessons/descr_lessons:217
-#: data/missions/lessons/descr_lessons:272
+#: data/missions/lessons/descr_lessons:54
msgid "Subtracting Negatives From Negatives"
msgstr "Subtraksjon av negative frå negative tal"
-#: data/missions/lessons/descr_lessons:163
-msgid "Neg/Pos Review"
+#: data/missions/lessons/descr_lessons:55
+msgid "Negative and Positive Numbers Review"
msgstr "Gjennomgang: Negative og positive tal"
-#: data/missions/lessons/descr_lessons:164
-msgid "Multiplication And Division Of Negatives"
+#: data/missions/lessons/descr_lessons:56
+msgid "Multiplication and Division of Negatives"
msgstr "Multiplikasjon og divisjon av negative tal"
-#: data/missions/lessons/descr_lessons:165
-msgid "Multiplication Of Positives And Negatives"
+#: data/missions/lessons/descr_lessons:57
+msgid "Multiplication of Positives and Negatives"
msgstr "Multiplikasjon av positive og negative tal"
-#: data/missions/lessons/descr_lessons:166
-msgid "Division Of Positives And Negatives"
+#: data/missions/lessons/descr_lessons:58
+msgid "Division of Positives and Negatives"
msgstr "Divisjon av positive og negative tal"
-#: data/missions/lessons/descr_lessons:170
-#: data/missions/lessons/descr_lessons:225
-msgid "Addition: Sums to 10"
-msgstr "Addisjon: Summar til 10"
+#~ msgid "Addition: Sums To 10"
+#~ msgstr "Addisjon: Summar til 10"
-#: data/missions/lessons/descr_lessons:171
-#: data/missions/lessons/descr_lessons:226
-msgid "Addition: Sums to 15"
-msgstr "Addisjon: Summar til 15"
+#~ msgid "Addition: Sums To 15"
+#~ msgstr "Addisjon: Summar til 15"
-#: data/missions/lessons/descr_lessons:172
-#: data/missions/lessons/descr_lessons:227
-msgid "Addition: Sums to 20"
-msgstr "Addisjon: Summar til 20"
+#~ msgid "Addition: Sums To 20"
+#~ msgstr "Addisjon: Summar til 20"
-#: data/missions/lessons/descr_lessons:209
-#: data/missions/lessons/descr_lessons:264
-msgid "Division by 13, 14, and 15"
-msgstr "Divisjon med 13, 14 og 15"
+#~ msgid "Division by 13, 14 and 15"
+#~ msgstr "Divisjon med 13, 14 og 15"
-#: data/missions/lessons/descr_lessons:211
-#: data/missions/lessons/descr_lessons:266
-msgid "Multiplication and Division Review"
-msgstr "Gjennomgang: Multiplikasjon og divisjon"
+#~ msgid "Multiplication/Division Super Review!"
+#~ msgstr "Gjennomgang: Multiplikasjon og divisjon"
-#: data/missions/lessons/descr_lessons:214
-#: data/missions/lessons/descr_lessons:269
-msgid "Adding Negatives to Positives"
-msgstr "Addisjon av negative til positive tal"
+#~ msgid "Adding Negatives To Positives"
+#~ msgstr "Addisjon av negative til positive tal"
-#: data/missions/lessons/descr_lessons:216
-#: data/missions/lessons/descr_lessons:271
-msgid "Adding Negatives to Negatives"
-msgstr "Addisjon av negative til negative tal"
+#~ msgid "Adding Negatives To Negatives"
+#~ msgstr "Addisjon av negative til negative tal"
-#: data/missions/lessons/descr_lessons:218
-#: data/missions/lessons/descr_lessons:273
-msgid "Negative and Positive Numbers Review"
-msgstr "Gjennomgang: Negative og positive tal"
+#~ msgid "Neg/Pos Review"
+#~ msgstr "Gjennomgang: Negative og positive tal"
-#: data/missions/lessons/descr_lessons:219
-#: data/missions/lessons/descr_lessons:274
-msgid "Multiplication and Division of Negatives"
-msgstr "Multiplikasjon og divisjon av negative tal"
+#~ msgid "Multiplication And Division Of Negatives"
+#~ msgstr "Multiplikasjon og divisjon av negative tal"
-#: data/missions/lessons/descr_lessons:220
-#: data/missions/lessons/descr_lessons:275
-msgid "Multiplication of Positives and Negatives"
-msgstr "Multiplikasjon av positive og negative tal"
+#~ msgid "Multiplication Of Positives And Negatives"
+#~ msgstr "Multiplikasjon av positive og negative tal"
-#: data/missions/lessons/descr_lessons:221
-#: data/missions/lessons/descr_lessons:276
-msgid "Division of Positives and Negatives"
-msgstr "Divisjon av positive og negative tal"
+#~ msgid "Division Of Positives And Negatives"
+#~ msgstr "Divisjon av positive og negative tal"
#~ msgid "Sound Effects Volume"
#~ msgstr "Lydeffektar"
Modified: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/po/tuxmath.pot 2007-11-12 00:12:20 UTC (rev 316)
@@ -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-06 12:56-0500\n"
+"POT-Creation-Date: 2007-11-12 00:06+0000\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"
@@ -127,365 +127,228 @@
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: data/missions/lessons/descr_lessons:112
-#: data/missions/lessons/descr_lessons:167
-#: data/missions/lessons/descr_lessons:222
+#: data/missions/lessons/descr_lessons:1
msgid "Number Typing"
msgstr ""
-#: data/missions/lessons/descr_lessons:113
-#: data/missions/lessons/descr_lessons:168
-#: data/missions/lessons/descr_lessons:223
+#: data/missions/lessons/descr_lessons:2
msgid "Addition: 1 to 3"
msgstr ""
-#: data/missions/lessons/descr_lessons:114
-#: data/missions/lessons/descr_lessons:169
-#: data/missions/lessons/descr_lessons:224
+#: data/missions/lessons/descr_lessons:3
msgid "Addition: 0 to 5"
msgstr ""
-#: data/missions/lessons/descr_lessons:115
-msgid "Addition: Sums To 10"
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
msgstr ""
-#: data/missions/lessons/descr_lessons:116
-msgid "Addition: Sums To 15"
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
msgstr ""
-#: data/missions/lessons/descr_lessons:117
-msgid "Addition: Sums To 20"
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
msgstr ""
-#: data/missions/lessons/descr_lessons:118
-#: data/missions/lessons/descr_lessons:173
-#: data/missions/lessons/descr_lessons:228
+#: data/missions/lessons/descr_lessons:7
msgid "Addition: Two Digit Numbers"
msgstr ""
-#: data/missions/lessons/descr_lessons:119
-#: data/missions/lessons/descr_lessons:174
-#: data/missions/lessons/descr_lessons:229
+#: data/missions/lessons/descr_lessons:8
msgid "Addition: Missing Numbers"
msgstr ""
-#: data/missions/lessons/descr_lessons:120
-#: data/missions/lessons/descr_lessons:175
-#: data/missions/lessons/descr_lessons:230
+#: data/missions/lessons/descr_lessons:9
msgid "Subtraction: 0 to 10"
msgstr ""
-#: data/missions/lessons/descr_lessons:121
-#: data/missions/lessons/descr_lessons:176
-#: data/missions/lessons/descr_lessons:231
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:11
msgid "Subtraction: Two Digit Numbers"
msgstr ""
-#: data/missions/lessons/descr_lessons:122
-#: data/missions/lessons/descr_lessons:177
-#: data/missions/lessons/descr_lessons:232
+#: data/missions/lessons/descr_lessons:12
msgid "Addition and Subtraction Review"
msgstr ""
-#: data/missions/lessons/descr_lessons:123
-#: data/missions/lessons/descr_lessons:178
-#: data/missions/lessons/descr_lessons:233
+#: data/missions/lessons/descr_lessons:13
msgid "Multiplication: 0 to 3"
msgstr ""
-#: data/missions/lessons/descr_lessons:124
-#: data/missions/lessons/descr_lessons:179
-#: data/missions/lessons/descr_lessons:234
+#: data/missions/lessons/descr_lessons:14
msgid "Multiples of 2"
msgstr ""
-#: data/missions/lessons/descr_lessons:125
-#: data/missions/lessons/descr_lessons:180
-#: data/missions/lessons/descr_lessons:235
+#: data/missions/lessons/descr_lessons:15
msgid "Multiples of 3"
msgstr ""
-#: data/missions/lessons/descr_lessons:126
-#: data/missions/lessons/descr_lessons:181
-#: data/missions/lessons/descr_lessons:236
+#: data/missions/lessons/descr_lessons:16
msgid "Multiples of 4"
msgstr ""
-#: data/missions/lessons/descr_lessons:127
-#: data/missions/lessons/descr_lessons:182
-#: data/missions/lessons/descr_lessons:237
+#: data/missions/lessons/descr_lessons:17
msgid "Multiples of 5"
msgstr ""
-#: data/missions/lessons/descr_lessons:128
-#: data/missions/lessons/descr_lessons:183
-#: data/missions/lessons/descr_lessons:238
+#: data/missions/lessons/descr_lessons:18
+#: data/missions/lessons/descr_lessons:19
msgid "Multiplication: 0 to 5"
msgstr ""
-#: data/missions/lessons/descr_lessons:129
-#: data/missions/lessons/descr_lessons:184
-#: data/missions/lessons/descr_lessons:239
+#: data/missions/lessons/descr_lessons:20
msgid "Multiples of 6"
msgstr ""
-#: data/missions/lessons/descr_lessons:130
-#: data/missions/lessons/descr_lessons:185
-#: data/missions/lessons/descr_lessons:240
+#: data/missions/lessons/descr_lessons:21
msgid "Multiples of 7"
msgstr ""
-#: data/missions/lessons/descr_lessons:131
-#: data/missions/lessons/descr_lessons:186
-#: data/missions/lessons/descr_lessons:241
+#: data/missions/lessons/descr_lessons:22
+#: data/missions/lessons/descr_lessons:23
msgid "Multiplication: 0 to 7"
msgstr ""
-#: data/missions/lessons/descr_lessons:132
-#: data/missions/lessons/descr_lessons:187
-#: data/missions/lessons/descr_lessons:242
+#: data/missions/lessons/descr_lessons:24
msgid "Multiples of 8"
msgstr ""
-#: data/missions/lessons/descr_lessons:133
-#: data/missions/lessons/descr_lessons:188
-#: data/missions/lessons/descr_lessons:243
+#: data/missions/lessons/descr_lessons:25
msgid "Multiples of 9"
msgstr ""
-#: data/missions/lessons/descr_lessons:134
-#: data/missions/lessons/descr_lessons:189
-#: data/missions/lessons/descr_lessons:244
+#: data/missions/lessons/descr_lessons:26
msgid "Multiples of 10"
msgstr ""
-#: data/missions/lessons/descr_lessons:135
-#: data/missions/lessons/descr_lessons:190
-#: data/missions/lessons/descr_lessons:245
+#: data/missions/lessons/descr_lessons:27
msgid "Multiplication: 0 to 10"
msgstr ""
-#: data/missions/lessons/descr_lessons:136
-#: data/missions/lessons/descr_lessons:191
-#: data/missions/lessons/descr_lessons:246
+#: data/missions/lessons/descr_lessons:28
msgid "Multiples of 11 and 12"
msgstr ""
-#: data/missions/lessons/descr_lessons:137
-#: data/missions/lessons/descr_lessons:192
-#: data/missions/lessons/descr_lessons:247
+#: data/missions/lessons/descr_lessons:29
msgid "Multiplication: 0 to 12"
msgstr ""
-#: data/missions/lessons/descr_lessons:138
-#: data/missions/lessons/descr_lessons:193
-#: data/missions/lessons/descr_lessons:248
+#: data/missions/lessons/descr_lessons:30
msgid "Multiples of 13, 14, and 15"
msgstr ""
-#: data/missions/lessons/descr_lessons:139
-#: data/missions/lessons/descr_lessons:194
-#: data/missions/lessons/descr_lessons:249
+#: data/missions/lessons/descr_lessons:31
msgid "Multiplication: 0 to 15"
msgstr ""
-#: data/missions/lessons/descr_lessons:140
-#: data/missions/lessons/descr_lessons:195
-#: data/missions/lessons/descr_lessons:250
+#: data/missions/lessons/descr_lessons:32
msgid "Multiplication: Missing Numbers"
msgstr ""
-#: data/missions/lessons/descr_lessons:141
-#: data/missions/lessons/descr_lessons:196
-#: data/missions/lessons/descr_lessons:251
+#: data/missions/lessons/descr_lessons:33
msgid "Division by 2"
msgstr ""
-#: data/missions/lessons/descr_lessons:142
-#: data/missions/lessons/descr_lessons:197
-#: data/missions/lessons/descr_lessons:252
+#: data/missions/lessons/descr_lessons:34
msgid "Division by 3"
msgstr ""
-#: data/missions/lessons/descr_lessons:143
-#: data/missions/lessons/descr_lessons:198
-#: data/missions/lessons/descr_lessons:253
+#: data/missions/lessons/descr_lessons:35
msgid "Division by 4"
msgstr ""
-#: data/missions/lessons/descr_lessons:144
-#: data/missions/lessons/descr_lessons:199
-#: data/missions/lessons/descr_lessons:254
+#: data/missions/lessons/descr_lessons:36
msgid "Division by 5"
msgstr ""
-#: data/missions/lessons/descr_lessons:145
-#: data/missions/lessons/descr_lessons:200
-#: data/missions/lessons/descr_lessons:255
+#: data/missions/lessons/descr_lessons:37
msgid "Division: 1 to 5"
msgstr ""
-#: data/missions/lessons/descr_lessons:146
-#: data/missions/lessons/descr_lessons:201
-#: data/missions/lessons/descr_lessons:256
+#: data/missions/lessons/descr_lessons:38
msgid "Division by 6"
msgstr ""
-#: data/missions/lessons/descr_lessons:147
-#: data/missions/lessons/descr_lessons:202
-#: data/missions/lessons/descr_lessons:257
+#: data/missions/lessons/descr_lessons:39
msgid "Division by 7"
msgstr ""
-#: data/missions/lessons/descr_lessons:148
-#: data/missions/lessons/descr_lessons:203
-#: data/missions/lessons/descr_lessons:258
+#: data/missions/lessons/descr_lessons:40
msgid "Division by 8"
msgstr ""
-#: data/missions/lessons/descr_lessons:149
-#: data/missions/lessons/descr_lessons:204
-#: data/missions/lessons/descr_lessons:259
+#: data/missions/lessons/descr_lessons:41
msgid "Division by 9"
msgstr ""
-#: data/missions/lessons/descr_lessons:150
-#: data/missions/lessons/descr_lessons:205
-#: data/missions/lessons/descr_lessons:260
+#: data/missions/lessons/descr_lessons:42
msgid "Division by 10"
msgstr ""
-#: data/missions/lessons/descr_lessons:151
-#: data/missions/lessons/descr_lessons:206
-#: data/missions/lessons/descr_lessons:261
+#: data/missions/lessons/descr_lessons:43
msgid "Division: 1 to 10"
msgstr ""
-#: data/missions/lessons/descr_lessons:152
-#: data/missions/lessons/descr_lessons:207
-#: data/missions/lessons/descr_lessons:262
+#: data/missions/lessons/descr_lessons:44
msgid "Division by 11 and 12"
msgstr ""
-#: data/missions/lessons/descr_lessons:153
-#: data/missions/lessons/descr_lessons:208
-#: data/missions/lessons/descr_lessons:263
+#: data/missions/lessons/descr_lessons:45
msgid "Division: 1 to 12"
msgstr ""
-#: data/missions/lessons/descr_lessons:154
-msgid "Division by 13, 14 and 15"
+#: data/missions/lessons/descr_lessons:46
+msgid "Division by 13, 14, and 15"
msgstr ""
-#: data/missions/lessons/descr_lessons:155
-#: data/missions/lessons/descr_lessons:210
-#: data/missions/lessons/descr_lessons:265
+#: data/missions/lessons/descr_lessons:47
msgid "Division: 1 to 15"
msgstr ""
-#: data/missions/lessons/descr_lessons:156
-msgid "Multiplication/Division Super Review!"
+#: data/missions/lessons/descr_lessons:48
+msgid "Multiplication and Division Review"
msgstr ""
-#: data/missions/lessons/descr_lessons:157
-#: data/missions/lessons/descr_lessons:212
-#: data/missions/lessons/descr_lessons:267
+#: data/missions/lessons/descr_lessons:49
msgid "Typing Negative Numbers"
msgstr ""
-#: data/missions/lessons/descr_lessons:158
-#: data/missions/lessons/descr_lessons:213
-#: data/missions/lessons/descr_lessons:268
+#: data/missions/lessons/descr_lessons:50
msgid "Subtraction: Negative Answers"
msgstr ""
-#: data/missions/lessons/descr_lessons:159
-msgid "Adding Negatives To Positives"
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Positives"
msgstr ""
-#: data/missions/lessons/descr_lessons:160
-#: data/missions/lessons/descr_lessons:215
-#: data/missions/lessons/descr_lessons:270
+#: data/missions/lessons/descr_lessons:52
msgid "Subtracting Negatives From Positives"
msgstr ""
-#: data/missions/lessons/descr_lessons:161
-msgid "Adding Negatives To Negatives"
+#: data/missions/lessons/descr_lessons:53
+msgid "Adding Negatives to Negatives"
msgstr ""
-#: data/missions/lessons/descr_lessons:162
-#: data/missions/lessons/descr_lessons:217
-#: data/missions/lessons/descr_lessons:272
+#: data/missions/lessons/descr_lessons:54
msgid "Subtracting Negatives From Negatives"
msgstr ""
-#: data/missions/lessons/descr_lessons:163
-msgid "Neg/Pos Review"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:164
-msgid "Multiplication And Division Of Negatives"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:165
-msgid "Multiplication Of Positives And Negatives"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:166
-msgid "Division Of Positives And Negatives"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:170
-#: data/missions/lessons/descr_lessons:225
-msgid "Addition: Sums to 10"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:171
-#: data/missions/lessons/descr_lessons:226
-msgid "Addition: Sums to 15"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:172
-#: data/missions/lessons/descr_lessons:227
-msgid "Addition: Sums to 20"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:209
-#: data/missions/lessons/descr_lessons:264
-msgid "Division by 13, 14, and 15"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:211
-#: data/missions/lessons/descr_lessons:266
-msgid "Multiplication and Division Review"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:214
-#: data/missions/lessons/descr_lessons:269
-msgid "Adding Negatives to Positives"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:216
-#: data/missions/lessons/descr_lessons:271
-msgid "Adding Negatives to Negatives"
-msgstr ""
-
-#: data/missions/lessons/descr_lessons:218
-#: data/missions/lessons/descr_lessons:273
+#: data/missions/lessons/descr_lessons:55
msgid "Negative and Positive Numbers Review"
msgstr ""
-#: data/missions/lessons/descr_lessons:219
-#: data/missions/lessons/descr_lessons:274
+#: data/missions/lessons/descr_lessons:56
msgid "Multiplication and Division of Negatives"
msgstr ""
-#: data/missions/lessons/descr_lessons:220
-#: data/missions/lessons/descr_lessons:275
+#: data/missions/lessons/descr_lessons:57
msgid "Multiplication of Positives and Negatives"
msgstr ""
-#: data/missions/lessons/descr_lessons:221
-#: data/missions/lessons/descr_lessons:276
+#: data/missions/lessons/descr_lessons:58
msgid "Division of Positives and Negatives"
msgstr ""
Modified: tuxmath/trunk/src/Makefile.am
===================================================================
--- tuxmath/trunk/src/Makefile.am 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/Makefile.am 2007-11-12 00:12:20 UTC (rev 316)
@@ -1,8 +1,20 @@
## Makefile.am for tuxmath src:
## Process with Automake to create Makefile.in
-# SUBDIRS = po (po now directly under trunk)
+# Support for gettext:
+datadir = @datadir@
+localedir = $(datadir)/locale
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+AM_CFLAGS=-Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
+ -DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
+
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
+ -I../intl -I$(top_srcdir)/intl
+
+LDADD = @LIBINTL@
+
+
if BUILD_MINGW32
bin_PROGRAMS = TuxMath
else
@@ -50,15 +62,12 @@
DATA_PREFIX=${pkgdatadir}
endif
-datadir = @datadir@
-localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-AM_CFLAGS=-Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
- -DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
-
# How to make an RC file
tuxmathrc.o: tuxmathrc.rc
$(WINDRES) -i $< -o $@
noinst_HEADERS = highscore.h
+
+
+
+
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/Makefile.in 2007-11-12 00:12:20 UTC (rev 316)
@@ -14,9 +14,7 @@
@SET_MAKE@
-# SUBDIRS = po (po now directly under trunk)
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -46,7 +44,8 @@
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
+ $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
@@ -60,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)"
@@ -74,6 +73,7 @@
am_TuxMath_OBJECTS = $(am__objects_1)
TuxMath_OBJECTS = $(am_TuxMath_OBJECTS)
TuxMath_LDADD = $(LDADD)
+TuxMath_DEPENDENCIES =
am_tuxmath_OBJECTS = tuxmath.$(OBJEXT) setup.$(OBJEXT) \
titlescreen.$(OBJEXT) game.$(OBJEXT) options.$(OBJEXT) \
credits.$(OBJEXT) highscore.$(OBJEXT) loaders.$(OBJEXT) \
@@ -81,6 +81,7 @@
ConvertUTF.$(OBJEXT) SDL_extras.$(OBJEXT) lessons.$(OBJEXT)
tuxmath_OBJECTS = $(am_tuxmath_OBJECTS)
tuxmath_LDADD = $(LDADD)
+tuxmath_DEPENDENCIES =
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -207,6 +208,8 @@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
+
+# Support for gettext:
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -243,6 +246,13 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+AM_CFLAGS = -Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
+ -DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
+
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
+ -I../intl -I$(top_srcdir)/intl
+
+LDADD = @LIBINTL@
@BUILD_MINGW32_FALSE at TUXMATHRC =
tuxmath_SOURCES = tuxmath.c \
setup.c \
@@ -276,9 +286,6 @@
@BUILD_MINGW32_FALSE at DATA_PREFIX = ${pkgdatadir}
@BUILD_MINGW32_TRUE at DATA_PREFIX = @PACKAGE_DATA_DIR@
-AM_CFLAGS = -Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
- -DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
-
noinst_HEADERS = highscore.h
all: all-am
Modified: tuxmath/trunk/src/SDL_extras.c
===================================================================
--- tuxmath/trunk/src/SDL_extras.c 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/SDL_extras.c 2007-11-12 00:12:20 UTC (rev 316)
@@ -335,7 +335,7 @@
int x, y;
/* (realistically, 1 and 2 are the only useful values) */
- if (bits > 8 || bits < 0)
+ if (bits > 8)
return;
p = screen->pixels;
Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/fileops.c 2007-11-12 00:12:20 UTC (rev 316)
@@ -476,10 +476,12 @@
/* 5. In missions/arcade directory. */
/* 6. In user's own .tuxmath directory */
/* FIXME redundant code - figure out way to iterate through above */
-int read_named_config_file(const char* filename)
+int read_named_config_file(const unsigned char* fn)
{
FILE* fp;
char opt_path[PATH_MAX];
+ /* Make compiler happy: */
+ const char* filename = (const char*)fn;
#ifdef TUXMATH_DEBUG
printf("\nIn read_named_config_file() filename is: = %s\n", filename);
Modified: tuxmath/trunk/src/fileops.h
===================================================================
--- tuxmath/trunk/src/fileops.h 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/fileops.h 2007-11-12 00:12:20 UTC (rev 316)
@@ -231,7 +231,7 @@
int read_global_config_file(void);
int read_user_config_file(void);
int parse_lesson_file_directory(void);
-int read_named_config_file(const char* filename);
+int read_named_config_file(const unsigned char* filename);
int write_user_config_file(void);
int read_high_scores(void);
int write_high_scores(void);
Modified: tuxmath/trunk/src/setup.c
===================================================================
--- tuxmath/trunk/src/setup.c 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/setup.c 2007-11-12 00:12:20 UTC (rev 316)
@@ -182,7 +182,7 @@
/* Handle any arguments passed from command line */
void handle_command_args(int argc, char* argv[])
{
- int i, j, found;
+ int i;
for (i = 1; i < argc; i++)
{
Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/titlescreen.c 2007-11-12 00:12:20 UTC (rev 316)
@@ -855,7 +855,7 @@
}
set_default_menu_options(&menu_opts);
- chosen_lesson = choose_menu_item((const)lesson_list_titles, star_sprites, num_lessons, menu_opts);
+ chosen_lesson = choose_menu_item((const unsigned char**)lesson_list_titles, star_sprites, num_lessons, menu_opts);
while (chosen_lesson >= 0)
{
@@ -894,7 +894,7 @@
// Let the user choose another lesson; start with the screen and
// selection that we ended with
menu_opts.starting_entry = chosen_lesson;
- chosen_lesson = choose_menu_item((const)lesson_list_titles, star_sprites, num_lessons, menu_opts);
+ chosen_lesson = choose_menu_item((const unsigned char**)lesson_list_titles, star_sprites, num_lessons, menu_opts);
}
if (star_sprites)
{
Modified: tuxmath/trunk/src/tuxmath.c
===================================================================
--- tuxmath/trunk/src/tuxmath.c 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/tuxmath.c 2007-11-12 00:12:20 UTC (rev 316)
@@ -5,7 +5,7 @@
Calls functions in other modules (eg, "setup", "title", "game", etc.)
as needed.
- Source code by Bill Kendrick, New Breed Software
+ Original source code by Bill Kendrick, New Breed Software
bill at newbreedsoftware.com
http://www.newbreedsoftware.com/
@@ -13,40 +13,33 @@
http://www.tux4kids.org/
August 26, 2001 - August 28, 2001
+
+ Largely rewritten by David Bruce, Karl Ove Hufthammer,
+ and Tim Holy.
+ 2006-2007
*/
#include <stdio.h>
#include <stdlib.h>
-#include <locale.h>
-#include "gettext.h"
+/* (tuxmath.h brings in "gettext.h" and <locale.h> */
#include "tuxmath.h"
#include "setup.h"
-#include "game.h"
-#include "options.h"
-#include "credits.h"
-
#include "titlescreen.h"
-/* global data: */
-
int main(int argc, char * argv[])
{
- /* NOTE - these casts to (void) prevent compiler warnings of */
- /* "statement with no effect" - I am not sure if they do anything */
- /* else that we need - DSB */
-
#ifndef MACOSX
#ifndef WIN32
- (void)setlocale(LC_ALL, "");
- (void)bindtextdomain(PACKAGE, LOCALEDIR);
- (void)bind_textdomain_codeset(PACKAGE, "UTF-8");
- (void)textdomain(PACKAGE);
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
+ textdomain(PACKAGE);
+
+ printf("gettext(\"help\"): %s\n\n", gettext("help"));
#endif
#endif
-
-
setup(argc, argv);
atexit(cleanup); // register it so we clean up even if there is a crash
TitleScreen();
Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h 2007-11-06 21:23:32 UTC (rev 315)
+++ tuxmath/trunk/src/tuxmath.h 2007-11-12 00:12:20 UTC (rev 316)
@@ -22,14 +22,19 @@
#ifndef TUXMATH_H
#define TUXMATH_H
+#include "config.h"
+
// Translation stuff:
+/* NLS not active on Mac yet: */
#ifdef MACOSX
#define N_(String) String
#define _(String) String
#else
+/* Nor on Windows: */
#ifdef WIN32
#define N_(String) String
#define _(String) String
+/* Set up support for NLS on other platforms - i.e. Linux/Unix: */
#else
#include "gettext.h"
#include <locale.h>
@@ -43,6 +48,7 @@
#include "SDL.h"
#include "SDL_ttf.h"
+#include "config.h"
#ifndef NOSOUND
#include "SDL_mixer.h"
More information about the Tux4kids-commits
mailing list