From bfaf56bd5211c485de2390776cb0ad15f4a99bea Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Thu, 18 Dec 2003 14:49:21 +0000 Subject: [PATCH] Added Basque translation. Fixed Bokmal Makefile stuff. --- Makefile | 12 ++++++++++++ docs/html/README.html | 12 +++++++++++- src/manpage/tuxpaint.1 | 6 ++++-- src/messages/{ba.po => bs.po} | 0 src/tuxpaint.c | 16 ++++++++++++++-- 5 files changed, 41 insertions(+), 5 deletions(-) rename src/messages/{ba.po => bs.po} (100%) diff --git a/Makefile b/Makefile index 6c276fe0a..92039a4c1 100644 --- a/Makefile +++ b/Makefile @@ -207,6 +207,7 @@ uninstall: -rm -r $(DATA_PREFIX) -rm -r $(DOC_PREFIX) -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz + -rm $(LOCALE_PREFIX)bs/LC_MESSAGES/tuxpaint.mo -rm $(LOCALE_PREFIX)ca/LC_MESSAGES/tuxpaint.mo -rm $(LOCALE_PREFIX)cs/LC_MESSAGES/tuxpaint.mo -rm $(LOCALE_PREFIX)da/LC_MESSAGES/tuxpaint.mo @@ -344,6 +345,11 @@ install-gettext: @cp trans/pt_br.mo $(LOCALE_PREFIX)pt_BR/LC_MESSAGES/tuxpaint.mo @chmod 644 $(LOCALE_PREFIX)pt_BR/LC_MESSAGES/tuxpaint.mo @# + @echo " bs_BA ...Basque..." + @install -d $(LOCALE_PREFIX)bs/LC_MESSAGES + @cp trans/bs.mo $(LOCALE_PREFIX)bs/LC_MESSAGES/tuxpaint.mo + @chmod 644 $(LOCALE_PREFIX)bs/LC_MESSAGES/tuxpaint.mo + @# @echo " en_GB ...British English..." @install -d $(LOCALE_PREFIX)en_GB/LC_MESSAGES @cp trans/en_gb.mo $(LOCALE_PREFIX)en_GB/LC_MESSAGES/tuxpaint.mo @@ -578,6 +584,7 @@ obj/BeOS_Print.o: src/BeOS_Print.cpp obj src/BeOS_print.h # Build the translation files for gettext translations: trans \ + trans/bs.mo \ trans/ca.mo \ trans/cs.mo \ trans/da.mo \ @@ -597,6 +604,7 @@ translations: trans \ trans/lt.mo \ trans/ms.mo \ trans/nl.mo \ + trans/nb.mo \ trans/nn.mo \ trans/pl.mo \ trans/pt_br.mo \ @@ -615,6 +623,10 @@ trans: @echo "...Preparing translation files..." @mkdir trans +trans/bs.mo: src/messages/bs.po + @echo " bs_BA ...Basque..." + @msgfmt src/messages/bs.po -o trans/bs.mo + trans/ca.mo: src/messages/ca.po @echo " ca_ES ...Catalan..." @msgfmt src/messages/ca.po -o trans/ca.mo diff --git a/docs/html/README.html b/docs/html/README.html index dc68af693..76fbd5c24 100644 --- a/docs/html/README.html +++ b/docs/html/README.html @@ -23,7 +23,7 @@ New Breed Software

bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/

-

June 14, 2002 - September 29, 2003

+

June 14, 2002 - December 18, 2003

@@ -466,6 +466,11 @@ New Breed Software

american-english   + + basque + euskara +   + bokmal   @@ -818,6 +823,11 @@ New Breed Software

  English + + bs_BA + Basque + Euskara + ca_ES Catalan diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 82052657a..acf62e984 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2003.09.27 -.TH TUXPAINT 1 "27 Sep 2003" "0.9.13" "Tux Paint" +.\" tuxpaint.1 - 2003.12.18 +.TH TUXPAINT 1 "18 Dec 2003" "0.9.13" "Tux Paint" .SH NAME tuxpaint -- A drawing program for young children. @@ -249,6 +249,8 @@ listed below: english | american-english .TP 2 - +basque | euskara +- bokmal .TP 2 - diff --git a/src/messages/ba.po b/src/messages/bs.po similarity index 100% rename from src/messages/ba.po rename to src/messages/bs.po diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 073d3a4ce..6c4c1a35c 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -7,12 +7,12 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/tuxpaint/ - June 14, 2002 - November 14, 2003 + June 14, 2002 - December 18, 2003 */ #define VER_VERSION "0.9.13" -#define VER_DATE "2003.11.14" +#define VER_DATE "2003.12.18" /* #define DEBUG */ @@ -3632,6 +3632,7 @@ void show_lang_usage(FILE * f, char * prg) "\n" "LANGUAGE may be one of:\n" " english american-english\n" + " basque euskara\n" " bokmal\n" " brazilian brazilian-portuguese portugues-brazilian\n" " british british-english\n" @@ -3681,6 +3682,7 @@ void show_locale_usage(FILE * f, char * prg) "\n" "LOCALE may be one of:\n" " C (English American English)\n" + " bs_BA (Baque Euskara)\n" " nb_NO (Bokmal)\n" " pt_BR (Brazilian Brazilian Portuguese Portugues Brazilian)\n" " en_GN (British British English)\n" @@ -4289,6 +4291,16 @@ void setup(int argc, char * argv[]) putenv("LANG=ja_JP.UTF-8"); putenv("LC_ALL=ja_JP.UTF-8"); } + else if (strcmp(langstr, "bokmal") == 0) + { + putenv("LANG=nb_NN"); + putenv("LC_ALL=nb_NN"); + } + else if (strcmp(langstr, "basque") == 0 || strcmp(langstr, "euskara") == 0) + { + putenv("LANG=bs_BA"); + putenv("LC_ALL=bs_BA"); + } else if (strcmp(langstr, "korean") == 0) { putenv("LANG=ko_KR.UTF-8");