Oops; got Basque's locale wrong!

Makefile

@@ -6,7 +6,7 @@
 # bill@newbreedsoftware.com
 # http://www.newbreedsoftware.com/tuxpaint/
 
-# June 14, 2002 - December 18, 2003
+# June 14, 2002 - December 19, 2003
 
 
 # Where to install things:
@@ -207,7 +207,6 @@ 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
@@ -215,6 +214,7 @@ uninstall:
 	-rm $(LOCALE_PREFIX)el/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)en_GB/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)es/LC_MESSAGES/tuxpaint.mo
+	-rm $(LOCALE_PREFIX)eu/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)fi/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)fr/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)he/LC_MESSAGES/tuxpaint.mo
@@ -345,10 +345,10 @@ 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..."
+	@echo "   eu_ES ...Basque..."
-	@install -d $(LOCALE_PREFIX)bs/LC_MESSAGES
+	@install -d $(LOCALE_PREFIX)eu/LC_MESSAGES
-	@cp trans/bs.mo $(LOCALE_PREFIX)bs/LC_MESSAGES/tuxpaint.mo
+	@cp trans/eu.mo $(LOCALE_PREFIX)eu/LC_MESSAGES/tuxpaint.mo
-	@chmod 644 $(LOCALE_PREFIX)bs/LC_MESSAGES/tuxpaint.mo
+	@chmod 644 $(LOCALE_PREFIX)eu/LC_MESSAGES/tuxpaint.mo
 	@#
 	@echo "   en_GB ...British English..."
 	@install -d $(LOCALE_PREFIX)en_GB/LC_MESSAGES
@@ -584,7 +584,6 @@ 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 \
@@ -592,6 +591,7 @@ translations: trans \
 	trans/el.mo \
 	trans/en_gb.mo \
 	trans/es.mo \
+	trans/eu.mo \
 	trans/fi.mo \
 	trans/fr.mo \
 	trans/he.mo \
@@ -623,10 +623,6 @@ 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
@@ -655,6 +651,10 @@ trans/es.mo:	src/messages/es.po
 	@echo "   es_ES ...Spanish..."
 	@msgfmt src/messages/es.po -o trans/es.mo
 
+trans/eu.mo:	src/messages/eu.po
+	@echo "   eu_ES ...Basque..."
+	@msgfmt src/messages/eu.po -o trans/eu.mo
+	
 trans/fi.mo:	src/messages/fi.po
 	@echo "   fi_FI ...Finnish..."
 	@msgfmt src/messages/fi.po -o trans/fi.mo

docs/CHANGES.txt

@@ -7,14 +7,14 @@ bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
 
-2003.Dec.18 (0.9.13) [cvs]
+2003.Dec.19 (0.9.13) [cvs]
-  * Translated into Basque
+  * Translated into Basque (eu_ES)
     Juan Irigoien <juanirigoien@irakasle.net>
 
-  * Translated into Norwegian Bokmal
+  * Translated into Norwegian Bokmal (nb_NO)
     Dag H. Loras <dag.loraas@operamail.com>
 
-  * Translated into Tamil  [buggy]
+  * Translated into Tamil (ta_IN)  [buggy]
     Mugunth <mugunth@thamizha.com>
 
   * Made sure options were in the same order in various places in man page

docs/README.txt

@@ -9,7 +9,7 @@
                            bill@newbreedsoftware.com
                    http://www.newbreedsoftware.com/tuxpaint/
 
-                       June 14, 2002 - September 29, 2003
+                       June 14, 2002 - December 19, 2003
 
      ----------------------------------------------------------------------
 
@@ -356,6 +356,8 @@ Options
                      +-------------------------------------------------+
                      |english             |american-english  |         |
                      |--------------------+------------------+---------|
+                     |basque              |euskara           |         |
+                     |--------------------+------------------+---------|
                      |bokmal              |                  |         |
                      |--------------------+------------------+---------|
                      |british-english     |british           |         |
@@ -572,6 +574,8 @@ Options
            |---------------+-------------------+--------------------|
            |es_ES@euro     |Espanol            |Spanish             |
            |---------------+-------------------+--------------------|
+           |eu_ES          |Basque             |Euskara             |
+           |---------------+-------------------+--------------------|
            |fi_FI@euro     |Suomi              |Finnish             |
            |---------------+-------------------+--------------------|
            |fr_FR@euro     |Franc,ais          |French              |
@@ -594,7 +598,7 @@ Options
            |---------------+-------------------+--------------------|
            |ms_MY          |                   |Malay               |
            |---------------+-------------------+--------------------|
-           |nb_NO          |Norsk (bokmal)     |Norwegian Bokmal    |
+           |nb_NO          |Norsk (bokmaal)    |Norwegian Bokmaal   |
            |---------------+-------------------+--------------------|
            |nn_NO          |Norsk (nynorsk)    |Norwegian Nynorsk   |
            |---------------+-------------------+--------------------|

docs/html/README.html

@@ -23,7 +23,7 @@ New Breed Software</p>
 <p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
 <a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
 
-<p>June 14, 2002 - December 18, 2003</p>
+<p>June 14, 2002 - December 19, 2003</p>
 </center>
 
 <hr size=2 noshade>
@@ -823,11 +823,6 @@ New Breed Software</p>
 	<td>&nbsp;</td>
 	<td>English</td>
       </tr>
-      <tr>
-        <td><code>bs_BA</code></td>
-	<td>Basque</td>
-	<td>Euskara</td>
-      </tr>
       <tr>
         <td><code>ca_ES</code></td>
 	<td>Catalan</td>
@@ -863,6 +858,11 @@ New Breed Software</p>
 	<td>Espa&ntilde;ol</td>
 	<td>Spanish</td>
       </tr>
+      <tr>
+        <td><code>eu_ES</code></td>
+	<td>Basque</td>
+	<td>Euskara</td>
+      </tr>
       <tr>
         <td><code>fi_FI@euro</code></td>
 	<td>Suomi</td>

src/tuxpaint.c

@@ -7,12 +7,12 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/tuxpaint/
   
-  June 14, 2002 - December 18, 2003
+  June 14, 2002 - December 19, 2003
 */
 
 
 #define VER_VERSION     "0.9.13"
-#define VER_DATE        "2003.12.18"
+#define VER_DATE        "2003.12.19"
 
 
 /* #define DEBUG */
@@ -261,7 +261,6 @@ void win32_perror(const char *str)
 /* Possible languages: */
 
 enum {
-  LANG_BS,     /* Basque */
   LANG_CA,     /* Catalan */
   LANG_CS,     /* Czech */
   LANG_DA,     /* Danish */
@@ -270,6 +269,7 @@ enum {
   LANG_EN,     /* English (American) (DEFAULT) */
   LANG_EN_GB,  /* English (British) */
   LANG_ES,     /* Spanish */
+  LANG_EU,     /* Basque */
   LANG_FI,     /* Finnish */
   LANG_FR,     /* French */
   LANG_HE,     /* Hebrew */
@@ -299,7 +299,6 @@ enum {
 };
 
 const char * lang_prefixes[NUM_LANGS] = {
-  "bs",
   "ca",
   "cs",
   "da",
@@ -308,6 +307,7 @@ const char * lang_prefixes[NUM_LANGS] = {
   "en",
   "en_gb",
   "es",
+  "eu",
   "fi",
   "fr",
   "he",
@@ -3685,7 +3685,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"
+    "  eu_ES   (Baque        Euskara)\n"
     "  nb_NO   (Bokmal)\n"
     "  pt_BR   (Brazilian    Brazilian Portuguese   Portugues Brazilian)\n"
     "  en_GN   (British      British English)\n"
@@ -4313,8 +4313,8 @@ void setup(int argc, char * argv[])
       }
     else if (strcmp(langstr, "basque") == 0 || strcmp(langstr, "euskara") == 0)
       {
-	putenv("LANG=bs_BA");
+	putenv("LANG=eu_ES");
-	putenv("LC_ALL=bs_BA");
+	putenv("LC_ALL=eu_ES");
       }
     else if (strcmp(langstr, "korean") == 0)
       {