[Tux4kids-commits] r611 - in tuxtype/branches: . soc-mobin soc-mobin/autom4te.cache soc-mobin/data/images soc-mobin/data/themes/malayalam soc-mobin/data/themes/malayalam/images/status soc-mobin/doc/en soc-mobin/po soc-mobin/src
mobin-guest at alioth.debian.org
mobin-guest at alioth.debian.org
Tue Aug 12 13:03:13 UTC 2008
Author: mobin-guest
Date: 2008-08-12 13:03:12 +0000 (Tue, 12 Aug 2008)
New Revision: 611
Removed:
tuxtype/branches/soc3/
Modified:
tuxtype/branches/soc-mobin/Makefile
tuxtype/branches/soc-mobin/autom4te.cache/requests
tuxtype/branches/soc-mobin/config.log
tuxtype/branches/soc-mobin/config.status
tuxtype/branches/soc-mobin/data/images/Makefile
tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile
tuxtype/branches/soc-mobin/data/themes/malayalam/settings.txt
tuxtype/branches/soc-mobin/doc/en/Makefile
tuxtype/branches/soc-mobin/po/LINGUAS
tuxtype/branches/soc-mobin/po/Makefile
tuxtype/branches/soc-mobin/po/Makefile.in
tuxtype/branches/soc-mobin/po/Makevars
tuxtype/branches/soc-mobin/po/Makevars~
tuxtype/branches/soc-mobin/po/POTFILES
tuxtype/branches/soc-mobin/po/POTFILES.in
tuxtype/branches/soc-mobin/po/en_US.gmo
tuxtype/branches/soc-mobin/po/en_US.po
tuxtype/branches/soc-mobin/po/ml_IN.po~
tuxtype/branches/soc-mobin/po/tuxtype.pot
tuxtype/branches/soc-mobin/src/globals.h
tuxtype/branches/soc-mobin/src/loaders.c
tuxtype/branches/soc-mobin/src/playgame.c
tuxtype/branches/soc-mobin/src/practice.c
tuxtype/branches/soc-mobin/src/titlescreen.c
Log:
GNU Gettext added
Modified: tuxtype/branches/soc-mobin/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/Makefile 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/Makefile 2008-08-12 13:03:12 UTC (rev 611)
@@ -29,9 +29,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -74,15 +74,15 @@
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
+AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
+AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
+AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
CPP = gcc -E
CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
@@ -107,12 +107,12 @@
LIBICONV = -liconv
LIBINTL =
LIBOBJS =
-LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
@@ -129,9 +129,9 @@
PACKAGE_VERSION = 1.5.16
PATH_SEPARATOR = :
POSUB = po
-SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/local/bin/sdl-config
-SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
+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 =
@@ -140,10 +140,10 @@
WINDRES =
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-work/soc-mobin-new
-abs_srcdir = /usr/local/src/soc-work/soc-mobin-new
-abs_top_builddir = /usr/local/src/soc-work/soc-mobin-new
-abs_top_srcdir = /usr/local/src/soc-work/soc-mobin-new
+abs_builddir = /usr/local/src/soc-mobin-up
+abs_srcdir = /usr/local/src/soc-mobin-up
+abs_top_builddir = /usr/local/src/soc-mobin-up
+abs_top_srcdir = /usr/local/src/soc-mobin-up
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -151,26 +151,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = i686-pc-linux-gnu
build_alias =
-build_cpu = x86_64
+build_cpu = i686
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = i686-pc-linux-gnu
host_alias =
-host_cpu = x86_64
+host_cpu = i686
host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh
+install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -186,11 +186,11 @@
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i686-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i686
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
top_builddir = .
top_srcdir = .
Modified: tuxtype/branches/soc-mobin/autom4te.cache/requests
===================================================================
--- tuxtype/branches/soc-mobin/autom4te.cache/requests 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/autom4te.cache/requests 2008-08-12 13:03:12 UTC (rev 611)
@@ -61,9 +61,9 @@
'configure.ac'
],
{
+ 'AM_PO_SUBDIRS' => 1,
+ 'gt_INTTYPES_PRI' => 1,
'm4_pattern_forbid' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AM_PO_SUBDIRS' => 1,
'AC_LIB_PREPARE_PREFIX' => 1,
'AC_DEFUN' => 1,
'AM_PROG_MKDIR_P' => 1,
@@ -95,10 +95,10 @@
'AM_PATH_PROG_WITH_TEST' => 1,
'AM_SET_LEADING_DOT' => 1,
'_AM_DEPENDENCIES' => 1,
+ 'gt_INTL_MACOSX' => 1,
'gt_CHECK_DECL' => 1,
- 'gt_INTL_MACOSX' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
'AM_ICONV_LINK' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
'AC_LIB_PREPARE_MULTILIB' => 1,
'AU_DEFUN' => 1,
'AM_GNU_GETTEXT_NEED' => 1,
@@ -124,32 +124,32 @@
'gt_INTDIV0' => 1,
'AM_ICONV' => 1,
'include' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1,
'AC_LIB_APPENDTOVAR' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
'AM_GNU_GETTEXT' => 1,
+ 'gl_GLIBC21' => 1,
'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'gl_GLIBC21' => 1,
'AM_POSTPROCESS_PO_MAKEFILE' => 1,
'_AM_SET_OPTIONS' => 1,
+ 'AM_RUN_LOG' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LIB_WITH_FINAL_PREFIX' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_RUN_LOG' => 1,
'gt_TYPE_WINT_T' => 1,
'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'gt_LC_MESSAGES' => 1,
'_AM_MANGLE_OPTION' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
'AM_CONDITIONAL' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
'AM_SET_DEPDIR' => 1,
- 'AM_LANGINFO_CODESET' => 1,
'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
'gl_LOCK_BODY' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_LIB_PROG_LD' => 1,
'gl_PREREQ_LOCK' => 1,
- 'AC_LIB_PROG_LD' => 1,
'AM_MAKE_INCLUDE' => 1
}
], 'Autom4te::Request' ),
@@ -165,15 +165,15 @@
'configure.ac'
],
{
+ '_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
- '_LT_AC_TAGCONFIG' => 1,
+ 'AC_INIT' => 1,
'm4_pattern_forbid' => 1,
- 'AC_INIT' => 1,
'AC_CANONICAL_TARGET' => 1,
+ 'AC_SUBST' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_SUBST' => 1,
+ 'AC_FC_SRCEXT' => 1,
'AC_CANONICAL_HOST' => 1,
- 'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
@@ -181,8 +181,8 @@
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
+ 'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
- 'm4_sinclude' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
@@ -199,11 +199,11 @@
'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
+ 'sinclude' => 1,
+ 'm4_pattern_allow' => 1,
'AM_PROG_CC_C_O' => 1,
- 'm4_pattern_allow' => 1,
- 'sinclude' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
@@ -268,9 +268,9 @@
'configure.ac'
],
{
+ 'AM_PO_SUBDIRS' => 1,
+ 'gt_INTTYPES_PRI' => 1,
'm4_pattern_forbid' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AM_PO_SUBDIRS' => 1,
'AC_LIB_PREPARE_PREFIX' => 1,
'AC_DEFUN' => 1,
'AM_PROG_MKDIR_P' => 1,
@@ -302,10 +302,10 @@
'AM_PATH_PROG_WITH_TEST' => 1,
'AM_SET_LEADING_DOT' => 1,
'_AM_DEPENDENCIES' => 1,
+ 'gt_INTL_MACOSX' => 1,
'gt_CHECK_DECL' => 1,
- 'gt_INTL_MACOSX' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
'AM_ICONV_LINK' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
'AC_LIB_PREPARE_MULTILIB' => 1,
'AU_DEFUN' => 1,
'AM_GNU_GETTEXT_NEED' => 1,
@@ -331,32 +331,32 @@
'gt_INTDIV0' => 1,
'AM_ICONV' => 1,
'include' => 1,
+ 'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1,
'AC_LIB_APPENDTOVAR' => 1,
'AM_AUX_DIR_EXPAND' => 1,
- 'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1,
'AM_GNU_GETTEXT' => 1,
+ 'gl_GLIBC21' => 1,
'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'gl_GLIBC21' => 1,
'AM_POSTPROCESS_PO_MAKEFILE' => 1,
'_AM_SET_OPTIONS' => 1,
+ 'AM_RUN_LOG' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LIB_WITH_FINAL_PREFIX' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_RUN_LOG' => 1,
'gt_TYPE_WINT_T' => 1,
'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'gt_LC_MESSAGES' => 1,
'_AM_MANGLE_OPTION' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
'AM_CONDITIONAL' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
'AM_SET_DEPDIR' => 1,
- 'AM_LANGINFO_CODESET' => 1,
'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
'gl_LOCK_BODY' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_LIB_PROG_LD' => 1,
'gl_PREREQ_LOCK' => 1,
- 'AC_LIB_PROG_LD' => 1,
'AM_MAKE_INCLUDE' => 1
}
], 'Autom4te::Request' )
Modified: tuxtype/branches/soc-mobin/config.log
===================================================================
--- tuxtype/branches/soc-mobin/config.log 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/config.log 2008-08-12 13:03:12 UTC (rev 611)
@@ -10,16 +10,16 @@
## Platform. ##
## --------- ##
-hostname = stallman
-uname -m = x86_64
-uname -r = 2.6.18-4-amd64
+hostname = debian
+uname -m = i686
+uname -r = 2.6.18-4-k7
uname -s = Linux
-uname -v = #1 SMP Thu May 10 01:01:58 UTC 2007
+uname -v = #1 SMP Mon Mar 26 17:57:15 UTC 2007
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
-/bin/arch = x86_64
+/bin/arch = i686
/usr/bin/arch -k = unknown
/usr/convex/getsysinfo = unknown
/usr/bin/hostinfo = unknown
@@ -41,11 +41,11 @@
## ----------- ##
configure:1829: checking build system type
-configure:1847: result: x86_64-unknown-linux-gnu
+configure:1847: result: i686-pc-linux-gnu
configure:1869: checking host system type
-configure:1884: result: x86_64-unknown-linux-gnu
+configure:1884: result: i686-pc-linux-gnu
configure:1906: checking target system type
-configure:1921: result: x86_64-unknown-linux-gnu
+configure:1921: result: i686-pc-linux-gnu
configure:1969: checking for a BSD-compatible install
configure:2025: result: /usr/bin/install -c
configure:2036: checking whether build environment is sane
@@ -53,8 +53,10 @@
configure:2107: checking for a thread-safe mkdir -p
configure:2146: result: /bin/mkdir -p
configure:2159: checking for gawk
-configure:2175: found /usr/bin/gawk
-configure:2186: result: gawk
+configure:2189: result: no
+configure:2159: checking for mawk
+configure:2175: found /usr/bin/mawk
+configure:2186: result: mawk
configure:2197: checking whether make sets $(MAKE)
configure:2218: result: yes
configure:2411: checking whether NLS is requested
@@ -226,10 +228,10 @@
configure:6286: checking whether make sets $(MAKE)
configure:6307: result: yes
configure:6373: checking for sdl-config
-configure:6391: found /usr/local/bin/sdl-config
-configure:6404: result: /usr/local/bin/sdl-config
+configure:6391: found /usr/bin/sdl-config
+configure:6404: result: /usr/bin/sdl-config
configure:6413: checking for SDL - version >= 1.2.5
-configure:6510: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread >&5
+configure:6510: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL >&5
configure:6513: $? = 0
configure:6519: ./conftest
configure:6522: $? = 0
@@ -305,47 +307,47 @@
configure:7339: checking for egrep
configure:7417: result: /bin/grep -E
configure:7422: checking for ANSI C header files
-configure:7452: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7452: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7458: $? = 0
-configure:7557: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:7557: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
configure:7560: $? = 0
configure:7566: ./conftest
configure:7569: $? = 0
configure:7586: result: yes
configure:7610: checking for sys/types.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for sys/stat.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for stdlib.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for string.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for memory.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for strings.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for inttypes.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for stdint.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7610: checking for unistd.h
-configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7637: $? = 0
configure:7653: result: yes
configure:7671: checking for stdlib.h
@@ -353,34 +355,34 @@
configure:7671: checking for string.h
configure:7677: result: yes
configure:7813: checking for an ANSI C-conforming const
-configure:7888: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7888: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7894: $? = 0
configure:7909: result: yes
configure:7919: checking for inline
-configure:7945: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:7945: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
configure:7951: $? = 0
configure:7969: result: inline
configure:7998: checking for atexit
-configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
configure:8060: $? = 0
configure:8078: result: yes
configure:7998: checking for memset
-configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
conftest.c:53: warning: conflicting types for built-in function 'memset'
configure:8060: $? = 0
configure:8078: result: yes
configure:7998: checking for strchr
-configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
conftest.c:54: warning: conflicting types for built-in function 'strchr'
configure:8060: $? = 0
configure:8078: result: yes
configure:7998: checking for strstr
-configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
conftest.c:55: warning: conflicting types for built-in function 'strstr'
configure:8060: $? = 0
configure:8078: result: yes
configure:7998: checking for malloc
-configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
conftest.c:56: warning: conflicting types for built-in function 'malloc'
configure:8060: $? = 0
configure:8078: result: yes
@@ -401,7 +403,7 @@
CONFIG_COMMANDS =
$ ./config.status
-on stallman
+on debian
config.status:771: creating Makefile
config.status:771: creating po/Makefile.in
@@ -499,7 +501,7 @@
## Cache variables. ##
## ---------------- ##
-ac_cv_build=x86_64-unknown-linux-gnu
+ac_cv_build=i686-pc-linux-gnu
ac_cv_c_compiler_gnu=yes
ac_cv_c_const=yes
ac_cv_c_inline=inline
@@ -536,7 +538,7 @@
ac_cv_header_sys_stat_h=yes
ac_cv_header_sys_types_h=yes
ac_cv_header_unistd_h=yes
-ac_cv_host=x86_64-unknown-linux-gnu
+ac_cv_host=i686-pc-linux-gnu
ac_cv_lib_SDL_Pango_SDLPango_Init=yes
ac_cv_lib_SDL_image_IMG_Load=yes
ac_cv_lib_SDL_mixer_Mix_PlayMusic=yes
@@ -548,17 +550,17 @@
ac_cv_path_MSGFMT=/usr/bin/msgfmt
ac_cv_path_MSGMERGE=/usr/bin/msgmerge
ac_cv_path_NSIS=no
-ac_cv_path_SDL_CONFIG=/usr/local/bin/sdl-config
+ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config
ac_cv_path_XGETTEXT=/usr/bin/xgettext
ac_cv_path_install='/usr/bin/install -c'
ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=gawk
+ac_cv_prog_AWK=mawk
ac_cv_prog_CPP='gcc -E'
ac_cv_prog_ac_ct_CC=gcc
ac_cv_prog_cc_c89=
ac_cv_prog_cc_g=yes
ac_cv_prog_make_make_set=yes
-ac_cv_target=x86_64-unknown-linux-gnu
+ac_cv_target=i686-pc-linux-gnu
acl_cv_hardcode_direct=no
acl_cv_hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
acl_cv_hardcode_libdir_separator=
@@ -578,20 +580,20 @@
## Output variables. ##
## ----------------- ##
-ACLOCAL='${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
-AMTAR='${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run tar'
-AUTOCONF='${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoconf'
-AUTOHEADER='${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoheader'
-AUTOMAKE='${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run automake-1.10'
-AWK='gawk'
+AMTAR='${SHELL} /usr/local/src/soc-mobin-up/missing --run tar'
+AUTOCONF='${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf'
+AUTOHEADER='${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader'
+AUTOMAKE='${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10'
+AWK='mawk'
BUILD_MINGW32_FALSE=''
BUILD_MINGW32_TRUE='#'
CC='gcc'
CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
+CFLAGS='-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
CPP='gcc -E'
CPPFLAGS=' -DDATA_PREFIX=\"$(prefix)\"'
CYGPATH_W='echo'
@@ -615,12 +617,12 @@
LIBICONV='-liconv'
LIBINTL=''
LIBOBJS=''
-LIBS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer '
+LIBS='-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer '
LN_S='ln -s'
LTLIBICONV='-liconv'
LTLIBINTL=''
LTLIBOBJS=''
-MAKEINFO='${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run makeinfo'
+MAKEINFO='${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo'
MSGFMT='/usr/bin/msgfmt'
MSGFMT_015='/usr/bin/msgfmt'
MSGMERGE='/usr/bin/msgmerge'
@@ -638,9 +640,9 @@
PACKAGE_VERSION='1.5.16'
PATH_SEPARATOR=':'
POSUB='po'
-SDL_CFLAGS='-I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
-SDL_CONFIG='/usr/local/bin/sdl-config'
-SDL_LIBS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread'
+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=''
@@ -659,25 +661,25 @@
am__tar='${AMTAR} chof - "$$tardir"'
am__untar='${AMTAR} xf -'
bindir='${exec_prefix}/bin'
-build='x86_64-unknown-linux-gnu'
+build='i686-pc-linux-gnu'
build_alias=''
-build_cpu='x86_64'
+build_cpu='i686'
build_os='linux-gnu'
-build_vendor='unknown'
+build_vendor='pc'
datadir='${datarootdir}'
datarootdir='${prefix}/share'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
dvidir='${docdir}'
exec_prefix='${prefix}'
-host='x86_64-unknown-linux-gnu'
+host='i686-pc-linux-gnu'
host_alias=''
-host_cpu='x86_64'
+host_cpu='i686'
host_os='linux-gnu'
-host_vendor='unknown'
+host_vendor='pc'
htmldir='${docdir}'
includedir='${prefix}/include'
infodir='${datarootdir}/info'
-install_sh='$(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh'
+install_sh='$(SHELL) /usr/local/src/soc-mobin-up/install-sh'
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale'
@@ -692,11 +694,11 @@
sbindir='${exec_prefix}/sbin'
sharedstatedir='${prefix}/com'
sysconfdir='${prefix}/etc'
-target='x86_64-unknown-linux-gnu'
+target='i686-pc-linux-gnu'
target_alias=''
-target_cpu='x86_64'
+target_cpu='i686'
target_os='linux-gnu'
-target_vendor='unknown'
+target_vendor='pc'
## ----------- ##
## confdefs.h. ##
@@ -749,7 +751,7 @@
CONFIG_COMMANDS =
$ ./config.status po/Makefile.in po-directories
-on stallman
+on debian
config.status:771: creating po/Makefile.in
config.status:1057: executing po-directories commands
Modified: tuxtype/branches/soc-mobin/config.status
===================================================================
--- tuxtype/branches/soc-mobin/config.status 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/config.status 2008-08-12 13:03:12 UTC (rev 611)
@@ -341,7 +341,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/usr/local/src/soc-work/soc-mobin-new'
+ac_pwd='/usr/local/src/soc-mobin-up'
srcdir='.'
INSTALL='/usr/bin/install -c'
MKDIR_P='/bin/mkdir -p'
@@ -622,21 +622,21 @@
s, at ECHO_C@,|#_!!_#|,g
s, at ECHO_N@,|#_!!_#|-n,g
s, at ECHO_T@,|#_!!_#|,g
-s, at LIBS@,|#_!!_#|-L/usr/local/lib -Wl\,-rpath\,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
+s, at LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
s, at build_alias@,|#_!!_#|,g
s, at host_alias@,|#_!!_#|,g
s, at target_alias@,|#_!!_#|,g
-s, at build@,|#_!!_#|x86_64-unknown-linux-gnu,g
-s, at build_cpu@,|#_!!_#|x86_64,g
-s, at build_vendor@,|#_!!_#|unknown,g
+s, at build@,|#_!!_#|i686-pc-linux-gnu,g
+s, at build_cpu@,|#_!!_#|i686,g
+s, at build_vendor@,|#_!!_#|pc,g
s, at build_os@,|#_!!_#|linux-gnu,g
-s, at host@,|#_!!_#|x86_64-unknown-linux-gnu,g
-s, at host_cpu@,|#_!!_#|x86_64,g
-s, at host_vendor@,|#_!!_#|unknown,g
+s, at host@,|#_!!_#|i686-pc-linux-gnu,g
+s, at host_cpu@,|#_!!_#|i686,g
+s, at host_vendor@,|#_!!_#|pc,g
s, at host_os@,|#_!!_#|linux-gnu,g
-s, at target@,|#_!!_#|x86_64-unknown-linux-gnu,g
-s, at target_cpu@,|#_!!_#|x86_64,g
-s, at target_vendor@,|#_!!_#|unknown,g
+s, at target@,|#_!!_#|i686-pc-linux-gnu,g
+s, at target_cpu@,|#_!!_#|i686,g
+s, at target_vendor@,|#_!!_#|pc,g
s, at target_os@,|#_!!_#|linux-gnu,g
s, at INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g
s, at INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g
@@ -645,19 +645,19 @@
s, at CYGPATH_W@,|#_!!_#|echo,g
s, at PACKAGE@,|#_!!_#|tuxtype,g
s, at VERSION@,|#_!!_#|1.5.16,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run aclocal-1.10,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run automake-1.10,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|$(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /usr/local/src/soc-mobin-up/install-sh,g
s, at STRIP@,|#_!!_#|,g
s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
s, at mkdir_p@,|#_!!_#|/bin/mkdir -p,g
-s, at AWK@,|#_!!_#|gawk,g
+s, at AWK@,|#_!!_#|mawk,g
s, at SET_MAKE@,|#_!!_#|,g
s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run tar,g
s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
s, at USE_NLS@,|#_!!_#|yes,g
@@ -669,7 +669,7 @@
s, at XGETTEXT_015@,|#_!!_#|/usr/bin/xgettext,g
s, at MSGMERGE@,|#_!!_#|/usr/bin/msgmerge,g
s, at CC@,|#_!!_#|gcc,g
-s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
+s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
s, at LDFLAGS@,|#_!!_#|,g
s, at CPPFLAGS@,|#_!!_#| -DDATA_PREFIX=\\"$(prefix)\\",g
s, at ac_ct_CC@,|#_!!_#|gcc,g
@@ -695,9 +695,9 @@
s, at LTLIBINTL@,|#_!!_#|,g
s, at POSUB@,|#_!!_#|po,g
s, at LN_S@,|#_!!_#|ln -s,g
-s, at SDL_CONFIG@,|#_!!_#|/usr/local/bin/sdl-config,g
-s, at SDL_CFLAGS@,|#_!!_#|-I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
-s, at SDL_LIBS@,|#_!!_#|-L/usr/local/lib -Wl\,-rpath\,/usr/local/lib -lSDL -lpthread,g
+s, at SDL_CONFIG@,|#_!!_#|/usr/bin/sdl-config,g
+s, at SDL_CFLAGS@,|#_!!_#|-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
+s, at SDL_LIBS@,|#_!!_#|-L/usr/lib -lSDL,g
s, at BUILD_MINGW32_TRUE@,|#_!!_#|#,g
s, at BUILD_MINGW32_FALSE@,|#_!!_#|,g
s, at WINDRES@,|#_!!_#|,g
Modified: tuxtype/branches/soc-mobin/data/images/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/images/Makefile 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/data/images/Makefile 2008-08-12 13:03:12 UTC (rev 611)
@@ -30,9 +30,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = data/images
DIST_COMMON = $(dist_images_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -68,15 +68,15 @@
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
+AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
+AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
+AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
CPP = gcc -E
CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
@@ -101,12 +101,12 @@
LIBICONV = -liconv
LIBINTL =
LIBOBJS =
-LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
@@ -123,9 +123,9 @@
PACKAGE_VERSION = 1.5.16
PATH_SEPARATOR = :
POSUB = po
-SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/local/bin/sdl-config
-SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
+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 =
@@ -134,10 +134,10 @@
WINDRES =
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-work/soc-mobin-new/data/images
-abs_srcdir = /usr/local/src/soc-work/soc-mobin-new/data/images
-abs_top_builddir = /usr/local/src/soc-work/soc-mobin-new
-abs_top_srcdir = /usr/local/src/soc-work/soc-mobin-new
+abs_builddir = /usr/local/src/soc-mobin-up/data/images
+abs_srcdir = /usr/local/src/soc-mobin-up/data/images
+abs_top_builddir = /usr/local/src/soc-mobin-up
+abs_top_srcdir = /usr/local/src/soc-mobin-up
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -145,26 +145,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = i686-pc-linux-gnu
build_alias =
-build_cpu = x86_64
+build_cpu = i686
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = i686-pc-linux-gnu
host_alias =
-host_cpu = x86_64
+host_cpu = i686
host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh
+install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -180,11 +180,11 @@
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i686-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i686
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
top_builddir = ../..
top_srcdir = ../..
SUBDIRS = backgrounds \
Modified: tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile 2008-08-12 13:03:12 UTC (rev 611)
@@ -30,9 +30,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = data/themes/malayalam/images/status
DIST_COMMON = $(dist_themes_malayalam_images_status_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -56,15 +56,15 @@
dist_themes_malayalam_images_statusDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_themes_malayalam_images_status_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
+AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
+AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
+AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
CPP = gcc -E
CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
@@ -89,12 +89,12 @@
LIBICONV = -liconv
LIBINTL =
LIBOBJS =
-LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
@@ -111,9 +111,9 @@
PACKAGE_VERSION = 1.5.16
PATH_SEPARATOR = :
POSUB = po
-SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/local/bin/sdl-config
-SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
+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 =
@@ -122,10 +122,10 @@
WINDRES =
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-work/soc-mobin-new/data/themes/malayalam/images/status
-abs_srcdir = /usr/local/src/soc-work/soc-mobin-new/data/themes/malayalam/images/status
-abs_top_builddir = /usr/local/src/soc-work/soc-mobin-new
-abs_top_srcdir = /usr/local/src/soc-work/soc-mobin-new
+abs_builddir = /usr/local/src/soc-mobin-up/data/themes/malayalam/images/status
+abs_srcdir = /usr/local/src/soc-mobin-up/data/themes/malayalam/images/status
+abs_top_builddir = /usr/local/src/soc-mobin-up
+abs_top_srcdir = /usr/local/src/soc-mobin-up
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -133,26 +133,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = i686-pc-linux-gnu
build_alias =
-build_cpu = x86_64
+build_cpu = i686
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = i686-pc-linux-gnu
host_alias =
-host_cpu = x86_64
+host_cpu = i686
host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh
+install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -168,11 +168,11 @@
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i686-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i686
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
top_builddir = ../../../../..
top_srcdir = ../../../../..
themes_malayalam_images_statusdir = $(pkgdatadir)/data/themes/malayalam/images/status
Modified: tuxtype/branches/soc-mobin/data/themes/malayalam/settings.txt
===================================================================
--- tuxtype/branches/soc-mobin/data/themes/malayalam/settings.txt 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/data/themes/malayalam/settings.txt 2008-08-12 13:03:12 UTC (rev 611)
@@ -1,2 +1,2 @@
theme_font_name=Rachana_w01.ttf
-theme_locale_name=ml
+theme_locale_name=ml_IN
Modified: tuxtype/branches/soc-mobin/doc/en/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/doc/en/Makefile 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/doc/en/Makefile 2008-08-12 13:03:12 UTC (rev 611)
@@ -30,9 +30,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = doc/en
DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -56,15 +56,15 @@
dist_docDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_doc_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
+AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
+AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
+AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
CPP = gcc -E
CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
@@ -89,12 +89,12 @@
LIBICONV = -liconv
LIBINTL =
LIBOBJS =
-LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/local/src/soc-work/soc-mobin-new/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
@@ -111,9 +111,9 @@
PACKAGE_VERSION = 1.5.16
PATH_SEPARATOR = :
POSUB = po
-SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/local/bin/sdl-config
-SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
+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 =
@@ -122,10 +122,10 @@
WINDRES =
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-work/soc-mobin-new/doc/en
-abs_srcdir = /usr/local/src/soc-work/soc-mobin-new/doc/en
-abs_top_builddir = /usr/local/src/soc-work/soc-mobin-new
-abs_top_srcdir = /usr/local/src/soc-work/soc-mobin-new
+abs_builddir = /usr/local/src/soc-mobin-up/doc/en
+abs_srcdir = /usr/local/src/soc-mobin-up/doc/en
+abs_top_builddir = /usr/local/src/soc-mobin-up
+abs_top_srcdir = /usr/local/src/soc-mobin-up
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -133,26 +133,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = i686-pc-linux-gnu
build_alias =
-build_cpu = x86_64
+build_cpu = i686
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = i686-pc-linux-gnu
host_alias =
-host_cpu = x86_64
+host_cpu = i686
host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh
+install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -168,11 +168,11 @@
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i686-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i686
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
top_builddir = ../..
top_srcdir = ../..
dist_doc_DATA = howtotheme.html \
Modified: tuxtype/branches/soc-mobin/po/LINGUAS
===================================================================
--- tuxtype/branches/soc-mobin/po/LINGUAS 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/LINGUAS 2008-08-12 13:03:12 UTC (rev 611)
@@ -1,2 +1,2 @@
en_US
-ml
+ml_IN
Modified: tuxtype/branches/soc-mobin/po/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/po/Makefile 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/Makefile 2008-08-12 13:03:12 UTC (rev 611)
@@ -34,12 +34,12 @@
# We use $(mkdir_p).
# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh does not start with $(SHELL), so we add it.
+# $(SHELL) /usr/local/src/soc-mobin-up/install-sh does not start with $(SHELL), so we add it.
# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh -d
-install_sh = $(SHELL) $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh
+mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh -d
+install_sh = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh
MKDIR_P = /bin/mkdir -p
mkdir_p = /bin/mkdir -p
@@ -61,10 +61,10 @@
MSGCONV = msgconv
MSGFILTER = msgfilter
-POFILES = en_US.po ml.po
-GMOFILES = en_US.gmo ml.gmo
-UPDATEPOFILES = en_US.po-update ml.po-update
-DUMMYPOFILES = en_US.nop ml.nop
+POFILES = en_US.po ml_IN.po
+GMOFILES = en_US.gmo ml_IN.gmo
+UPDATEPOFILES = en_US.po-update ml_IN.po-update
+DUMMYPOFILES = en_US.nop ml_IN.nop
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
@@ -72,9 +72,9 @@
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
POTFILES = \
+ .././src/ConvertUTF.c \
.././src/alphabet.c \
.././src/audio.c \
- .././src/ConvertUTF.c \
.././src/gettext.c \
.././src/laser.c \
.././src/loaders.c \
@@ -89,7 +89,7 @@
.././src/theme.c \
.././src/titlescreen.c
-CATALOGS = en_US.gmo ml.gmo
+CATALOGS = en_US.gmo ml_IN.gmo
# Makevars gets inserted here. (Don't remove this line!)
# Makefile variables for PO directory in any package using GNU gettext.
@@ -112,7 +112,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 = Mobin M
+COPYRIGHT_HOLDER =
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
@@ -128,7 +128,7 @@
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS = mobinmohan at gmail.com
+MSGID_BUGS_ADDRESS =tux4kids-tuxtype-dev at lists.alioth.debian.org
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
Modified: tuxtype/branches/soc-mobin/po/Makefile.in
===================================================================
--- tuxtype/branches/soc-mobin/po/Makefile.in 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/Makefile.in 2008-08-12 13:03:12 UTC (rev 611)
@@ -34,12 +34,12 @@
# We use $(mkdir_p).
# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh does not start with $(SHELL), so we add it.
+# $(SHELL) /usr/local/src/soc-mobin-up/install-sh does not start with $(SHELL), so we add it.
# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh -d
-install_sh = $(SHELL) $(SHELL) /usr/local/src/soc-work/soc-mobin-new/install-sh
+mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh -d
+install_sh = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh
MKDIR_P = /bin/mkdir -p
mkdir_p = /bin/mkdir -p
Modified: tuxtype/branches/soc-mobin/po/Makevars
===================================================================
--- tuxtype/branches/soc-mobin/po/Makevars 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/Makevars 2008-08-12 13:03:12 UTC (rev 611)
@@ -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 = Mobin M
+COPYRIGHT_HOLDER =
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
@@ -34,7 +34,7 @@
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS = mobinmohan at gmail.com
+MSGID_BUGS_ADDRESS =tux4kids-tuxtype-dev at lists.alioth.debian.org
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
Modified: tuxtype/branches/soc-mobin/po/Makevars~
===================================================================
--- tuxtype/branches/soc-mobin/po/Makevars~ 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/Makevars~ 2008-08-12 13:03:12 UTC (rev 611)
@@ -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 = Free Software Foundation, Inc.
+COPYRIGHT_HOLDER = Mobin M
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
@@ -34,7 +34,7 @@
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS =
+MSGID_BUGS_ADDRESS = mobinmohan at gmail.com
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
Modified: tuxtype/branches/soc-mobin/po/POTFILES
===================================================================
--- tuxtype/branches/soc-mobin/po/POTFILES 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/POTFILES 2008-08-12 13:03:12 UTC (rev 611)
@@ -1,6 +1,6 @@
+ .././src/ConvertUTF.c \
.././src/alphabet.c \
.././src/audio.c \
- .././src/ConvertUTF.c \
.././src/gettext.c \
.././src/laser.c \
.././src/loaders.c \
Modified: tuxtype/branches/soc-mobin/po/POTFILES.in
===================================================================
--- tuxtype/branches/soc-mobin/po/POTFILES.in 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/POTFILES.in 2008-08-12 13:03:12 UTC (rev 611)
@@ -1,6 +1,6 @@
+./src/ConvertUTF.c
./src/alphabet.c
./src/audio.c
-./src/ConvertUTF.c
./src/gettext.c
./src/laser.c
./src/loaders.c
Modified: tuxtype/branches/soc-mobin/po/en_US.gmo
===================================================================
(Binary files differ)
Modified: tuxtype/branches/soc-mobin/po/en_US.po
===================================================================
--- tuxtype/branches/soc-mobin/po/en_US.po 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/en_US.po 2008-08-12 13:03:12 UTC (rev 611)
@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: mobinmohan at gmail.com\n"
-"POT-Creation-Date: 2008-07-09 23:20+0530\n"
+"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2008-08-12 17:12+0530\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"
@@ -22,6 +21,21 @@
msgid "Paused!"
msgstr ""
+#: src/loaders.c:74 src/playgame.c:949 src/titlescreen.c:74
+#, c-format
+msgid "Easy"
+msgstr ""
+
+#: src/loaders.c:75 src/playgame.c:950 src/titlescreen.c:75
+#, c-format
+msgid "Medium"
+msgstr ""
+
+#: src/loaders.c:76 src/playgame.c:951 src/titlescreen.c:76
+#, c-format
+msgid "Hard"
+msgstr ""
+
#: src/pause.c:286
msgid "Sound Effects Volume"
msgstr ""
@@ -42,86 +56,102 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:947 src/titlescreen.c:71
-msgid "Easy"
+#: src/playgame.c:945
+msgid "Level"
msgstr ""
-#: src/playgame.c:948 src/titlescreen.c:72
-msgid "Medium"
+#: src/playgame.c:946
+msgid "Lives"
msgstr ""
-#: src/playgame.c:949 src/titlescreen.c:73
-msgid "Hard"
+#: src/playgame.c:947
+msgid "Fish"
msgstr ""
-#: src/titlescreen.c:71
+#: src/playgame.c:952 src/titlescreen.c:75
+msgid "Practice"
+msgstr ""
+
+#: src/playgame.c:963
+msgid "Congratulations"
+msgstr ""
+
+#: src/playgame.c:967
+msgid "Oh No!"
+msgstr ""
+
+#: src/practice.c:239
+msgid "Great!"
+msgstr ""
+
+#: src/practice.c:589
+msgid "Next letter "
+msgstr ""
+
+#: src/titlescreen.c:74
msgid "Fish Cascade"
msgstr ""
-#: src/titlescreen.c:71
+#: src/titlescreen.c:74
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:71
+#: src/titlescreen.c:74
msgid "Edit Word Lists"
msgstr ""
-#: src/titlescreen.c:72
+#: src/titlescreen.c:75
msgid "Comet Zap"
msgstr ""
-#: src/titlescreen.c:72
+#: src/titlescreen.c:75
msgid "Pilot"
msgstr ""
-#: src/titlescreen.c:72
-msgid "Practice"
-msgstr ""
-
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Lessons"
msgstr ""
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Options"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Instructions"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Commander"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Setup Language"
msgstr ""
-#: src/titlescreen.c:75
+#: src/titlescreen.c:78
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:75
+#: src/titlescreen.c:78
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:1148
+#: src/titlescreen.c:1156
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:1149
+#: src/titlescreen.c:1157
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:1150
+#: src/titlescreen.c:1158
msgid "Discuss the future of TuxTyping at"
msgstr ""
Modified: tuxtype/branches/soc-mobin/po/ml_IN.po~
===================================================================
--- tuxtype/branches/soc-mobin/po/ml_IN.po~ 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/ml_IN.po~ 2008-08-12 13:03:12 UTC (rev 611)
@@ -1,133 +1,169 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Mobin M
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: mobinmohan at gmail.com\n"
-"POT-Creation-Date: 2008-07-09 12:59+0530\n"
+"Project-Id-Version: ml_IN\n"
+"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2008-08-12 17:12+0530\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-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: src/loaders.c:73 src/pause.c:316
+#, c-format
+msgid "Paused!"
+msgstr "തടസ്സം"
+
+#: src/loaders.c:74 src/playgame.c:949 src/titlescreen.c:74
+#, c-format
+msgid "Easy"
+msgstr "എളുപ്പം"
+
+#: src/loaders.c:75 src/playgame.c:950 src/titlescreen.c:75
+#, c-format
+msgid "Medium"
+msgstr "ഇടത്തരം"
+
+#: src/loaders.c:76 src/playgame.c:951 src/titlescreen.c:76
+#, c-format
+msgid "Hard"
+msgstr "ബുദ്ധിമുട്ടുള്ളത്"
+
#: src/pause.c:286
msgid "Sound Effects Volume"
msgstr "ശബ്ദം"
#: src/pause.c:295
msgid "Music Volume"
-msgstr ""
+msgstr "പാട്ടിന്റെ ശബ്ദം"
#: src/pause.c:306
msgid "Sound & Music Disabled"
msgstr "ശബ്ദം പാട്ട് ഇല്ല"
-#: src/pause.c:316
-msgid "Paused!"
-msgstr "തടസ്സം"
-
#: src/pause.c:325
msgid "Press escape again to return to menu"
-msgstr ""
+msgstr "പുറത്തോട്ടുപോകാന് വീണ്ടും Esc കീ അമര്ത്തുക"
#: src/pause.c:334
msgid "Press space bar to return to game"
-msgstr "പുറത്തോട്ടുപോകാന് വീണ്ടും Esc കീ അമര്ത്തുക"
+msgstr "കളിയില് തിരിച്ചെത്താന് സ്പെയ്സ് കീ അടിക്കുക"
-#: src/playgame.c:943
+#: src/playgame.c:945
msgid "Level"
msgstr "തട്ട്"
-#: src/playgame.c:944
+#: src/playgame.c:946
msgid "Lives"
msgstr "ആയുസ്സ്"
-#: src/playgame.c:945
+#: src/playgame.c:947
msgid "Fish"
msgstr "മത്സ്യം"
-#: src/playgame.c:947 src/titlescreen.c:71
-msgid "Easy"
-msgstr "എളുപ്പം"
-
-#: src/playgame.c:948 src/titlescreen.c:72
-msgid "Medium"
-msgstr "ഇടത്തരം"
-
-#: src/playgame.c:949 src/titlescreen.c:73
-msgid "Hard"
-msgstr "ബുദ്ധിമുട്ടുള്ളത്"
-
-#: src/playgame.c:950 src/titlescreen.c:72
+#: src/playgame.c:952 src/titlescreen.c:75
msgid "Practice"
msgstr "പരിശീലനം"
-#: src/playgame.c:961
+#: src/playgame.c:963
msgid "Congratulations"
msgstr "കൊള്ളാലോ!!!"
-#: src/playgame.c:965
+#: src/playgame.c:967
msgid "Oh No!"
msgstr "അയ്യോ!.."
-#: src/titlescreen.c:71
+#: src/practice.c:239
+msgid "Great!"
+msgstr "അഭിനന്ദനങ്ങള്!"
+
+#: src/practice.c:589
+msgid "Next letter "
+msgstr "അടുത്തത് :"
+
+#: src/titlescreen.c:74
msgid "Fish Cascade"
msgstr "വീഴുന്ന മത്സ്യങ്ങള്"
-#: src/titlescreen.c:71
+#: src/titlescreen.c:74
msgid "Space Cadet"
msgstr "ആകാശ പറവകള് "
-#: src/titlescreen.c:71
+#: src/titlescreen.c:74
msgid "Edit Word Lists"
msgstr "വാക്കുകളുടെ ശേഖരം"
-#: src/titlescreen.c:72
+#: src/titlescreen.c:75
msgid "Comet Zap"
msgstr "വാല് നക്ഷത്രത്തെ പിടിക്കുക"
-#: src/titlescreen.c:72
+#: src/titlescreen.c:75
msgid "Pilot"
msgstr "ആദ്യ പരിശീലനം"
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Lessons"
msgstr "പാഠങ്ങള്"
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Ace"
msgstr "എയ്സ്"
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Project Info"
msgstr "കളിയുടെ വിവരങ്ങള്"
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Options"
msgstr "ഐച്ഛികങ്ങള്"
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Instructions"
msgstr "നിര്ദ്ദേശങ്ങള് "
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Commander"
msgstr "കമാന്ഡര്"
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Setup Language"
msgstr "ഭാഷ മാറ്റുക"
-#: src/titlescreen.c:75
+#: src/titlescreen.c:78
msgid "Quit"
msgstr "പുറത്തു കടക്കുക"
-#: src/titlescreen.c:75
+#: src/titlescreen.c:78
msgid "Main Menu"
msgstr "പ്രധാന മെനു"
+
+#: src/titlescreen.c:1156
+msgid "Work In Progress!"
+msgstr "പണി നടക്കുന്നുണ്ടല്ലോ"
+
+#: src/titlescreen.c:1157
+msgid "This feature is not ready yet"
+msgstr "ഇത് ഇതുവരെ ശരിയാക്കിയിട്ടില്ല."
+
+#: src/titlescreen.c:1158
+msgid "Discuss the future of TuxTyping at"
+msgstr "ടക്സ് ടൈപ്പിന്റെ ഭാവി ചര്ച്ചചെയ്യാനായി ഇവിടെ പോകുക"
+
+#, fuzzy
+#~ msgid "Easy!"
+#~ msgstr "എളുപ്പം"
+
+#, fuzzy
+#~ msgid "Medium!"
+#~ msgstr "ഇടത്തരം"
+
+#, fuzzy
+#~ msgid "Hard!"
+#~ msgstr "ബുദ്ധിമുട്ടുള്ളത്"
Modified: tuxtype/branches/soc-mobin/po/tuxtype.pot
===================================================================
--- tuxtype/branches/soc-mobin/po/tuxtype.pot 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/po/tuxtype.pot 2008-08-12 13:03:12 UTC (rev 611)
@@ -1,14 +1,13 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Mobin M
-# This file is distributed under the same license as the PACKAGE package.
+# 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: mobinmohan at gmail.com\n"
-"POT-Creation-Date: 2008-07-09 23:20+0530\n"
+"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2008-08-12 17:12+0530\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"
@@ -21,6 +20,21 @@
msgid "Paused!"
msgstr ""
+#: src/loaders.c:74 src/playgame.c:949 src/titlescreen.c:74
+#, c-format
+msgid "Easy"
+msgstr ""
+
+#: src/loaders.c:75 src/playgame.c:950 src/titlescreen.c:75
+#, c-format
+msgid "Medium"
+msgstr ""
+
+#: src/loaders.c:76 src/playgame.c:951 src/titlescreen.c:76
+#, c-format
+msgid "Hard"
+msgstr ""
+
#: src/pause.c:286
msgid "Sound Effects Volume"
msgstr ""
@@ -41,86 +55,102 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:947 src/titlescreen.c:71
-msgid "Easy"
+#: src/playgame.c:945
+msgid "Level"
msgstr ""
-#: src/playgame.c:948 src/titlescreen.c:72
-msgid "Medium"
+#: src/playgame.c:946
+msgid "Lives"
msgstr ""
-#: src/playgame.c:949 src/titlescreen.c:73
-msgid "Hard"
+#: src/playgame.c:947
+msgid "Fish"
msgstr ""
-#: src/titlescreen.c:71
+#: src/playgame.c:952 src/titlescreen.c:75
+msgid "Practice"
+msgstr ""
+
+#: src/playgame.c:963
+msgid "Congratulations"
+msgstr ""
+
+#: src/playgame.c:967
+msgid "Oh No!"
+msgstr ""
+
+#: src/practice.c:239
+msgid "Great!"
+msgstr ""
+
+#: src/practice.c:589
+msgid "Next letter "
+msgstr ""
+
+#: src/titlescreen.c:74
msgid "Fish Cascade"
msgstr ""
-#: src/titlescreen.c:71
+#: src/titlescreen.c:74
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:71
+#: src/titlescreen.c:74
msgid "Edit Word Lists"
msgstr ""
-#: src/titlescreen.c:72
+#: src/titlescreen.c:75
msgid "Comet Zap"
msgstr ""
-#: src/titlescreen.c:72
+#: src/titlescreen.c:75
msgid "Pilot"
msgstr ""
-#: src/titlescreen.c:72
-msgid "Practice"
-msgstr ""
-
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Lessons"
msgstr ""
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:73
+#: src/titlescreen.c:76
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Options"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Instructions"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Commander"
msgstr ""
-#: src/titlescreen.c:74
+#: src/titlescreen.c:77
msgid "Setup Language"
msgstr ""
-#: src/titlescreen.c:75
+#: src/titlescreen.c:78
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:75
+#: src/titlescreen.c:78
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:1148
+#: src/titlescreen.c:1156
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:1149
+#: src/titlescreen.c:1157
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:1150
+#: src/titlescreen.c:1158
msgid "Discuss the future of TuxTyping at"
msgstr ""
Modified: tuxtype/branches/soc-mobin/src/globals.h
===================================================================
--- tuxtype/branches/soc-mobin/src/globals.h 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/src/globals.h 2008-08-12 13:03:12 UTC (rev 611)
@@ -36,7 +36,7 @@
#define MAX_SPRITE_FRAMES 30
-#define LOCALEDIR "/usr/local/share"
+//#define LOCALEDIR "/usr/local/share"
#include <string.h>
#include <wchar.h>
@@ -55,7 +55,7 @@
#include <SDL/SDL_mixer.h>
#include <SDL/SDL_ttf.h>
-#include "i18n.h"
+//#include "i18n.h"
#include <libintl.h>
Modified: tuxtype/branches/soc-mobin/src/loaders.c
===================================================================
--- tuxtype/branches/soc-mobin/src/loaders.c 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/src/loaders.c 2008-08-12 13:03:12 UTC (rev 611)
@@ -65,12 +65,10 @@
void LoadLang(void)
{
- setlocale(LC_ALL,"ml");
+ setlocale(LC_ALL,"ml_IN");
fprintf(stderr,"theme_locale %s\n",settings.theme_locale_name);
- fprintf(stderr,bindtextdomain(PACKAGE,LOCALEDIR));
+ fprintf(stderr,bindtextdomain(PACKAGE,"/usr/local/share/locale"));
fprintf(stderr,textdomain(PACKAGE));
- fprintf(stderr,"loading....\n");
- fprintf(stderr,gettext("Paused!"));
return;
}
Modified: tuxtype/branches/soc-mobin/src/playgame.c
===================================================================
--- tuxtype/branches/soc-mobin/src/playgame.c 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/src/playgame.c 2008-08-12 13:03:12 UTC (rev 611)
@@ -22,6 +22,8 @@
#include "playgame.h"
#include "snow.h"
+#define _(String) gettext(String)
+
//void add_words( int level );
/* Should these be constants? */
@@ -233,7 +235,7 @@
if ( event.type == SDL_QUIT ) {
exit(0);
} else if (event.type == SDL_KEYDOWN) {
-
+
if (event.key.keysym.sym == SDLK_F11)
SDL_SaveBMP( screen, "screenshot.bmp" );
if (event.key.keysym.sym == SDLK_F6){
@@ -940,14 +942,14 @@
}
font = LoadFont(settings.theme_font_name, GAME_FONT_SIZE);
- curlev = BlackOutline(_("Level"), font, &white);
- lives = BlackOutline(_("Lives"), font, &white);
- fish = BlackOutline(_("Fish"), font, &white);
+ curlev = BlackOutline(gettext("Level"), font, &white);
+ lives = BlackOutline(gettext("Lives"), font, &white);
+ fish = BlackOutline(gettext("Fish"), font, &white);
level[0] = BlackOutline(gettext("Easy"), font, &white);
level[1] = BlackOutline(gettext("Medium"), font, &white);
level[2] = BlackOutline(gettext("Hard"), font, &white);
- level[3] = BlackOutline(_("Practice"), font, &white);
+ level[3] = BlackOutline(gettext("Practice"), font, &white);
number_max_w = 0;
for (i = 0; i < NUM_NUMS; i++) {
@@ -958,11 +960,11 @@
}
for (i = 0; i < CONGRATS_FRAMES; i++) {
- congrats[i] = BlackOutline(_("Congratulations"), font, &white);
+ congrats[i] = BlackOutline(gettext("Congratulations"), font, &white);
}
for (i = 0; i < OH_NO_FRAMES; i++) {
- ohno[i] = BlackOutline(_("Oh No!"), font, &white);
+ ohno[i] = BlackOutline(gettext("Oh No!"), font, &white);
}
if (settings.sys_sound) {
Modified: tuxtype/branches/soc-mobin/src/practice.c
===================================================================
--- tuxtype/branches/soc-mobin/src/practice.c 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/src/practice.c 2008-08-12 13:03:12 UTC (rev 611)
@@ -236,7 +236,7 @@
{
//print_string_at(_("Great!"), 275, 200);
wchar_t buf[10];
- ConvertFromUTF8(buf, _("Great!"));
+ ConvertFromUTF8(buf, gettext("Great!"));
print_at(buf,6 ,275 ,200);
SDL_Flip(screen);
SDL_Delay(2500);
@@ -586,7 +586,7 @@
{
int i;
wchar_t buf[30];
- i=ConvertFromUTF8(buf, _("Next letter "));
+ i=ConvertFromUTF8(buf, gettext("Next letter "));
buf[i]=t[c];
buf[i+1]=0;
print_at(buf,wcslen(buf),230 ,400);
Modified: tuxtype/branches/soc-mobin/src/titlescreen.c
===================================================================
--- tuxtype/branches/soc-mobin/src/titlescreen.c 2008-08-12 12:46:44 UTC (rev 610)
+++ tuxtype/branches/soc-mobin/src/titlescreen.c 2008-08-12 13:03:12 UTC (rev 611)
@@ -66,15 +66,16 @@
static void unload_menu(void);
/* --- menu text --- */
-const unsigned char *menu_text[][6]=
-{{"", "", "", "", "" },
- {"",gettext_noop("Fish Cascade"),gettext_noop("Easy"),gettext_noop("Space Cadet"),gettext_noop("Edit Word Lists")},
- {"", gettext_noop("Comet Zap"), gettext_noop("Medium"), gettext_noop("Pilot"), gettext_noop("Practice")},
- {"", gettext_noop("Lessons"), gettext_noop("Hard"), gettext_noop("Ace"), gettext_noop("Project Info")},
- {"", gettext_noop("Options"), gettext_noop("Instructions"), gettext_noop("Commander"), gettext_noop("Setup Language")},
- {"", gettext_noop("Quit"), gettext_noop("Main Menu"), gettext_noop("Main Menu"), gettext_noop("Main Menu")}};
+
+static const char *menu_text[]=
+{"", "", "", "", "" ,
+ "",gettext_noop("Fish Cascade"),gettext_noop("Easy"),gettext_noop("Space Cadet"),gettext_noop("Edit Word Lists"),
+ "",gettext_noop("Comet Zap"),gettext_noop("Medium"),gettext_noop("Pilot"),gettext_noop("Practice"),
+ "",gettext_noop("Lessons"),gettext_noop("Hard"), gettext_noop("Ace"),gettext_noop("Project Info"),
+ "", gettext_noop("Options"),gettext_noop("Instructions"),gettext_noop("Commander"),gettext_noop("Setup Language"),
+ "", gettext_noop("Quit"),gettext_noop("Main Menu"),gettext_noop("Main Menu"),gettext_noop("Main Menu")};
@@ -82,6 +83,13 @@
+
+
+
+
+
+
+
/************************************************************************/
/* */
/* "Public" functions (callable throughout program) */
@@ -921,15 +929,15 @@
max = 0;
for (i = 1; i <= TITLE_MENU_ITEMS; i++)
{
- DEBUGCODE
+ // DEBUGCODE
{
fprintf(stderr, "i = '%d'\tj = '%d'\ttext = '%s'\n",
- i, j, gettext_noop((unsigned char*)menu_text[i][j]));
+ i, j, gettext((unsigned char*)menu_text[j+5*i]));
}
/* --- create text surfaces --- */
- reg_text[i][j] = BlackOutline( gettext_noop((unsigned char*)menu_text[i][j]), font, &white);
- sel_text[i][j] = BlackOutline( gettext_noop((unsigned char*)menu_text[i][j]), font, &yellow);
+ reg_text[i][j] = BlackOutline( gettext((unsigned char*)menu_text[j+5*i]), font, &white);
+ sel_text[i][j] = BlackOutline( gettext((unsigned char*)menu_text[j+5*i]), font, &yellow);
/* (first make sure ptr valid to avoid segfault) */
if (sel_text[i][j] && sel_text[i][j]->w > max)
More information about the Tux4kids-commits
mailing list