[Tux4kids-commits] r303 - in tuxmath: . trunk trunk/data/images/sprites trunk/data/missions/lessons trunk/docs trunk/intl trunk/po trunk/src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Fri Oct 19 16:37:30 UTC 2007
Author: dbruce-guest
Date: 2007-10-19 16:37:30 +0000 (Fri, 19 Oct 2007)
New Revision: 303
Added:
tuxmath/trunk/notesblurb
tuxmath/trunk/po/LINGUAS
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/po/update-po.sh
tuxmath/trunk/src/exercise_mathcards.c
tuxmath/trunk/src/gettext.h
Removed:
tuxmath/notesblurb
tuxmath/trunk/gettext.h
tuxmath/trunk/src/po/
Modified:
tuxmath/trunk/ChangeLog
tuxmath/trunk/Makefile.am
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/data/missions/lessons/Makefile.am
tuxmath/trunk/docs/changelog
tuxmath/trunk/intl/localename.c
tuxmath/trunk/po/Makevars
tuxmath/trunk/po/POTFILES.in
tuxmath/trunk/src/Makefile.am
tuxmath/trunk/src/Makefile.in
tuxmath/trunk/src/pause.c
tuxmath/trunk/src/tuxmath.c
tuxmath/trunk/src/tuxmath.h
Log:
gettext-related stuff
Deleted: tuxmath/notesblurb
===================================================================
--- tuxmath/notesblurb 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/notesblurb 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,3 +0,0 @@
-Source tar.gz archive for TuxMath 1.5.6, including the Andika font. Suitable for installation on Unix-style systems using a simple "./configure; make; make install".
-
-Build requires the *-dev files for SDL, SDL_image, SDL_mixer, and SDL_ttf. Gnu gettext required for installation. All of these should be easily available in most Gnu-Linux distributions. The Gnu Autotools are not needed to build from this package.
\ No newline at end of file
Modified: tuxmath/trunk/ChangeLog
===================================================================
--- tuxmath/trunk/ChangeLog 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/ChangeLog 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,3 +1,12 @@
+2007-10-18 gettextize <bug-gnu-gettext at gnu.org>
+
+ * configure.ac (AC_CONFIG_FILES): Add intl/Makefile.
+
+2007-10-18 gettextize <bug-gnu-gettext at gnu.org>
+
+ * Makefile.am (SUBDIRS): Remove intl.
+ * configure.ac (AC_CONFIG_FILES): Remove intl/Makefile.
+
2007-10-15 gettextize <bug-gnu-gettext at gnu.org>
* Makefile.am (SUBDIRS): Add intl, po.
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/Makefile.am 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,6 +1,8 @@
MAKENSIS=@NSIS@
-SUBDIRS = intl po src \
+SUBDIRS = po \
+ intl \
+ src \
data \
docs
@@ -24,7 +26,7 @@
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir); \
cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * \
| ( cd $(DESTDIR)/$(pkgdatadir) ; tar xf -) ; cd .. ; \
- cd src/po ; \
+ cd po ; ls;\
for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
mkdir -p $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES ; msgfmt -o $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo $$langcode.po; \
done; \
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/configure 2007-10-19 16:37:30 UTC (rev 303)
@@ -687,14 +687,6 @@
am__tar
am__untar
NAME_VERSION
-USE_NLS
-MSGFMT
-GMSGFMT
-MSGFMT_015
-GMSGFMT_015
-XGETTEXT
-XGETTEXT_015
-MSGMERGE
CC
CFLAGS
LDFLAGS
@@ -711,6 +703,14 @@
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
+USE_NLS
+MSGFMT
+GMSGFMT
+MSGFMT_015
+GMSGFMT_015
+XGETTEXT
+XGETTEXT_015
+MSGMERGE
CPP
GREP
EGREP
@@ -1356,9 +1356,9 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-nls do not use Native Language Support
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+ --disable-nls do not use Native Language Support
--enable-threads={posix|solaris|pth|win32}
specify multithreading API
--disable-threads build without multithread safety
@@ -2498,368 +2498,7 @@
-
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-
-
- { 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.
-if test "${enable_nls+set}" = set; then
- enableval=$enable_nls; USE_NLS=$enableval
-else
- USE_NLS=yes
-fi
-
- { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
-
-
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case "$MSGFMT" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&5
- if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
- ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
- *) GMSGFMT_015=$GMSGFMT ;;
- esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case "$XGETTEXT" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&5
- if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- rm -f messages.po
-
- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
- *) XGETTEXT_015=$XGETTEXT ;;
- esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case "$MSGMERGE" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&5
- if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
- ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
- ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$localedir" || localedir='${datadir}/locale'
-
-
- ac_config_commands="$ac_config_commands po-directories"
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
+# Checks for programs.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3778,7 +3417,69 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+DEPDIR="${am__leading_dot}deps"
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3887,7 +3588,339 @@
fi
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+# Needed for gettext:
+
+cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+
+
+ { 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.
+if test "${enable_nls+set}" = set; then
+ enableval=$enable_nls; USE_NLS=$enableval
+else
+ USE_NLS=yes
+fi
+
+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
+
+
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case "$MSGFMT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+ ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+ *) GMSGFMT_015=$GMSGFMT ;;
+ esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case "$XGETTEXT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ rm -f messages.po
+
+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+ *) XGETTEXT_015=$XGETTEXT ;;
+ esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case "$MSGMERGE" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+ ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$localedir" || localedir='${datadir}/locale'
+
+
+ ac_config_commands="$ac_config_commands po-directories"
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12065,822 +12098,7 @@
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
- xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC" am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
SDL_VERSION=1.2.0
@@ -14585,7 +13803,7 @@
-ac_config_files="$ac_config_files intl/Makefile po/Makefile.in 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 src/po/Makefile po/Makefile"
+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"
cat >confcache <<\_ACEOF
@@ -14698,13 +13916,6 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${BUILD_MINGW32_TRUE}" && test -z "${BUILD_MINGW32_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_MINGW32\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -15190,6 +14401,7 @@
#
# INIT-COMMANDS
#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
# Capture the value of obsolete ALL_LINGUAS because we need it to compute
# POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
# from automake < 1.5.
@@ -15197,7 +14409,6 @@
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
@@ -15208,10 +14419,10 @@
do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+ "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" ;;
@@ -15234,7 +14445,6 @@
"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" ;;
- "src/po/Makefile") CONFIG_FILES="$CONFIG_FILES src/po/Makefile" ;;
"po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -15370,14 +14580,6 @@
am__tar!$am__tar$ac_delim
am__untar!$am__untar$ac_delim
NAME_VERSION!$NAME_VERSION$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-MSGFMT_015!$MSGFMT_015$ac_delim
-GMSGFMT_015!$GMSGFMT_015$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-XGETTEXT_015!$XGETTEXT_015$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -15394,6 +14596,14 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+MSGFMT_015!$MSGFMT_015$ac_delim
+GMSGFMT_015!$GMSGFMT_015$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+XGETTEXT_015!$XGETTEXT_015$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
CPP!$CPP$ac_delim
_ACEOF
@@ -15934,119 +15144,6 @@
case $ac_file$ac_mode in
- "po-directories":C)
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Treat a directory as a PO directory if and only if it has a
- # POTFILES.in file. This allows packages to have multiple PO
- # directories under different names or in different locations.
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
- fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done ;;
"depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
@@ -16171,6 +15268,119 @@
done
done
;;
+ "po-directories":C)
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done ;;
esac
done # for ac_tag
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/configure.ac 2007-10-19 16:37:30 UTC (rev 303)
@@ -16,13 +16,15 @@
AC_SUBST(NAME_VERSION)
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_MAKE_SET
+
+# Needed for gettext:
AC_GNU_SOURCE
AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_MAKE_SET
dnl Check for SDL
SDL_VERSION=1.2.0
@@ -135,7 +137,9 @@
AC_PATH_PROG(NSIS, makensis, no, [$PATH])
-AC_CONFIG_FILES([ intl/Makefile po/Makefile.in
+AC_CONFIG_FILES([
+po/Makefile.in
+intl/Makefile
Makefile
data/Makefile
data/fonts/Makefile
@@ -158,7 +162,6 @@
nsis/tuxmath.nsi
nsis/tuxmath_with_conf.nsi
src/Makefile
-src/po/Makefile
po/Makefile
])
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-10-19 16:37:30 UTC (rev 303)
@@ -35,8 +35,22 @@
subdir = data/images/sprites
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+ $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+ $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+ $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -46,17 +60,22 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run aclocal-1.10
+ALLOCA =
AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run tar
AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoconf
AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoheader
AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run automake-1.10
AWK = mawk
+BUILD_INCLUDED_LIBINTL = yes
+CATOBJEXT = .gmo
CC = i586-mingw32msvc-gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CFLAG_VISIBILITY = -fvisibility=hidden
CPP = i586-mingw32msvc-gcc -E
CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc
CYGPATH_W = echo
+DATADIRNAME = share
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
ECHO_C =
@@ -64,18 +83,47 @@
ECHO_T =
EGREP = /bin/grep -E
EXEEXT = .exe
+GENCAT = gencat
+GLIBC2 = no
+GLIBC21 = no
+GMSGFMT = /usr/bin/msgfmt
+GMSGFMT_015 = /usr/bin/msgfmt
GREP = /bin/grep
+HAVE_ASPRINTF = 0
+HAVE_POSIX_PRINTF = 0
+HAVE_SNPRINTF = 1
+HAVE_VISIBILITY = 1
+HAVE_WPRINTF = 0
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INSTOBJEXT = .mo
+INTLBISON = :
+INTLLIBS = ${top_builddir}/intl/libintl.a
+INTLOBJS = $(GETTOBJS)
+INTL_LIBTOOL_SUFFIX_PREFIX =
+INTL_MACOSX_LIBS =
LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LIBICONV =
+LIBINTL = ${top_builddir}/intl/libintl.a
+LIBMULTITHREAD =
LIBOBJS = ${LIBOBJDIR}strtod$U.o
+LIBPTH =
LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBTHREAD =
+LTLIBICONV =
+LTLIBINTL = ${top_builddir}/intl/libintl.a
+LTLIBMULTITHREAD =
LTLIBOBJS = ${LIBOBJDIR}strtod$U.lo
+LTLIBPTH =
+LTLIBTHREAD =
MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGFMT_015 = /usr/bin/msgfmt
+MSGMERGE = /usr/bin/msgmerge
NAME_VERSION = tuxmath-1.5.6
NSIS = /usr/bin/makensis
NSI_DLL_DIR = /home/dbruce/tuxmath_dll
@@ -90,15 +138,23 @@
PACKAGE_TARNAME = tuxmath
PACKAGE_VERSION = 1.5.6
PATH_SEPARATOR = :
+POSUB = po
POW_LIB =
+PRI_MACROS_BROKEN = 0
+RANLIB = i586-mingw32msvc-ranlib
SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SET_MAKE =
SHELL = /bin/sh
STRIP = i586-mingw32msvc-strip
+USE_INCLUDED_LIBINTL = yes
+USE_NLS = yes
VERSION = 1.5.6
WINDRES = /usr/bin/i586-mingw32msvc-windres
+WOE32DLL = no
+XGETTEXT = /usr/bin/xgettext
+XGETTEXT_015 = /usr/bin/xgettext
abs_builddir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
abs_srcdir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
abs_top_builddir = /home/dbruce/tux4kids/tuxmath/trunk
Modified: tuxmath/trunk/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.am 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/data/missions/lessons/Makefile.am 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,7 +1,8 @@
## Makefile.am for tuxmath - data/missions/lessons:
## Process with Automake to create Makefile.in
-EXTRA_DIST = lesson00 \
+EXTRA_DIST = lessons_desc \
+ lesson00 \
lesson01 \
lesson02 \
lesson03 \
Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/docs/changelog 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,11 +1,9 @@
-2007.Oct.13 (svn.debian.org/tux4kids - revision 301)
+2007.Oct.19 (svn.debian.org/tux4kids - revision 303)
- Version 1.5.6
+ Build:
+ * Work on gettext-related stuff - hope to get i18n supported on all
+ platforms (in progress)
- Graphics:
- * Replaced "Big Tux" with new images from "crystal" version
- of Larry Ewing's Tux; minor tweaking of drawing of Tux in menus.
-
David Bruce <dbruce at tampabay.rr.com>
Deleted: tuxmath/trunk/gettext.h
===================================================================
--- tuxmath/trunk/gettext.h 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/gettext.h 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,265 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
- Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option. */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions. */
-# include <libintl.h>
-
-/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
- the gettext() and ngettext() macros. This is an alternative to calling
- textdomain(), and is useful for libraries. */
-# ifdef DEFAULT_TEXT_DOMAIN
-# undef gettext
-# define gettext(Msgid) \
- dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
-# undef ngettext
-# define ngettext(Msgid1, Msgid2, N) \
- dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
-# endif
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
- chokes if dcgettext is defined as a macro. So include it now, to make
- later inclusions of <locale.h> a NOP. We don't include <libintl.h>
- as well because people using "gettext.h" will not include <libintl.h>,
- and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
- is OK. */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
-/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
- <libintl.h>, which chokes if dcgettext is defined as a macro. So include
- it now, to make later inclusions of <libintl.h> a NOP. */
-#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
-# include <cstdlib>
-# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
-# include <libintl.h>
-# endif
-#endif
-
-/* Disabled NLS.
- The casts to 'const char *' serve the purpose of producing warnings
- for invalid uses of the value returned from these functions.
- On pre-ANSI systems without 'const', the config.h file is supposed to
- contain "#define const". */
-# define gettext(Msgid) ((const char *) (Msgid))
-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-# define ngettext(Msgid1, Msgid2, N) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
- extraction of messages, but does not call gettext(). The run-time
- translation is done at a different place in the code.
- The argument, String, should be a literal string. Concatenated strings
- and other string expressions won't work.
- The macro's expansion is not parenthesized, so that it is suitable as
- initializer for static 'char[]' or 'const char[]' variables. */
-#define gettext_noop(String) String
-
-/* The separator between msgctxt and msgid in a .mo file. */
-#define GETTEXT_CONTEXT_GLUE "\004"
-
-/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
- MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
- short and rarely need to change.
- The letter 'p' stands for 'particular' or 'special'. */
-#ifdef DEFAULT_TEXT_DOMAIN
-# define pgettext(Msgctxt, Msgid) \
- pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#else
-# define pgettext(Msgctxt, Msgid) \
- pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#endif
-#define dpgettext(Domainname, Msgctxt, Msgid) \
- pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
- pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
-#ifdef DEFAULT_TEXT_DOMAIN
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
-#else
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
-#endif
-#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
-#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
- npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-pgettext_aux (const char *domain,
- const char *msg_ctxt_id, const char *msgid,
- int category)
-{
- const char *translation = dcgettext (domain, msg_ctxt_id, category);
- if (translation == msg_ctxt_id)
- return msgid;
- else
- return translation;
-}
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-npgettext_aux (const char *domain,
- const char *msg_ctxt_id, const char *msgid,
- const char *msgid_plural, unsigned long int n,
- int category)
-{
- const char *translation =
- dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
- if (translation == msg_ctxt_id || translation == msgid_plural)
- return (n == 1 ? msgid : msgid_plural);
- else
- return translation;
-}
-
-/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID
- can be arbitrary expressions. But for string literals these macros are
- less efficient than those above. */
-
-#include <string.h>
-
-#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
- (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ )
-
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-#include <stdlib.h>
-#endif
-
-#define pgettext_expr(Msgctxt, Msgid) \
- dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
-#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
- dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-dcpgettext_expr (const char *domain,
- const char *msgctxt, const char *msgid,
- int category)
-{
- size_t msgctxt_len = strlen (msgctxt) + 1;
- size_t msgid_len = strlen (msgid) + 1;
- const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
- char msg_ctxt_id[msgctxt_len + msgid_len];
-#else
- char buf[1024];
- char *msg_ctxt_id =
- (msgctxt_len + msgid_len <= sizeof (buf)
- ? buf
- : (char *) malloc (msgctxt_len + msgid_len));
- if (msg_ctxt_id != NULL)
-#endif
- {
- memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
- msg_ctxt_id[msgctxt_len - 1] = '\004';
- memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
- translation = dcgettext (domain, msg_ctxt_id, category);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
- if (msg_ctxt_id != buf)
- free (msg_ctxt_id);
-#endif
- if (translation != msg_ctxt_id)
- return translation;
- }
- return msgid;
-}
-
-#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
- dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
-#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
- dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-dcnpgettext_expr (const char *domain,
- const char *msgctxt, const char *msgid,
- const char *msgid_plural, unsigned long int n,
- int category)
-{
- size_t msgctxt_len = strlen (msgctxt) + 1;
- size_t msgid_len = strlen (msgid) + 1;
- const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
- char msg_ctxt_id[msgctxt_len + msgid_len];
-#else
- char buf[1024];
- char *msg_ctxt_id =
- (msgctxt_len + msgid_len <= sizeof (buf)
- ? buf
- : (char *) malloc (msgctxt_len + msgid_len));
- if (msg_ctxt_id != NULL)
-#endif
- {
- memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
- msg_ctxt_id[msgctxt_len - 1] = '\004';
- memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
- translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
- if (msg_ctxt_id != buf)
- free (msg_ctxt_id);
-#endif
- if (!(translation == msg_ctxt_id || translation == msgid_plural))
- return translation;
- }
- return (n == 1 ? msgid : msgid_plural);
-}
-
-#endif /* _LIBGETTEXT_H */
Modified: tuxmath/trunk/intl/localename.c
===================================================================
--- tuxmath/trunk/intl/localename.c 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/intl/localename.c 2007-10-19 16:37:30 UTC (rev 303)
@@ -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:
Added: tuxmath/trunk/notesblurb
===================================================================
--- tuxmath/trunk/notesblurb (rev 0)
+++ tuxmath/trunk/notesblurb 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,3 @@
+Source tar.gz archive for TuxMath 1.5.6, including the Andika font. Suitable for installation on Unix-style systems using a simple "./configure; make; make install".
+
+Build requires the *-dev files for SDL, SDL_image, SDL_mixer, and SDL_ttf. Gnu gettext required for installation. All of these should be easily available in most Gnu-Linux distributions. The Gnu Autotools are not needed to build from this package.
\ No newline at end of file
Added: tuxmath/trunk/po/LINGUAS
===================================================================
--- tuxmath/trunk/po/LINGUAS (rev 0)
+++ tuxmath/trunk/po/LINGUAS 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,3 @@
+# Set of available languages.
+nn
+nb
Modified: tuxmath/trunk/po/Makevars
===================================================================
--- tuxmath/trunk/po/Makevars 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/po/Makevars 2007-10-19 16:37:30 UTC (rev 303)
@@ -18,7 +18,7 @@
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-COPYRIGHT_HOLDER = Tux4Kids
+COPYRIGHT_HOLDER =
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
Modified: tuxmath/trunk/po/POTFILES.in
===================================================================
--- tuxmath/trunk/po/POTFILES.in 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/po/POTFILES.in 2007-10-19 16:37:30 UTC (rev 303)
@@ -1 +1,4 @@
# List of source files which contain translatable strings.
+src/pause.c
+src/titlescreen.c
+data/missions/lessons/lessons_desc
Added: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po (rev 0)
+++ tuxmath/trunk/po/nb.po 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,534 @@
+# Translation of nb to Norwegian Nynorsk
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Karl Ove Hufthammer <karl at huftis.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: nb\n"
+"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-10-19 11:35-0400\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/pause.c:89
+msgid "Sound Effects Volume"
+msgstr "Lydeffekter"
+
+#: src/pause.c:95
+msgid "Music Volume"
+msgstr "Musikk"
+
+#: src/pause.c:103
+msgid "Sound & Music Disabled"
+msgstr "Lyd og musikk avslått"
+
+#: src/pause.c:110
+msgid "Paused!"
+msgstr "Pause!"
+
+#: src/pause.c:116
+msgid "Press escape again to return to menu"
+msgstr "Trykk «Escape» for å gå tilbake til hovedmenyen."
+
+#: src/pause.c:122
+msgid "Press space bar to return to game"
+msgstr "Trykk mellomromstasten for å gå tilbake til spillet."
+
+#: src/titlescreen.c:446
+msgid "Work In Progress!"
+msgstr "Uferdig!"
+
+#: src/titlescreen.c:447
+msgid "This feature is not ready yet"
+msgstr "Denne funksjonen er ikke klar ennå."
+
+#: src/titlescreen.c:448
+msgid "Discuss the future of TuxMath at"
+msgstr "Diskuter fremtiden til TuxMath på"
+
+#: src/titlescreen.c:449
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:617
+msgid "Math Command Training Academy"
+msgstr "Kadettskole"
+
+#: src/titlescreen.c:618
+msgid "Play Arcade Game"
+msgstr "Spill"
+
+#: src/titlescreen.c:619
+msgid "Play Custom Game"
+msgstr "Selvlaget spill"
+
+#: src/titlescreen.c:620
+msgid "Help"
+msgstr "Hjelp"
+
+#: src/titlescreen.c:621
+msgid "More Options"
+msgstr "Flere valg"
+
+#: src/titlescreen.c:622
+msgid "Quit"
+msgstr "Avslutt"
+
+#: src/titlescreen.c:690
+msgid "Space Cadet"
+msgstr "Romkadett"
+
+#: src/titlescreen.c:691
+msgid "Scout"
+msgstr "Romlærling"
+
+#: src/titlescreen.c:692
+msgid "Ranger"
+msgstr "Romvokter"
+
+#: src/titlescreen.c:693
+msgid "Ace"
+msgstr "Romsjef"
+
+#: src/titlescreen.c:694
+msgid "Hall Of Fame"
+msgstr "Poengliste"
+
+#: src/titlescreen.c:695
+#, fuzzy
+msgid "Main menu"
+msgstr "Hovedmeny"
+
+#: src/titlescreen.c:769
+msgid "Edit 'options' file in your home directory"
+msgstr "Rediger «options»-fila i hjemmemappa di"
+
+#: src/titlescreen.c:770
+msgid "to create customized game!"
+msgstr "for å lage ditt eget spill."
+
+#: src/titlescreen.c:771
+msgid "Press a key or click your mouse to start game."
+msgstr ""
+
+#: src/titlescreen.c:772
+msgid "See README.txt for more information"
+msgstr "Se «README.txt» for mer informasjon."
+
+#: src/titlescreen.c:803
+msgid "Demo"
+msgstr ""
+
+#: src/titlescreen.c:804
+msgid "Project Info"
+msgstr "Prosjektinfo"
+
+#: src/titlescreen.c:805
+msgid "Credits"
+msgstr "Bidragsytere"
+
+#: src/titlescreen.c:806
+msgid "Main Menu"
+msgstr "Hovedmeny"
+
+#: src/titlescreen.c:848
+msgid "TuxMath is free and open-source!"
+msgstr ""
+
+#: src/titlescreen.c:849
+msgid "You can help make it better by reporting problems,"
+msgstr ""
+
+#: src/titlescreen.c:850
+msgid "suggesting improvements, or adding code."
+msgstr ""
+
+#: src/titlescreen.c:851
+#, fuzzy
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/lessons_desc:111
+#: data/missions/lessons/lessons_desc:166
+#: data/missions/lessons/lessons_desc:221
+msgid "Number Typing"
+msgstr "Tallskriving"
+
+#: data/missions/lessons/lessons_desc:112
+#: data/missions/lessons/lessons_desc:167
+#: data/missions/lessons/lessons_desc:222
+msgid "Addition: 1 to 3"
+msgstr "Addisjon: 1 til 3"
+
+#: data/missions/lessons/lessons_desc:113
+#: data/missions/lessons/lessons_desc:168
+#: data/missions/lessons/lessons_desc:223
+msgid "Addition: 0 to 5"
+msgstr "Addisjon: 0 til 5"
+
+#: data/missions/lessons/lessons_desc:114
+msgid "Addition: Sums To 10"
+msgstr "Addisjon: Summer til 10"
+
+#: data/missions/lessons/lessons_desc:115
+msgid "Addition: Sums To 15"
+msgstr "Addisjon: Summer til 15"
+
+#: data/missions/lessons/lessons_desc:116
+msgid "Addition: Sums To 20"
+msgstr "Addisjon: Summer til 20"
+
+#: data/missions/lessons/lessons_desc:117
+#: data/missions/lessons/lessons_desc:172
+#: data/missions/lessons/lessons_desc:227
+msgid "Addition: Two Digit Numbers"
+msgstr "Addisjon: Tosifrede tall"
+
+#: data/missions/lessons/lessons_desc:118
+#: data/missions/lessons/lessons_desc:173
+#: data/missions/lessons/lessons_desc:228
+msgid "Addition: Missing Numbers"
+msgstr "Addisjon: Manglende tall"
+
+#: data/missions/lessons/lessons_desc:119
+#: data/missions/lessons/lessons_desc:174
+#: data/missions/lessons/lessons_desc:229
+msgid "Subtraction: 0 to 10"
+msgstr "Subtraksjon: 0 til 10"
+
+#: data/missions/lessons/lessons_desc:120
+#: data/missions/lessons/lessons_desc:175
+#: data/missions/lessons/lessons_desc:230
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Subtraksjon: Tosifrede tall"
+
+#: data/missions/lessons/lessons_desc:121
+#: data/missions/lessons/lessons_desc:176
+#: data/missions/lessons/lessons_desc:231
+msgid "Addition and Subtraction Review"
+msgstr "Gjennomgang: Addisjon og subtraksjon"
+
+#: data/missions/lessons/lessons_desc:122
+#: data/missions/lessons/lessons_desc:177
+#: data/missions/lessons/lessons_desc:232
+msgid "Multiplication: 0 to 3"
+msgstr "Multiplikasjon: 0 til 3"
+
+#: data/missions/lessons/lessons_desc:123
+#: data/missions/lessons/lessons_desc:178
+#: data/missions/lessons/lessons_desc:233
+msgid "Multiples of 2"
+msgstr "Multiplum av 2"
+
+#: data/missions/lessons/lessons_desc:124
+#: data/missions/lessons/lessons_desc:179
+#: data/missions/lessons/lessons_desc:234
+msgid "Multiples of 3"
+msgstr "Multiplum av 3"
+
+#: data/missions/lessons/lessons_desc:125
+#: data/missions/lessons/lessons_desc:180
+#: data/missions/lessons/lessons_desc:235
+msgid "Multiples of 4"
+msgstr "Multiplum av 4"
+
+#: data/missions/lessons/lessons_desc:126
+#: data/missions/lessons/lessons_desc:181
+#: data/missions/lessons/lessons_desc:236
+msgid "Multiples of 5"
+msgstr "Multiplum av 5"
+
+#: data/missions/lessons/lessons_desc:127
+#: data/missions/lessons/lessons_desc:182
+#: data/missions/lessons/lessons_desc:237
+msgid "Multiplication: 0 to 5"
+msgstr "Multiplikasjon: 0 til 5"
+
+#: data/missions/lessons/lessons_desc:128
+#: data/missions/lessons/lessons_desc:183
+#: data/missions/lessons/lessons_desc:238
+msgid "Multiples of 6"
+msgstr "Multiplum av 6"
+
+#: data/missions/lessons/lessons_desc:129
+#: data/missions/lessons/lessons_desc:184
+#: data/missions/lessons/lessons_desc:239
+msgid "Multiples of 7"
+msgstr "Multiplum av 7"
+
+#: data/missions/lessons/lessons_desc:130
+#: data/missions/lessons/lessons_desc:185
+#: data/missions/lessons/lessons_desc:240
+msgid "Multiplication: 0 to 7"
+msgstr "Multiplikasjon: 0 til 7"
+
+#: data/missions/lessons/lessons_desc:131
+#: data/missions/lessons/lessons_desc:186
+#: data/missions/lessons/lessons_desc:241
+msgid "Multiples of 8"
+msgstr "Multiplum av 8"
+
+#: data/missions/lessons/lessons_desc:132
+#: data/missions/lessons/lessons_desc:187
+#: data/missions/lessons/lessons_desc:242
+msgid "Multiples of 9"
+msgstr "Multiplum av 9"
+
+#: data/missions/lessons/lessons_desc:133
+#: data/missions/lessons/lessons_desc:188
+#: data/missions/lessons/lessons_desc:243
+msgid "Multiples of 10"
+msgstr "Multiplum av 10"
+
+#: data/missions/lessons/lessons_desc:134
+#: data/missions/lessons/lessons_desc:189
+#: data/missions/lessons/lessons_desc:244
+msgid "Multiplication: 0 to 10"
+msgstr "Multiplikasjon: 0 til 10"
+
+#: data/missions/lessons/lessons_desc:135
+#: data/missions/lessons/lessons_desc:190
+#: data/missions/lessons/lessons_desc:245
+msgid "Multiples of 11 and 12"
+msgstr "Multiplum av 11 og 12"
+
+#: data/missions/lessons/lessons_desc:136
+#: data/missions/lessons/lessons_desc:191
+#: data/missions/lessons/lessons_desc:246
+msgid "Multiplication: 0 to 12"
+msgstr "Multiplikasjon: 0 til 12"
+
+#: data/missions/lessons/lessons_desc:137
+#: data/missions/lessons/lessons_desc:192
+#: data/missions/lessons/lessons_desc:247
+msgid "Multiples of 13, 14, and 15"
+msgstr "Multiplum av 13, 14 og 15"
+
+#: data/missions/lessons/lessons_desc:138
+#: data/missions/lessons/lessons_desc:193
+#: data/missions/lessons/lessons_desc:248
+msgid "Multiplication: 0 to 15"
+msgstr "Multiplikasjon: 0 til 15"
+
+#: data/missions/lessons/lessons_desc:139
+#: data/missions/lessons/lessons_desc:194
+#: data/missions/lessons/lessons_desc:249
+msgid "Multiplication: Missing Numbers"
+msgstr "Multiplikasjon: Manglende tall"
+
+#: data/missions/lessons/lessons_desc:140
+#: data/missions/lessons/lessons_desc:195
+#: data/missions/lessons/lessons_desc:250
+msgid "Division by 2"
+msgstr "Divisjon med 2"
+
+#: data/missions/lessons/lessons_desc:141
+#: data/missions/lessons/lessons_desc:196
+#: data/missions/lessons/lessons_desc:251
+msgid "Division by 3"
+msgstr "Divisjon med 3"
+
+#: data/missions/lessons/lessons_desc:142
+#: data/missions/lessons/lessons_desc:197
+#: data/missions/lessons/lessons_desc:252
+msgid "Division by 4"
+msgstr "Divisjon med 4"
+
+#: data/missions/lessons/lessons_desc:143
+#: data/missions/lessons/lessons_desc:198
+#: data/missions/lessons/lessons_desc:253
+msgid "Division by 5"
+msgstr "Divisjon med 5"
+
+#: data/missions/lessons/lessons_desc:144
+#: data/missions/lessons/lessons_desc:199
+#: data/missions/lessons/lessons_desc:254
+msgid "Division: 1 to 5"
+msgstr "Divisjon: 1 til 5"
+
+#: data/missions/lessons/lessons_desc:145
+#: data/missions/lessons/lessons_desc:200
+#: data/missions/lessons/lessons_desc:255
+msgid "Division by 6"
+msgstr "Divisjon med 6"
+
+#: data/missions/lessons/lessons_desc:146
+#: data/missions/lessons/lessons_desc:201
+#: data/missions/lessons/lessons_desc:256
+msgid "Division by 7"
+msgstr "Divisjon med 7"
+
+#: data/missions/lessons/lessons_desc:147
+#: data/missions/lessons/lessons_desc:202
+#: data/missions/lessons/lessons_desc:257
+msgid "Division by 8"
+msgstr "Divisjon med 8"
+
+#: data/missions/lessons/lessons_desc:148
+#: data/missions/lessons/lessons_desc:203
+#: data/missions/lessons/lessons_desc:258
+msgid "Division by 9"
+msgstr "Divisjon med 9"
+
+#: data/missions/lessons/lessons_desc:149
+#: data/missions/lessons/lessons_desc:204
+#: data/missions/lessons/lessons_desc:259
+msgid "Division by 10"
+msgstr "Divisjon med 10"
+
+#: data/missions/lessons/lessons_desc:150
+#: data/missions/lessons/lessons_desc:205
+#: data/missions/lessons/lessons_desc:260
+msgid "Division: 1 to 10"
+msgstr "Divisjon: 1 til 10"
+
+#: data/missions/lessons/lessons_desc:151
+#: data/missions/lessons/lessons_desc:206
+#: data/missions/lessons/lessons_desc:261
+msgid "Division by 11 and 12"
+msgstr "Divisjon med 11 og 12"
+
+#: data/missions/lessons/lessons_desc:152
+#: data/missions/lessons/lessons_desc:207
+#: data/missions/lessons/lessons_desc:262
+msgid "Division: 1 to 12"
+msgstr "Divisjon: 1 til 12"
+
+#: data/missions/lessons/lessons_desc:153
+msgid "Division by 13, 14 and 15"
+msgstr "Divisjon med 13, 14 og 15"
+
+#: data/missions/lessons/lessons_desc:154
+#: data/missions/lessons/lessons_desc:209
+#: data/missions/lessons/lessons_desc:264
+msgid "Division: 1 to 15"
+msgstr "Divisjon: 1 til 15"
+
+#: data/missions/lessons/lessons_desc:155
+msgid "Multiplication/Division Super Review!"
+msgstr "Gjennomgang: Multiplikasjon og divisjon"
+
+#: data/missions/lessons/lessons_desc:156
+#: data/missions/lessons/lessons_desc:211
+#: data/missions/lessons/lessons_desc:266
+msgid "Typing Negative Numbers"
+msgstr "Negative tall"
+
+#: data/missions/lessons/lessons_desc:157
+#: data/missions/lessons/lessons_desc:212
+#: data/missions/lessons/lessons_desc:267
+msgid "Subtraction: Negative Answers"
+msgstr "Subtraksjon: Negative svar"
+
+#: data/missions/lessons/lessons_desc:158
+msgid "Adding Negatives To Positives"
+msgstr "Addisjon av negative til positive tall"
+
+#: data/missions/lessons/lessons_desc:159
+#: data/missions/lessons/lessons_desc:214
+#: data/missions/lessons/lessons_desc:269
+msgid "Subtracting Negatives From Positives"
+msgstr "Subtraksjon av negative fra positive tall"
+
+#: data/missions/lessons/lessons_desc:160
+msgid "Adding Negatives To Negatives"
+msgstr "Addisjon av negative til negative tall"
+
+#: data/missions/lessons/lessons_desc:161
+#: data/missions/lessons/lessons_desc:216
+#: data/missions/lessons/lessons_desc:271
+msgid "Subtracting Negatives From Negatives"
+msgstr "Subtraksjon av negative fra negative tall"
+
+#: data/missions/lessons/lessons_desc:162
+msgid "Neg/Pos Review"
+msgstr "Gjennomgang: Negative og positive tall"
+
+#: data/missions/lessons/lessons_desc:163
+msgid "Multiplication And Division Of Negatives"
+msgstr "Multiplikasjon og divisjon av negative tall"
+
+#: data/missions/lessons/lessons_desc:164
+msgid "Multiplication Of Positives And Negatives"
+msgstr "Multiplikasjon av positive og negative tall"
+
+#: data/missions/lessons/lessons_desc:165
+msgid "Division Of Positives And Negatives"
+msgstr "Divisjon av positive og negative tall"
+
+#: data/missions/lessons/lessons_desc:169
+#: data/missions/lessons/lessons_desc:224
+msgid "Addition: Sums to 10"
+msgstr "Addisjon: Summer til 10"
+
+#: data/missions/lessons/lessons_desc:170
+#: data/missions/lessons/lessons_desc:225
+msgid "Addition: Sums to 15"
+msgstr "Addisjon: Summer til 15"
+
+#: data/missions/lessons/lessons_desc:171
+#: data/missions/lessons/lessons_desc:226
+msgid "Addition: Sums to 20"
+msgstr "Addisjon: Summer til 20"
+
+#: data/missions/lessons/lessons_desc:208
+#: data/missions/lessons/lessons_desc:263
+msgid "Division by 13, 14, and 15"
+msgstr "Divisjon med 13, 14 og 15"
+
+#: data/missions/lessons/lessons_desc:210
+#: data/missions/lessons/lessons_desc:265
+msgid "Multiplication and Division Review"
+msgstr "Gjennomgang: Multiplikasjon og divisjon"
+
+#: data/missions/lessons/lessons_desc:213
+#: data/missions/lessons/lessons_desc:268
+msgid "Adding Negatives to Positives"
+msgstr "Addisjon av negative til positive tall"
+
+#: data/missions/lessons/lessons_desc:215
+#: data/missions/lessons/lessons_desc:270
+msgid "Adding Negatives to Negatives"
+msgstr "Addisjon av negative til negative tall"
+
+#: data/missions/lessons/lessons_desc:217
+#: data/missions/lessons/lessons_desc:272
+msgid "Negative and Positive Numbers Review"
+msgstr "Gjennomgang: Negative og positive tall"
+
+#: data/missions/lessons/lessons_desc:218
+#: data/missions/lessons/lessons_desc:273
+msgid "Multiplication and Division of Negatives"
+msgstr "Multiplikasjon og divisjon av negative tall"
+
+#: data/missions/lessons/lessons_desc:219
+#: data/missions/lessons/lessons_desc:274
+msgid "Multiplication of Positives and Negatives"
+msgstr "Multiplikasjon av positive og negative tall"
+
+#: data/missions/lessons/lessons_desc:220
+#: data/missions/lessons/lessons_desc:275
+msgid "Division of Positives and Negatives"
+msgstr "Divisjon av positive og negative tall"
+
+#~ msgid "Settings"
+#~ msgstr "Oppsett"
+
+#~ msgid "Speed"
+#~ msgstr "Fart"
+
+#~ msgid "Sound"
+#~ msgstr "Lyd"
+
+#~ msgid "Graphics"
+#~ msgstr "Grafikk"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Avanserte valg"
Added: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po (rev 0)
+++ tuxmath/trunk/po/nn.po 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,534 @@
+# Translation of nn to Norwegian Nynorsk
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Karl Ove Hufthammer <karl at huftis.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: nn\n"
+"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-10-19 11:35-0400\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/pause.c:89
+msgid "Sound Effects Volume"
+msgstr "Lydeffektar"
+
+#: src/pause.c:95
+msgid "Music Volume"
+msgstr "Musikk"
+
+#: src/pause.c:103
+msgid "Sound & Music Disabled"
+msgstr "Lyd og musikk avslått"
+
+#: src/pause.c:110
+msgid "Paused!"
+msgstr "Pause!"
+
+#: src/pause.c:116
+msgid "Press escape again to return to menu"
+msgstr "Trykk «Escape» for å gå tilbake til hovudmenyen."
+
+#: src/pause.c:122
+msgid "Press space bar to return to game"
+msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
+
+#: src/titlescreen.c:446
+msgid "Work In Progress!"
+msgstr "Uferdig!"
+
+#: src/titlescreen.c:447
+msgid "This feature is not ready yet"
+msgstr "Denne funksjonen er ikkje klar enno."
+
+#: src/titlescreen.c:448
+msgid "Discuss the future of TuxMath at"
+msgstr "Diskuter framtida til TuxMath på"
+
+#: src/titlescreen.c:449
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:617
+msgid "Math Command Training Academy"
+msgstr "Kadettskule"
+
+#: src/titlescreen.c:618
+msgid "Play Arcade Game"
+msgstr "Spel"
+
+#: src/titlescreen.c:619
+msgid "Play Custom Game"
+msgstr "Sjølvlaga spel"
+
+#: src/titlescreen.c:620
+msgid "Help"
+msgstr "Hjelp"
+
+#: src/titlescreen.c:621
+msgid "More Options"
+msgstr "Fleire val"
+
+#: src/titlescreen.c:622
+msgid "Quit"
+msgstr "Avslutt"
+
+#: src/titlescreen.c:690
+msgid "Space Cadet"
+msgstr "Romkadett"
+
+#: src/titlescreen.c:691
+msgid "Scout"
+msgstr "Romlærling"
+
+#: src/titlescreen.c:692
+msgid "Ranger"
+msgstr "Romvaktar"
+
+#: src/titlescreen.c:693
+msgid "Ace"
+msgstr "Romsjef"
+
+#: src/titlescreen.c:694
+msgid "Hall Of Fame"
+msgstr "Poengliste"
+
+#: src/titlescreen.c:695
+#, fuzzy
+msgid "Main menu"
+msgstr "Hovudmeny"
+
+#: src/titlescreen.c:769
+msgid "Edit 'options' file in your home directory"
+msgstr "Rediger «options»-fila i heimemappa di"
+
+#: src/titlescreen.c:770
+msgid "to create customized game!"
+msgstr "for å laga ditt eige spel."
+
+#: src/titlescreen.c:771
+msgid "Press a key or click your mouse to start game."
+msgstr ""
+
+#: src/titlescreen.c:772
+msgid "See README.txt for more information"
+msgstr "Sjå «README.txt» for meir informasjon."
+
+#: src/titlescreen.c:803
+msgid "Demo"
+msgstr ""
+
+#: src/titlescreen.c:804
+msgid "Project Info"
+msgstr "Prosjektinfo"
+
+#: src/titlescreen.c:805
+msgid "Credits"
+msgstr "Bidragsytarar"
+
+#: src/titlescreen.c:806
+msgid "Main Menu"
+msgstr "Hovudmeny"
+
+#: src/titlescreen.c:848
+msgid "TuxMath is free and open-source!"
+msgstr ""
+
+#: src/titlescreen.c:849
+msgid "You can help make it better by reporting problems,"
+msgstr ""
+
+#: src/titlescreen.c:850
+msgid "suggesting improvements, or adding code."
+msgstr ""
+
+#: src/titlescreen.c:851
+#, fuzzy
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/lessons_desc:111
+#: data/missions/lessons/lessons_desc:166
+#: data/missions/lessons/lessons_desc:221
+msgid "Number Typing"
+msgstr "Talskriving"
+
+#: data/missions/lessons/lessons_desc:112
+#: data/missions/lessons/lessons_desc:167
+#: data/missions/lessons/lessons_desc:222
+msgid "Addition: 1 to 3"
+msgstr "Addisjon: 1 til 3"
+
+#: data/missions/lessons/lessons_desc:113
+#: data/missions/lessons/lessons_desc:168
+#: data/missions/lessons/lessons_desc:223
+msgid "Addition: 0 to 5"
+msgstr "Addisjon: 0 til 5"
+
+#: data/missions/lessons/lessons_desc:114
+msgid "Addition: Sums To 10"
+msgstr "Addisjon: Summar til 10"
+
+#: data/missions/lessons/lessons_desc:115
+msgid "Addition: Sums To 15"
+msgstr "Addisjon: Summar til 15"
+
+#: data/missions/lessons/lessons_desc:116
+msgid "Addition: Sums To 20"
+msgstr "Addisjon: Summar til 20"
+
+#: data/missions/lessons/lessons_desc:117
+#: data/missions/lessons/lessons_desc:172
+#: data/missions/lessons/lessons_desc:227
+msgid "Addition: Two Digit Numbers"
+msgstr "Addisjon: Tosifra tal"
+
+#: data/missions/lessons/lessons_desc:118
+#: data/missions/lessons/lessons_desc:173
+#: data/missions/lessons/lessons_desc:228
+msgid "Addition: Missing Numbers"
+msgstr "Addisjon: Manglande tal"
+
+#: data/missions/lessons/lessons_desc:119
+#: data/missions/lessons/lessons_desc:174
+#: data/missions/lessons/lessons_desc:229
+msgid "Subtraction: 0 to 10"
+msgstr "Subtraksjon: 0 til 10"
+
+#: data/missions/lessons/lessons_desc:120
+#: data/missions/lessons/lessons_desc:175
+#: data/missions/lessons/lessons_desc:230
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Subtraksjon: Tosifra tal"
+
+#: data/missions/lessons/lessons_desc:121
+#: data/missions/lessons/lessons_desc:176
+#: data/missions/lessons/lessons_desc:231
+msgid "Addition and Subtraction Review"
+msgstr "Gjennomgang: Addisjon og subtraksjon"
+
+#: data/missions/lessons/lessons_desc:122
+#: data/missions/lessons/lessons_desc:177
+#: data/missions/lessons/lessons_desc:232
+msgid "Multiplication: 0 to 3"
+msgstr "Multiplikasjon: 0 til 3"
+
+#: data/missions/lessons/lessons_desc:123
+#: data/missions/lessons/lessons_desc:178
+#: data/missions/lessons/lessons_desc:233
+msgid "Multiples of 2"
+msgstr "Multiplum av 2"
+
+#: data/missions/lessons/lessons_desc:124
+#: data/missions/lessons/lessons_desc:179
+#: data/missions/lessons/lessons_desc:234
+msgid "Multiples of 3"
+msgstr "Multiplum av 3"
+
+#: data/missions/lessons/lessons_desc:125
+#: data/missions/lessons/lessons_desc:180
+#: data/missions/lessons/lessons_desc:235
+msgid "Multiples of 4"
+msgstr "Multiplum av 4"
+
+#: data/missions/lessons/lessons_desc:126
+#: data/missions/lessons/lessons_desc:181
+#: data/missions/lessons/lessons_desc:236
+msgid "Multiples of 5"
+msgstr "Multiplum av 5"
+
+#: data/missions/lessons/lessons_desc:127
+#: data/missions/lessons/lessons_desc:182
+#: data/missions/lessons/lessons_desc:237
+msgid "Multiplication: 0 to 5"
+msgstr "Multiplikasjon: 0 til 5"
+
+#: data/missions/lessons/lessons_desc:128
+#: data/missions/lessons/lessons_desc:183
+#: data/missions/lessons/lessons_desc:238
+msgid "Multiples of 6"
+msgstr "Multiplum av 6"
+
+#: data/missions/lessons/lessons_desc:129
+#: data/missions/lessons/lessons_desc:184
+#: data/missions/lessons/lessons_desc:239
+msgid "Multiples of 7"
+msgstr "Multiplum av 7"
+
+#: data/missions/lessons/lessons_desc:130
+#: data/missions/lessons/lessons_desc:185
+#: data/missions/lessons/lessons_desc:240
+msgid "Multiplication: 0 to 7"
+msgstr "Multiplikasjon: 0 til 7"
+
+#: data/missions/lessons/lessons_desc:131
+#: data/missions/lessons/lessons_desc:186
+#: data/missions/lessons/lessons_desc:241
+msgid "Multiples of 8"
+msgstr "Multiplum av 8"
+
+#: data/missions/lessons/lessons_desc:132
+#: data/missions/lessons/lessons_desc:187
+#: data/missions/lessons/lessons_desc:242
+msgid "Multiples of 9"
+msgstr "Multiplum av 9"
+
+#: data/missions/lessons/lessons_desc:133
+#: data/missions/lessons/lessons_desc:188
+#: data/missions/lessons/lessons_desc:243
+msgid "Multiples of 10"
+msgstr "Multiplum av 10"
+
+#: data/missions/lessons/lessons_desc:134
+#: data/missions/lessons/lessons_desc:189
+#: data/missions/lessons/lessons_desc:244
+msgid "Multiplication: 0 to 10"
+msgstr "Multiplikasjon: 0 til 10"
+
+#: data/missions/lessons/lessons_desc:135
+#: data/missions/lessons/lessons_desc:190
+#: data/missions/lessons/lessons_desc:245
+msgid "Multiples of 11 and 12"
+msgstr "Multiplum av 11 og 12"
+
+#: data/missions/lessons/lessons_desc:136
+#: data/missions/lessons/lessons_desc:191
+#: data/missions/lessons/lessons_desc:246
+msgid "Multiplication: 0 to 12"
+msgstr "Multiplikasjon: 0 til 12"
+
+#: data/missions/lessons/lessons_desc:137
+#: data/missions/lessons/lessons_desc:192
+#: data/missions/lessons/lessons_desc:247
+msgid "Multiples of 13, 14, and 15"
+msgstr "Multiplum av 13, 14 og 15"
+
+#: data/missions/lessons/lessons_desc:138
+#: data/missions/lessons/lessons_desc:193
+#: data/missions/lessons/lessons_desc:248
+msgid "Multiplication: 0 to 15"
+msgstr "Multiplikasjon: 0 til 15"
+
+#: data/missions/lessons/lessons_desc:139
+#: data/missions/lessons/lessons_desc:194
+#: data/missions/lessons/lessons_desc:249
+msgid "Multiplication: Missing Numbers"
+msgstr "Multiplikasjon: Manglande tal"
+
+#: data/missions/lessons/lessons_desc:140
+#: data/missions/lessons/lessons_desc:195
+#: data/missions/lessons/lessons_desc:250
+msgid "Division by 2"
+msgstr "Divisjon med 2"
+
+#: data/missions/lessons/lessons_desc:141
+#: data/missions/lessons/lessons_desc:196
+#: data/missions/lessons/lessons_desc:251
+msgid "Division by 3"
+msgstr "Divisjon med 3"
+
+#: data/missions/lessons/lessons_desc:142
+#: data/missions/lessons/lessons_desc:197
+#: data/missions/lessons/lessons_desc:252
+msgid "Division by 4"
+msgstr "Divisjon med 4"
+
+#: data/missions/lessons/lessons_desc:143
+#: data/missions/lessons/lessons_desc:198
+#: data/missions/lessons/lessons_desc:253
+msgid "Division by 5"
+msgstr "Divisjon med 5"
+
+#: data/missions/lessons/lessons_desc:144
+#: data/missions/lessons/lessons_desc:199
+#: data/missions/lessons/lessons_desc:254
+msgid "Division: 1 to 5"
+msgstr "Divisjon: 1 til 5"
+
+#: data/missions/lessons/lessons_desc:145
+#: data/missions/lessons/lessons_desc:200
+#: data/missions/lessons/lessons_desc:255
+msgid "Division by 6"
+msgstr "Divisjon med 6"
+
+#: data/missions/lessons/lessons_desc:146
+#: data/missions/lessons/lessons_desc:201
+#: data/missions/lessons/lessons_desc:256
+msgid "Division by 7"
+msgstr "Divisjon med 7"
+
+#: data/missions/lessons/lessons_desc:147
+#: data/missions/lessons/lessons_desc:202
+#: data/missions/lessons/lessons_desc:257
+msgid "Division by 8"
+msgstr "Divisjon med 8"
+
+#: data/missions/lessons/lessons_desc:148
+#: data/missions/lessons/lessons_desc:203
+#: data/missions/lessons/lessons_desc:258
+msgid "Division by 9"
+msgstr "Divisjon med 9"
+
+#: data/missions/lessons/lessons_desc:149
+#: data/missions/lessons/lessons_desc:204
+#: data/missions/lessons/lessons_desc:259
+msgid "Division by 10"
+msgstr "Divisjon med 10"
+
+#: data/missions/lessons/lessons_desc:150
+#: data/missions/lessons/lessons_desc:205
+#: data/missions/lessons/lessons_desc:260
+msgid "Division: 1 to 10"
+msgstr "Divisjon: 1 til 10"
+
+#: data/missions/lessons/lessons_desc:151
+#: data/missions/lessons/lessons_desc:206
+#: data/missions/lessons/lessons_desc:261
+msgid "Division by 11 and 12"
+msgstr "Divisjon med 11 og 12"
+
+#: data/missions/lessons/lessons_desc:152
+#: data/missions/lessons/lessons_desc:207
+#: data/missions/lessons/lessons_desc:262
+msgid "Division: 1 to 12"
+msgstr "Divisjon: 1 til 12"
+
+#: data/missions/lessons/lessons_desc:153
+msgid "Division by 13, 14 and 15"
+msgstr "Divisjon med 13, 14 og 15"
+
+#: data/missions/lessons/lessons_desc:154
+#: data/missions/lessons/lessons_desc:209
+#: data/missions/lessons/lessons_desc:264
+msgid "Division: 1 to 15"
+msgstr "Divisjon: 1 til 15"
+
+#: data/missions/lessons/lessons_desc:155
+msgid "Multiplication/Division Super Review!"
+msgstr "Gjennomgang: Multiplikasjon og divisjon"
+
+#: data/missions/lessons/lessons_desc:156
+#: data/missions/lessons/lessons_desc:211
+#: data/missions/lessons/lessons_desc:266
+msgid "Typing Negative Numbers"
+msgstr "Negative tal"
+
+#: data/missions/lessons/lessons_desc:157
+#: data/missions/lessons/lessons_desc:212
+#: data/missions/lessons/lessons_desc:267
+msgid "Subtraction: Negative Answers"
+msgstr "Subtraksjon: Negative svar"
+
+#: data/missions/lessons/lessons_desc:158
+msgid "Adding Negatives To Positives"
+msgstr "Addisjon av negative til positive tal"
+
+#: data/missions/lessons/lessons_desc:159
+#: data/missions/lessons/lessons_desc:214
+#: data/missions/lessons/lessons_desc:269
+msgid "Subtracting Negatives From Positives"
+msgstr "Subtraksjon av negative frå positive tal"
+
+#: data/missions/lessons/lessons_desc:160
+msgid "Adding Negatives To Negatives"
+msgstr "Addisjon av negative til negative tal"
+
+#: data/missions/lessons/lessons_desc:161
+#: data/missions/lessons/lessons_desc:216
+#: data/missions/lessons/lessons_desc:271
+msgid "Subtracting Negatives From Negatives"
+msgstr "Subtraksjon av negative frå negative tal"
+
+#: data/missions/lessons/lessons_desc:162
+msgid "Neg/Pos Review"
+msgstr "Gjennomgang: Negative og positive tal"
+
+#: data/missions/lessons/lessons_desc:163
+msgid "Multiplication And Division Of Negatives"
+msgstr "Multiplikasjon og divisjon av negative tal"
+
+#: data/missions/lessons/lessons_desc:164
+msgid "Multiplication Of Positives And Negatives"
+msgstr "Multiplikasjon av positive og negative tal"
+
+#: data/missions/lessons/lessons_desc:165
+msgid "Division Of Positives And Negatives"
+msgstr "Divisjon av positive og negative tal"
+
+#: data/missions/lessons/lessons_desc:169
+#: data/missions/lessons/lessons_desc:224
+msgid "Addition: Sums to 10"
+msgstr "Addisjon: Summar til 10"
+
+#: data/missions/lessons/lessons_desc:170
+#: data/missions/lessons/lessons_desc:225
+msgid "Addition: Sums to 15"
+msgstr "Addisjon: Summar til 15"
+
+#: data/missions/lessons/lessons_desc:171
+#: data/missions/lessons/lessons_desc:226
+msgid "Addition: Sums to 20"
+msgstr "Addisjon: Summar til 20"
+
+#: data/missions/lessons/lessons_desc:208
+#: data/missions/lessons/lessons_desc:263
+msgid "Division by 13, 14, and 15"
+msgstr "Divisjon med 13, 14 og 15"
+
+#: data/missions/lessons/lessons_desc:210
+#: data/missions/lessons/lessons_desc:265
+msgid "Multiplication and Division Review"
+msgstr "Gjennomgang: Multiplikasjon og divisjon"
+
+#: data/missions/lessons/lessons_desc:213
+#: data/missions/lessons/lessons_desc:268
+msgid "Adding Negatives to Positives"
+msgstr "Addisjon av negative til positive tal"
+
+#: data/missions/lessons/lessons_desc:215
+#: data/missions/lessons/lessons_desc:270
+msgid "Adding Negatives to Negatives"
+msgstr "Addisjon av negative til negative tal"
+
+#: data/missions/lessons/lessons_desc:217
+#: data/missions/lessons/lessons_desc:272
+msgid "Negative and Positive Numbers Review"
+msgstr "Gjennomgang: Negative og positive tal"
+
+#: data/missions/lessons/lessons_desc:218
+#: data/missions/lessons/lessons_desc:273
+msgid "Multiplication and Division of Negatives"
+msgstr "Multiplikasjon og divisjon av negative tal"
+
+#: data/missions/lessons/lessons_desc:219
+#: data/missions/lessons/lessons_desc:274
+msgid "Multiplication of Positives and Negatives"
+msgstr "Multiplikasjon av positive og negative tal"
+
+#: data/missions/lessons/lessons_desc:220
+#: data/missions/lessons/lessons_desc:275
+msgid "Division of Positives and Negatives"
+msgstr "Divisjon av positive og negative tal"
+
+#~ msgid "Settings"
+#~ msgstr "Oppsett"
+
+#~ msgid "Speed"
+#~ msgstr "Fart"
+
+#~ msgid "Sound"
+#~ msgstr "Lyd"
+
+#~ msgid "Graphics"
+#~ msgstr "Grafikk"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Avanserte val"
Added: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot (rev 0)
+++ tuxmath/trunk/po/tuxmath.pot 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,515 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-10-19 11:35-0400\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/pause.c:89
+msgid "Sound Effects Volume"
+msgstr ""
+
+#: src/pause.c:95
+msgid "Music Volume"
+msgstr ""
+
+#: src/pause.c:103
+msgid "Sound & Music Disabled"
+msgstr ""
+
+#: src/pause.c:110
+msgid "Paused!"
+msgstr ""
+
+#: src/pause.c:116
+msgid "Press escape again to return to menu"
+msgstr ""
+
+#: src/pause.c:122
+msgid "Press space bar to return to game"
+msgstr ""
+
+#: src/titlescreen.c:446
+msgid "Work In Progress!"
+msgstr ""
+
+#: src/titlescreen.c:447
+msgid "This feature is not ready yet"
+msgstr ""
+
+#: src/titlescreen.c:448
+msgid "Discuss the future of TuxMath at"
+msgstr ""
+
+#: src/titlescreen.c:449
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr ""
+
+#: src/titlescreen.c:617
+msgid "Math Command Training Academy"
+msgstr ""
+
+#: src/titlescreen.c:618
+msgid "Play Arcade Game"
+msgstr ""
+
+#: src/titlescreen.c:619
+msgid "Play Custom Game"
+msgstr ""
+
+#: src/titlescreen.c:620
+msgid "Help"
+msgstr ""
+
+#: src/titlescreen.c:621
+msgid "More Options"
+msgstr ""
+
+#: src/titlescreen.c:622
+msgid "Quit"
+msgstr ""
+
+#: src/titlescreen.c:690
+msgid "Space Cadet"
+msgstr ""
+
+#: src/titlescreen.c:691
+msgid "Scout"
+msgstr ""
+
+#: src/titlescreen.c:692
+msgid "Ranger"
+msgstr ""
+
+#: src/titlescreen.c:693
+msgid "Ace"
+msgstr ""
+
+#: src/titlescreen.c:694
+msgid "Hall Of Fame"
+msgstr ""
+
+#: src/titlescreen.c:695
+msgid "Main menu"
+msgstr ""
+
+#: src/titlescreen.c:769
+msgid "Edit 'options' file in your home directory"
+msgstr ""
+
+#: src/titlescreen.c:770
+msgid "to create customized game!"
+msgstr ""
+
+#: src/titlescreen.c:771
+msgid "Press a key or click your mouse to start game."
+msgstr ""
+
+#: src/titlescreen.c:772
+msgid "See README.txt for more information"
+msgstr ""
+
+#: src/titlescreen.c:803
+msgid "Demo"
+msgstr ""
+
+#: src/titlescreen.c:804
+msgid "Project Info"
+msgstr ""
+
+#: src/titlescreen.c:805
+msgid "Credits"
+msgstr ""
+
+#: src/titlescreen.c:806
+msgid "Main Menu"
+msgstr ""
+
+#: src/titlescreen.c:848
+msgid "TuxMath is free and open-source!"
+msgstr ""
+
+#: src/titlescreen.c:849
+msgid "You can help make it better by reporting problems,"
+msgstr ""
+
+#: src/titlescreen.c:850
+msgid "suggesting improvements, or adding code."
+msgstr ""
+
+#: src/titlescreen.c:851
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:111
+#: data/missions/lessons/lessons_desc:166
+#: data/missions/lessons/lessons_desc:221
+msgid "Number Typing"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:112
+#: data/missions/lessons/lessons_desc:167
+#: data/missions/lessons/lessons_desc:222
+msgid "Addition: 1 to 3"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:113
+#: data/missions/lessons/lessons_desc:168
+#: data/missions/lessons/lessons_desc:223
+msgid "Addition: 0 to 5"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:114
+msgid "Addition: Sums To 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:115
+msgid "Addition: Sums To 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:116
+msgid "Addition: Sums To 20"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:117
+#: data/missions/lessons/lessons_desc:172
+#: data/missions/lessons/lessons_desc:227
+msgid "Addition: Two Digit Numbers"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:118
+#: data/missions/lessons/lessons_desc:173
+#: data/missions/lessons/lessons_desc:228
+msgid "Addition: Missing Numbers"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:119
+#: data/missions/lessons/lessons_desc:174
+#: data/missions/lessons/lessons_desc:229
+msgid "Subtraction: 0 to 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:120
+#: data/missions/lessons/lessons_desc:175
+#: data/missions/lessons/lessons_desc:230
+msgid "Subtraction: Two Digit Numbers"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:121
+#: data/missions/lessons/lessons_desc:176
+#: data/missions/lessons/lessons_desc:231
+msgid "Addition and Subtraction Review"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:122
+#: data/missions/lessons/lessons_desc:177
+#: data/missions/lessons/lessons_desc:232
+msgid "Multiplication: 0 to 3"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:123
+#: data/missions/lessons/lessons_desc:178
+#: data/missions/lessons/lessons_desc:233
+msgid "Multiples of 2"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:124
+#: data/missions/lessons/lessons_desc:179
+#: data/missions/lessons/lessons_desc:234
+msgid "Multiples of 3"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:125
+#: data/missions/lessons/lessons_desc:180
+#: data/missions/lessons/lessons_desc:235
+msgid "Multiples of 4"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:126
+#: data/missions/lessons/lessons_desc:181
+#: data/missions/lessons/lessons_desc:236
+msgid "Multiples of 5"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:127
+#: data/missions/lessons/lessons_desc:182
+#: data/missions/lessons/lessons_desc:237
+msgid "Multiplication: 0 to 5"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:128
+#: data/missions/lessons/lessons_desc:183
+#: data/missions/lessons/lessons_desc:238
+msgid "Multiples of 6"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:129
+#: data/missions/lessons/lessons_desc:184
+#: data/missions/lessons/lessons_desc:239
+msgid "Multiples of 7"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:130
+#: data/missions/lessons/lessons_desc:185
+#: data/missions/lessons/lessons_desc:240
+msgid "Multiplication: 0 to 7"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:131
+#: data/missions/lessons/lessons_desc:186
+#: data/missions/lessons/lessons_desc:241
+msgid "Multiples of 8"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:132
+#: data/missions/lessons/lessons_desc:187
+#: data/missions/lessons/lessons_desc:242
+msgid "Multiples of 9"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:133
+#: data/missions/lessons/lessons_desc:188
+#: data/missions/lessons/lessons_desc:243
+msgid "Multiples of 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:134
+#: data/missions/lessons/lessons_desc:189
+#: data/missions/lessons/lessons_desc:244
+msgid "Multiplication: 0 to 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:135
+#: data/missions/lessons/lessons_desc:190
+#: data/missions/lessons/lessons_desc:245
+msgid "Multiples of 11 and 12"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:136
+#: data/missions/lessons/lessons_desc:191
+#: data/missions/lessons/lessons_desc:246
+msgid "Multiplication: 0 to 12"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:137
+#: data/missions/lessons/lessons_desc:192
+#: data/missions/lessons/lessons_desc:247
+msgid "Multiples of 13, 14, and 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:138
+#: data/missions/lessons/lessons_desc:193
+#: data/missions/lessons/lessons_desc:248
+msgid "Multiplication: 0 to 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:139
+#: data/missions/lessons/lessons_desc:194
+#: data/missions/lessons/lessons_desc:249
+msgid "Multiplication: Missing Numbers"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:140
+#: data/missions/lessons/lessons_desc:195
+#: data/missions/lessons/lessons_desc:250
+msgid "Division by 2"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:141
+#: data/missions/lessons/lessons_desc:196
+#: data/missions/lessons/lessons_desc:251
+msgid "Division by 3"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:142
+#: data/missions/lessons/lessons_desc:197
+#: data/missions/lessons/lessons_desc:252
+msgid "Division by 4"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:143
+#: data/missions/lessons/lessons_desc:198
+#: data/missions/lessons/lessons_desc:253
+msgid "Division by 5"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:144
+#: data/missions/lessons/lessons_desc:199
+#: data/missions/lessons/lessons_desc:254
+msgid "Division: 1 to 5"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:145
+#: data/missions/lessons/lessons_desc:200
+#: data/missions/lessons/lessons_desc:255
+msgid "Division by 6"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:146
+#: data/missions/lessons/lessons_desc:201
+#: data/missions/lessons/lessons_desc:256
+msgid "Division by 7"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:147
+#: data/missions/lessons/lessons_desc:202
+#: data/missions/lessons/lessons_desc:257
+msgid "Division by 8"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:148
+#: data/missions/lessons/lessons_desc:203
+#: data/missions/lessons/lessons_desc:258
+msgid "Division by 9"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:149
+#: data/missions/lessons/lessons_desc:204
+#: data/missions/lessons/lessons_desc:259
+msgid "Division by 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:150
+#: data/missions/lessons/lessons_desc:205
+#: data/missions/lessons/lessons_desc:260
+msgid "Division: 1 to 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:151
+#: data/missions/lessons/lessons_desc:206
+#: data/missions/lessons/lessons_desc:261
+msgid "Division by 11 and 12"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:152
+#: data/missions/lessons/lessons_desc:207
+#: data/missions/lessons/lessons_desc:262
+msgid "Division: 1 to 12"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:153
+msgid "Division by 13, 14 and 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:154
+#: data/missions/lessons/lessons_desc:209
+#: data/missions/lessons/lessons_desc:264
+msgid "Division: 1 to 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:155
+msgid "Multiplication/Division Super Review!"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:156
+#: data/missions/lessons/lessons_desc:211
+#: data/missions/lessons/lessons_desc:266
+msgid "Typing Negative Numbers"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:157
+#: data/missions/lessons/lessons_desc:212
+#: data/missions/lessons/lessons_desc:267
+msgid "Subtraction: Negative Answers"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:158
+msgid "Adding Negatives To Positives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:159
+#: data/missions/lessons/lessons_desc:214
+#: data/missions/lessons/lessons_desc:269
+msgid "Subtracting Negatives From Positives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:160
+msgid "Adding Negatives To Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:161
+#: data/missions/lessons/lessons_desc:216
+#: data/missions/lessons/lessons_desc:271
+msgid "Subtracting Negatives From Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:162
+msgid "Neg/Pos Review"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:163
+msgid "Multiplication And Division Of Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:164
+msgid "Multiplication Of Positives And Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:165
+msgid "Division Of Positives And Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:169
+#: data/missions/lessons/lessons_desc:224
+msgid "Addition: Sums to 10"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:170
+#: data/missions/lessons/lessons_desc:225
+msgid "Addition: Sums to 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:171
+#: data/missions/lessons/lessons_desc:226
+msgid "Addition: Sums to 20"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:208
+#: data/missions/lessons/lessons_desc:263
+msgid "Division by 13, 14, and 15"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:210
+#: data/missions/lessons/lessons_desc:265
+msgid "Multiplication and Division Review"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:213
+#: data/missions/lessons/lessons_desc:268
+msgid "Adding Negatives to Positives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:215
+#: data/missions/lessons/lessons_desc:270
+msgid "Adding Negatives to Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:217
+#: data/missions/lessons/lessons_desc:272
+msgid "Negative and Positive Numbers Review"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:218
+#: data/missions/lessons/lessons_desc:273
+msgid "Multiplication and Division of Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:219
+#: data/missions/lessons/lessons_desc:274
+msgid "Multiplication of Positives and Negatives"
+msgstr ""
+
+#: data/missions/lessons/lessons_desc:220
+#: data/missions/lessons/lessons_desc:275
+msgid "Division of Positives and Negatives"
+msgstr ""
Added: tuxmath/trunk/po/update-po.sh
===================================================================
--- tuxmath/trunk/po/update-po.sh (rev 0)
+++ tuxmath/trunk/po/update-po.sh 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Create a 'source' file holding all the descriptions for the missions.
+cd ../data/missions/lessons
+rm -f ../lessons_desc
+for i in ./lesson*; do
+ head --lines=1 $i | sed 's/^# \(.*\)$/_("\1")/' >> lessons_desc;
+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/po/update-po.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: tuxmath/trunk/src/Makefile.am
===================================================================
--- tuxmath/trunk/src/Makefile.am 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/src/Makefile.am 2007-10-19 16:37:30 UTC (rev 303)
@@ -1,7 +1,7 @@
## Makefile.am for tuxmath src:
## Process with Automake to create Makefile.in
-SUBDIRS = po
+# SUBDIRS = po (po now directly under trunk)
if BUILD_MINGW32
bin_PROGRAMS = TuxMath
@@ -41,7 +41,8 @@
titlescreen.h \
tuxmath.h \
ConvertUTF.h \
- SDL_extras.h
+ SDL_extras.h \
+ gettext.h
WINDRES=@WINDRES@
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/src/Makefile.in 2007-10-19 16:37:30 UTC (rev 303)
@@ -14,7 +14,9 @@
@SET_MAKE@
+# SUBDIRS = po (po now directly under trunk)
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -90,19 +92,9 @@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(TuxMath_SOURCES) $(tuxmath_SOURCES)
DIST_SOURCES = $(TuxMath_SOURCES) $(tuxmath_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
HEADERS = $(noinst_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
@@ -253,7 +245,6 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = po
@BUILD_MINGW32_FALSE at TUXMATHRC =
tuxmath_SOURCES = tuxmath.c \
setup.c \
@@ -285,7 +276,8 @@
titlescreen.h \
tuxmath.h \
ConvertUTF.h \
- SDL_extras.h
+ SDL_extras.h \
+ gettext.h
@BUILD_MINGW32_FALSE at DATA_PREFIX = ${pkgdatadir}
@BUILD_MINGW32_TRUE at DATA_PREFIX = @PACKAGE_DATA_DIR@
@@ -293,7 +285,7 @@
-DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
noinst_HEADERS = highscore.h
-all: all-recursive
+all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
@@ -394,76 +386,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -474,23 +396,10 @@
mkid -fID $$unique
tags: TAGS
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -503,7 +412,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -551,40 +460,22 @@
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
- done
check-am: all-am
-check: check-recursive
+check: check-am
all-am: Makefile $(PROGRAMS) $(HEADERS)
-installdirs: installdirs-recursive
-installdirs-am:
+installdirs:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-recursive
+installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -600,80 +491,77 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-distclean: distclean-recursive
+distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
-dvi: dvi-recursive
+dvi: dvi-am
dvi-am:
-html: html-recursive
+html: html-am
-info: info-recursive
+info: info-am
info-am:
install-data-am:
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
install-exec-am: install-binPROGRAMS
-install-html: install-html-recursive
+install-html: install-html-am
-install-info: install-info-recursive
+install-info: install-info-am
install-man:
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
-install-ps: install-ps-recursive
+install-ps: install-ps-am
installcheck-am:
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-pdf: pdf-recursive
+pdf: pdf-am
pdf-am:
-ps: ps-recursive
+ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS
# How to make an RC file
Added: tuxmath/trunk/src/exercise_mathcards.c
===================================================================
--- tuxmath/trunk/src/exercise_mathcards.c (rev 0)
+++ tuxmath/trunk/src/exercise_mathcards.c 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,54 @@
+/*
+* C Implementation: exercise_mathcards
+*
+* Description:
+*
+*
+* Author: David Bruce <dbruce at tampabay.rr.com>, (C) 2007
+*
+* Copyright: See COPYING file that comes with this distribution
+*
+*/
+
+#include <stdio.h>
+#include "mathcards.h"
+
+int main()
+{
+ int i, iter, op;
+ MC_FlashCard c;
+
+ MC_Initialize();
+
+ for (i = 0; i < 100; i++)
+ {
+
+ fprintf(stderr, "\n\nGame: i = %d\n", i);
+ op = rand() % 2;
+ MC_SetAddAllowed(op);
+ op = rand() % 2;
+ MC_SetSubAllowed(op);
+ op = rand() % 2;
+ MC_SetMultAllowed(op);
+ op = rand() % 2;
+ MC_SetDivAllowed(op);
+
+ if (!MC_StartGame())
+ continue;
+
+ iter = 0;
+
+ while(!MC_MissionAccomplished())
+ {
+ MC_NextQuestion(&c);
+ op = rand() % 2;
+ if (op)
+ MC_AnsweredCorrectly(&c);
+ else
+ MC_NotAnsweredCorrectly(&c);
+ iter++;
+ }
+// MC_EndGame();
+ }
+ return 1;
+}
Added: tuxmath/trunk/src/gettext.h
===================================================================
--- tuxmath/trunk/src/gettext.h (rev 0)
+++ tuxmath/trunk/src/gettext.h 2007-10-19 16:37:30 UTC (rev 303)
@@ -0,0 +1,265 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+ Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA. */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option. */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions. */
+# include <libintl.h>
+
+/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
+ the gettext() and ngettext() macros. This is an alternative to calling
+ textdomain(), and is useful for libraries. */
+# ifdef DEFAULT_TEXT_DOMAIN
+# undef gettext
+# define gettext(Msgid) \
+ dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
+# undef ngettext
+# define ngettext(Msgid1, Msgid2, N) \
+ dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
+# endif
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+ chokes if dcgettext is defined as a macro. So include it now, to make
+ later inclusions of <locale.h> a NOP. We don't include <libintl.h>
+ as well because people using "gettext.h" will not include <libintl.h>,
+ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+ is OK. */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+ <libintl.h>, which chokes if dcgettext is defined as a macro. So include
+ it now, to make later inclusions of <libintl.h> a NOP. */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+# include <libintl.h>
+# endif
+#endif
+
+/* Disabled NLS.
+ The casts to 'const char *' serve the purpose of producing warnings
+ for invalid uses of the value returned from these functions.
+ On pre-ANSI systems without 'const', the config.h file is supposed to
+ contain "#define const". */
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+ extraction of messages, but does not call gettext(). The run-time
+ translation is done at a different place in the code.
+ The argument, String, should be a literal string. Concatenated strings
+ and other string expressions won't work.
+ The macro's expansion is not parenthesized, so that it is suitable as
+ initializer for static 'char[]' or 'const char[]' variables. */
+#define gettext_noop(String) String
+
+/* The separator between msgctxt and msgid in a .mo file. */
+#define GETTEXT_CONTEXT_GLUE "\004"
+
+/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+ MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
+ short and rarely need to change.
+ The letter 'p' stands for 'particular' or 'special'. */
+#ifdef DEFAULT_TEXT_DOMAIN
+# define pgettext(Msgctxt, Msgid) \
+ pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#else
+# define pgettext(Msgctxt, Msgid) \
+ pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#endif
+#define dpgettext(Domainname, Msgctxt, Msgid) \
+ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
+#ifdef DEFAULT_TEXT_DOMAIN
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+ npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#else
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+ npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#endif
+#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+pgettext_aux (const char *domain,
+ const char *msg_ctxt_id, const char *msgid,
+ int category)
+{
+ const char *translation = dcgettext (domain, msg_ctxt_id, category);
+ if (translation == msg_ctxt_id)
+ return msgid;
+ else
+ return translation;
+}
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+npgettext_aux (const char *domain,
+ const char *msg_ctxt_id, const char *msgid,
+ const char *msgid_plural, unsigned long int n,
+ int category)
+{
+ const char *translation =
+ dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+ if (translation == msg_ctxt_id || translation == msgid_plural)
+ return (n == 1 ? msgid : msgid_plural);
+ else
+ return translation;
+}
+
+/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID
+ can be arbitrary expressions. But for string literals these macros are
+ less efficient than those above. */
+
+#include <string.h>
+
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+ (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ )
+
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#include <stdlib.h>
+#endif
+
+#define pgettext_expr(Msgctxt, Msgid) \
+ dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+ dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcpgettext_expr (const char *domain,
+ const char *msgctxt, const char *msgid,
+ int category)
+{
+ size_t msgctxt_len = strlen (msgctxt) + 1;
+ size_t msgid_len = strlen (msgid) + 1;
+ const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+ char buf[1024];
+ char *msg_ctxt_id =
+ (msgctxt_len + msgid_len <= sizeof (buf)
+ ? buf
+ : (char *) malloc (msgctxt_len + msgid_len));
+ if (msg_ctxt_id != NULL)
+#endif
+ {
+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+ msg_ctxt_id[msgctxt_len - 1] = '\004';
+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+ translation = dcgettext (domain, msg_ctxt_id, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ if (msg_ctxt_id != buf)
+ free (msg_ctxt_id);
+#endif
+ if (translation != msg_ctxt_id)
+ return translation;
+ }
+ return msgid;
+}
+
+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+ dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+ dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcnpgettext_expr (const char *domain,
+ const char *msgctxt, const char *msgid,
+ const char *msgid_plural, unsigned long int n,
+ int category)
+{
+ size_t msgctxt_len = strlen (msgctxt) + 1;
+ size_t msgid_len = strlen (msgid) + 1;
+ const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+ char buf[1024];
+ char *msg_ctxt_id =
+ (msgctxt_len + msgid_len <= sizeof (buf)
+ ? buf
+ : (char *) malloc (msgctxt_len + msgid_len));
+ if (msg_ctxt_id != NULL)
+#endif
+ {
+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+ msg_ctxt_id[msgctxt_len - 1] = '\004';
+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+ translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ if (msg_ctxt_id != buf)
+ free (msg_ctxt_id);
+#endif
+ if (!(translation == msg_ctxt_id || translation == msgid_plural))
+ return translation;
+ }
+ return (n == 1 ? msgid : msgid_plural);
+}
+
+#endif /* _LIBGETTEXT_H */
Modified: tuxmath/trunk/src/pause.c
===================================================================
--- tuxmath/trunk/src/pause.c 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/src/pause.c 2007-10-19 16:37:30 UTC (rev 303)
@@ -19,7 +19,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
-
+// For gettext support:
+#include "tuxmath.h"
// For tuxtype-related stuff:
#include "titlescreen.h"
Modified: tuxmath/trunk/src/tuxmath.c
===================================================================
--- tuxmath/trunk/src/tuxmath.c 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/src/tuxmath.c 2007-10-19 16:37:30 UTC (rev 303)
@@ -34,10 +34,10 @@
{
#ifndef MACOSX
#ifndef WIN32
-setlocale( LC_ALL, "" );
-bindtextdomain( "tuxmath", LOCALEDIR );
-bind_textdomain_codeset("tuxmath", "UTF-8");
-textdomain( "tuxmath" );
+setlocale(LC_ALL, "");
+bindtextdomain(PACKAGE, LOCALEDIR);
+bind_textdomain_codeset(PACKAGE, "UTF-8");
+textdomain(PACKAGE);
#endif
#endif
Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h 2007-10-15 11:53:23 UTC (rev 302)
+++ tuxmath/trunk/src/tuxmath.h 2007-10-19 16:37:30 UTC (rev 303)
@@ -31,7 +31,7 @@
#define N_(String) String
#define _(String) String
#else
-#include <libintl.h>
+#include "gettext.h"
#include <locale.h>
#define _(String) gettext (String)
#define gettext_noop(String) String
More information about the Tux4kids-commits
mailing list