[Tux4kids-commits] r322 - in tuxmath/trunk: . data/missions/lessons docs intl po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Nov 15 22:29:36 UTC 2007
Author: dbruce-guest
Date: 2007-11-15 22:29:36 +0000 (Thu, 15 Nov 2007)
New Revision: 322
Added:
tuxmath/trunk/po/nl.po
Modified:
tuxmath/trunk/data/missions/lessons/Makefile.am
tuxmath/trunk/data/missions/lessons/update-po.sh
tuxmath/trunk/docs/changelog
tuxmath/trunk/intl/localename.c
tuxmath/trunk/notesblurb
tuxmath/trunk/po/LINGUAS
tuxmath/trunk/src/SDL_extras.h
tuxmath/trunk/src/tuxmath.c
tuxmath/trunk/src/tuxmath.h
Log:
Added Dutch po file; some work toward i18n on Win32;
Modified: tuxmath/trunk/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.am 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/data/missions/lessons/Makefile.am 2007-11-15 22:29:36 UTC (rev 322)
@@ -68,9 +68,8 @@
all: descr_lessons
# Create a 'source' file holding all the descriptions for the missions.
-# FIXME this could be made less fragile
descr_lessons: $(data_LESSONS)
- $(top_srcdir)/data/missions/lessons/update-po.sh
+ cd $(VPATH); ./update-po.sh
install-data-local:
Modified: tuxmath/trunk/data/missions/lessons/update-po.sh
===================================================================
--- tuxmath/trunk/data/missions/lessons/update-po.sh 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/data/missions/lessons/update-po.sh 2007-11-15 22:29:36 UTC (rev 322)
@@ -1,18 +1,11 @@
#!/bin/sh
# Create a 'source' file holding all the descriptions for the missions.
-cd ../../../../trunk/data/missions/lessons
+# NOTE this script needs to be kept in the same dir as the lesson files
rm -f ./descr_lessons
for i in ./lesson*; do
head --lines=1 $i | sed 's/^# \(.*\)$/_("\1")/' >> descr_lessons;
done;
-# Update the POT translation template file.
-#intltool-update --pot --gettext-package=tuxmath
-# Update all the PO translation files.
-#for i in *.po ; do
-# echo $i
-# msgmerge $i tuxmath.pot > temp.tmp && mv -f temp.tmp $i
-#done
Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/docs/changelog 2007-11-15 22:29:36 UTC (rev 322)
@@ -1,3 +1,17 @@
+2007.Nov.15 (svn.debian.org/tux4kids - revision 322)
+Version 1.5.8
+ i18n:
+ * Added Dutch po file - contributed by:
+ Luc Schrijvers <Begasus at skynet.be>
+
+ Build:
+ * Started work on gettext for Windows - removed
+ #ifdef WIN32 statements, program builds and runs
+ without errors but the crossbuild doesn't yet include
+ the .mo translation files.
+
+ David Bruce <dbruce at tampabay.rr.com>
+
2007.Nov.15 (svn.debian.org/tux4kids - revision 320)
Graphics:
* Added a new function "Blend" to composite two images with transparency
@@ -31,6 +45,7 @@
2007.Oct.30 (svn.debian.org/tux4kids - revision 311)
+
Code:
* Uncrufting! - eliminated tuxtype_playsound(), moved playsound() to audio.c,
and removed playsound.c and .h; eliminated alphabet.c; moved DarkenScreen()
Modified: tuxmath/trunk/intl/localename.c
===================================================================
--- tuxmath/trunk/intl/localename.c 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/intl/localename.c 2007-11-15 22:29:36 UTC (rev 322)
@@ -1142,7 +1142,7 @@
switch (sub)
{
case SUBLANG_BENGALI_INDIA: return "bn_IN";
- case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+// case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
}
return "bn";
case LANG_BULGARIAN: return "bg_BG";
@@ -1356,7 +1356,7 @@
switch (sub)
{
case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+// case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
}
return "pa";
case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1364,7 +1364,7 @@
switch (sub)
{
case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+// case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
}
return "ro";
case LANG_RUSSIAN:
Modified: tuxmath/trunk/notesblurb
===================================================================
--- tuxmath/trunk/notesblurb 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/notesblurb 2007-11-15 22:29:36 UTC (rev 322)
@@ -1,3 +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".
+Source tar.gz archive for TuxMath 1.5.8, 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
+Build requires the *-dev files for SDL, SDL_image, SDL_mixer, and SDL_ttf. Gnu gettext is no longer 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/po/LINGUAS
===================================================================
--- tuxmath/trunk/po/LINGUAS 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/po/LINGUAS 2007-11-15 22:29:36 UTC (rev 322)
@@ -1,6 +1,7 @@
# Set of available languages.
cs
nb
+nl
nn
en at quot
en at boldquot
Added: tuxmath/trunk/po/nl.po
===================================================================
--- tuxmath/trunk/po/nl.po (rev 0)
+++ tuxmath/trunk/po/nl.po 2007-11-15 22:29:36 UTC (rev 322)
@@ -0,0 +1,354 @@
+# Dutch translation of tuxmath.pot for TuxMath
+# This file is put in the public domain.
+# Schrijvers Luc <Begasus at skynet.be>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-11-14 19:41+0000\n"
+"PO-Revision-Date: 2007-11-15 09:00+0100\n"
+"Last-Translator: Schrijvers Luc <Begasus at skynet.be>\n"
+"Language-Team: Dutch <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/titlescreen.c:400
+msgid "Work In Progress!"
+msgstr "Werk in uitvoering"
+
+#: src/titlescreen.c:401
+msgid "This feature is not ready yet"
+msgstr "Deze functie is nog niet beschikbaar"
+
+#: src/titlescreen.c:402
+msgid "Discuss the future of TuxMath at"
+msgstr "Praat over de toekomst van TuxMath op"
+
+#: src/titlescreen.c:403
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:571
+msgid "Math Command Training Academy"
+msgstr "Reken commando training academie"
+
+#: src/titlescreen.c:572
+msgid "Play Arcade Game"
+msgstr "Speel Arcade spel"
+
+#: src/titlescreen.c:573
+msgid "Play Custom Game"
+msgstr "Speel je eigen spel"
+
+#: src/titlescreen.c:574
+msgid "Help"
+msgstr "Help"
+
+#: src/titlescreen.c:575
+msgid "More Options"
+msgstr "Meer opties"
+
+#: src/titlescreen.c:576
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/titlescreen.c:644
+msgid "Space Cadet"
+msgstr "Ruimte kadet"
+
+#: src/titlescreen.c:645
+msgid "Scout"
+msgstr "Scout"
+
+#: src/titlescreen.c:646
+msgid "Ranger"
+msgstr "Ranger"
+
+#: src/titlescreen.c:647
+msgid "Ace"
+msgstr "Ace"
+
+#: src/titlescreen.c:648
+msgid "Hall Of Fame"
+msgstr "Hoogste scores"
+
+#: src/titlescreen.c:649
+msgid "Main menu"
+msgstr "Hoofdmenu"
+
+#: src/titlescreen.c:723
+msgid "Edit 'options' file in your home directory"
+msgstr "Bewerk 'options' bestand in je home folder"
+
+#: src/titlescreen.c:724
+msgid "to create customized game!"
+msgstr "voor een eigen spel!"
+
+#: src/titlescreen.c:725
+msgid "Press a key or click your mouse to start game."
+msgstr "Druk op een toets of de muis om het spel te starten."
+
+#: src/titlescreen.c:726
+msgid "See README.txt for more information"
+msgstr "Lees README.txt voor meer informatie"
+
+#: src/titlescreen.c:757
+msgid "Demo"
+msgstr "Demo"
+
+#: src/titlescreen.c:758
+msgid "Project Info"
+msgstr "Projekt info"
+
+#: src/titlescreen.c:759
+msgid "Credits"
+msgstr "Kredieten"
+
+#: src/titlescreen.c:760
+msgid "Main Menu"
+msgstr "Hoofdmenu"
+
+#: src/titlescreen.c:804
+msgid "TuxMath is free and open-source!"
+msgstr "TuxMath is gratis en open-source!"
+
+#: src/titlescreen.c:805
+msgid "You can help make it better by reporting problems,"
+msgstr "Je kan helpen met het verbeteren door problemen te melden,"
+
+#: src/titlescreen.c:806
+msgid "suggesting improvements, or adding code."
+msgstr "suggesties verbeteringen, of code toevoegen."
+
+#: src/titlescreen.c:807
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr "Nummers typen"
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr "Optellen 1 tot 3"
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr "Optellen 1 tot 5"
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr "Optellen: sommen tot 10"
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr "Optellen: sommen tot 15"
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr "Optellen: sommen tot 20"
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr "Optellen: dubbele getallen"
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr "Optellen: missende getallen"
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr "Aftellen: 0 tot 10"
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr "Aftellen: 0 tot 20"
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Aftellen: dubbele getallen"
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr "Optellen en aftellen test"
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr "Vermenigvuldigen: 0 tot 3"
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr "Vermenigvuldigingen van 2"
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr "Vermenigvuldigingen van 3"
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr "Vermenigvuldigingen van 4"
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr "Vermenigvuldigingen van 5"
+
+#: data/missions/lessons/descr_lessons:18
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiplication: 0 to 5"
+msgstr "Vermenigvuldig: 0 tot 5"
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 6"
+msgstr "Vermenigvuldigingen van 6"
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiples of 7"
+msgstr "Vermenigvuldigingen van 7"
+
+#: data/missions/lessons/descr_lessons:22
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiplication: 0 to 7"
+msgstr "Vermenigvuldig: 0 tot 7"
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 8"
+msgstr "Vermenigvuldigingen van 8"
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiples of 9"
+msgstr "Vermenigvuldigingen van 9"
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 10"
+msgstr "Vermenigvuldigingen van 10"
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 10"
+msgstr "Vermenigvuldig: 0 tot 10"
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 11 and 12"
+msgstr "Vermenigvuldigingen van 11 en 12"
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 12"
+msgstr "Vermenigvuldig: 0 tot 12"
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiples of 13, 14, and 15"
+msgstr "Vermenigvuldigingen van 13, 14 en 15"
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Multiplication: 0 to 15"
+msgstr "Vermenigvuldig: 0 tot 15"
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Multiplication: Missing Numbers"
+msgstr "Vermenigvuldig: missende getallen"
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 2"
+msgstr "Delen door 2"
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 3"
+msgstr "Delen door 3"
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division by 4"
+msgstr "Delen door 4"
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 5"
+msgstr "Delen door 5"
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division: 1 to 5"
+msgstr "Delen: 1 tot 5"
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 6"
+msgstr "Delen door 6"
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 7"
+msgstr "Delen door 7"
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 8"
+msgstr "Delen door 8"
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division by 9"
+msgstr "Delen door 9"
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 10"
+msgstr "Delen door 10"
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 10"
+msgstr "Delen: 1 tot 10"
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 11 and 12"
+msgstr "Delen door 11 en 12"
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 12"
+msgstr "Delen: 1 tot 12"
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Division by 13, 14, and 15"
+msgstr "Delen door 13, 14 en 15"
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Division: 1 to 15"
+msgstr "Delen: 1 tot 15"
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Multiplication and Division Review"
+msgstr "Vermenigvuldigen en delen test"
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Typing Negative Numbers"
+msgstr "Typ negatieve getallen"
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtraction: Negative Answers"
+msgstr "Aftellen: negatieve antwoorden"
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Positives"
+msgstr "Optellen: negatief naar positief"
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Positives"
+msgstr "Aftellen: negatief van positief"
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Adding Negatives to Negatives"
+msgstr "Optellen: negatief naar negatief"
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Subtracting Negatives From Negatives"
+msgstr "Aftellen: negatief van negatief"
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Negative and Positive Numbers Review"
+msgstr "Negatieve en positieve getallen test"
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Multiplication and Division of Negatives"
+msgstr "Vermenigvuldigen en delen van negatieven"
+
+#: data/missions/lessons/descr_lessons:57
+msgid "Multiplication of Positives and Negatives"
+msgstr "Vermenigvuldigen van positieven en negatieven"
+
+#: data/missions/lessons/descr_lessons:58
+msgid "Division of Positives and Negatives"
+msgstr "Delen van positieven en negatieven"
Modified: tuxmath/trunk/src/SDL_extras.h
===================================================================
--- tuxmath/trunk/src/SDL_extras.h 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/src/SDL_extras.h 2007-11-15 22:29:36 UTC (rev 322)
@@ -35,6 +35,6 @@
int inRect(SDL_Rect r, int x, int y);
void DarkenScreen(Uint8 bits);
void SwitchScreenMode(void);
-SDL_Surface* Blend(SDL_Surface *S1,SDL_Surface *S2,float gamma);
+SDL_Surface* Blend(SDL_Surface *S1, SDL_Surface *S2,float gamma);
#endif
Modified: tuxmath/trunk/src/tuxmath.c
===================================================================
--- tuxmath/trunk/src/tuxmath.c 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/src/tuxmath.c 2007-11-15 22:29:36 UTC (rev 322)
@@ -30,14 +30,15 @@
int main(int argc, char * argv[])
{
#ifndef MACOSX
-#ifndef WIN32
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
- printf("gettext(\"Help\"): %s\n\n", gettext("Help"));
+#ifdef TUXMATH_DEBUG
+ fprintf(stderr, "gettext(\"Help\"): %s\n\n", gettext("Help"));
#endif
+
#endif
setup(argc, argv);
Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h 2007-11-15 14:14:59 UTC (rev 321)
+++ tuxmath/trunk/src/tuxmath.h 2007-11-15 22:29:36 UTC (rev 322)
@@ -29,11 +29,12 @@
#ifdef MACOSX
#define N_(String) String
#define _(String) String
-#else
+//#else
/* Nor on Windows: */
-#ifdef WIN32
-#define N_(String) String
-#define _(String) String
+//#ifdef WIN32
+//#define N_(String) String
+//#define _(String) String
+
/* Set up support for NLS on other platforms - i.e. Linux/Unix: */
#else
#include "gettext.h"
@@ -42,7 +43,7 @@
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
#endif
-#endif
+//#endif
#include <wchar.h>
More information about the Tux4kids-commits
mailing list