From cc9d77cc5fe731b95041650501d1e3fc018b4a29 Mon Sep 17 00:00:00 2001
From: wkendrick <wkendrick>
Date: Thu, 13 Jan 2011 04:25:50 +0000
Subject: Support for Latin Serbian.

---
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 028a3ca..37967c1 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -6,7 +6,7 @@ Copyright (c) 2002-2011 by Bill Kendrick and others
 bill@newbreedsoftware.com
 http://www.tuxpaint.org/
 
-$Id: CHANGES.txt,v 1.761 2011/01/13 04:05:56 wkendrick Exp $
+$Id: CHANGES.txt,v 1.762 2011/01/13 04:25:50 wkendrick Exp $
 
 2011.January.12 (0.9.22)
   * New Tools:
@@ -238,6 +238,9 @@ $Id: CHANGES.txt,v 1.761 2011/01/13 04:05:56 wkendrick Exp $
     * Persian translation
       Farinaz Hedayat <farinaz.hedayat@gmail.com>
 
+    * Serbian translation (latin)
+      Ivana Rakic <reci.ne.silvesteru@gmail.com>
+
     * Venetian language
       Fabio Lazarin, El Galep�n <mistro@elgalepin.com>
 
@@ -304,7 +307,7 @@ $Id: CHANGES.txt,v 1.761 2011/01/13 04:05:56 wkendrick Exp $
     * Portuguese translation
       Sergio Marques <smarquespt@gmail.com>
 
-    * Serbian translations (cyrillic and latin)
+    * Serbian translations (cyrillic)
       Ivana Rakic <reci.ne.silvesteru@gmail.com>
 
     * Slovak translation
diff --git a/docs/OPTIONS.txt b/docs/OPTIONS.txt
index 90cedb1..664166c 100644
--- a/docs/OPTIONS.txt
+++ b/docs/OPTIONS.txt
@@ -1048,7 +1048,7 @@ Available Languages
          |sr_YU      |                   |Serbian          |                |
          |           |                   |(cyrillic)       |                |
          |-----------+-------------------+-----------------+----------------|
-         |sr_YU@latin|                   |Serbian (latin)  |                |
+         |sr_RS@latin|                   |Serbian (latin)  |                |
          |-----------+-------------------+-----------------+----------------|
          |sv_SE      |Svenska            |Swedish          |                |
          |-----------+-------------------+-----------------+----------------|
diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html
index f928298..74d08f4 100644
--- a/docs/html/OPTIONS.html
+++ b/docs/html/OPTIONS.html
@@ -1793,7 +1793,7 @@ New Breed Software</p>
     <td>&nbsp;</td>
   </tr>
   <tr>
-    <td><code>sr_YU@latin</code></td>
+    <td><code>sr_RS@latin</code></td>
     <td>&nbsp;</td>
     <td>Serbian (latin)</td>
     <td>&nbsp;</td>
diff --git a/src/i18n.c b/src/i18n.c
index ed6744e..e598b0f 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -4,7 +4,7 @@
   For Tux Paint
   Language-related functions
 
-  Copyright (c) 2002-2008 by Bill Kendrick and others
+  Copyright (c) 2002-2011 by Bill Kendrick and others
   bill@newbreedsoftware.com
   http://www.tuxpaint.org/
 
@@ -23,9 +23,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  $Id: i18n.c,v 1.86 2010/12/17 15:55:48 johnnypops Exp $
+  $Id: i18n.c,v 1.87 2011/01/13 04:25:50 wkendrick Exp $
 
-  June 14, 2002 - October 28, 2010
+  June 14, 2002 - January 12, 2011
 */
 
 #include <stdio.h>
@@ -129,6 +129,7 @@ const char *lang_prefixes[NUM_LANGS] = {
   "son",
   "sq",
   "sr",
+  "sr@latin",
   "sv",
   "sw",
   "ta",
@@ -314,6 +315,7 @@ static const language_to_locale_struct language_to_locale_array[] = {
   {"russian", "ru_RU.UTF-8"},
   {"russkiy", "ru_RU.UTF-8"},
   {"serbian", "sr_YU.UTF-8"},
+  {"serbian-latin", "sr_RS@latin"},
   {"shuswap", "shs_CA.UTF-8"},
   {"secwepemctin", "shs_CA.UTF-8"},
   {"slovak", "sk_SK.UTF-8"},
@@ -421,6 +423,7 @@ static void show_lang_usage(int exitcode)
 /* ru */ "  russian      russkiy\n"
 /* gd */ "  scottish     scottish-gaelic        ghaidhlig\n"
 /* sr */ "  serbian\n"
+/* sr@latin */ "  serbian-latin\n"
 /* shs */ "  shuswap      secwepemctin\n"
 /* sk */ "  slovak\n"
 /* sl */ "  slovenian    slovensko\n"
@@ -531,7 +534,8 @@ static void show_locale_usage(FILE * f, const char *const prg)
 	  "  sl_SI   (Slovenian)\n"
           "  son     (Songhay)\n"
 	  "  sq_AL   (Albanian)\n"
-	  "  sr_YU   (Serbian)\n"
+	  "  sr_YU   (Serbian (cyrillic))\n"
+          "  sr_RS@latin  (Serbian (latin))\n"
 	  "  es_ES   (Spanish      Espanol)\n"
 	  "  es_MX   (Mexican      Mexican Spanish       Espanol Mejicano)\n"
 	  "  sw_TZ   (Swahili)\n"
diff --git a/src/i18n.h b/src/i18n.h
index 23b907c..605c763 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -4,7 +4,7 @@
   For Tux Paint
   Language-related functions
 
-  Copyright (c) 2002-2009 by Bill Kendrick and others
+  Copyright (c) 2002-2011 by Bill Kendrick and others
   bill@newbreedsoftware.com
   http://www.tuxpaint.org/
 
@@ -23,9 +23,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  $Id: i18n.h,v 1.49 2010/10/28 17:46:07 wkendrick Exp $
+  $Id: i18n.h,v 1.50 2011/01/13 04:25:50 wkendrick Exp $
   
-  June 14, 2002 - October 28, 2010
+  June 14, 2002 - January 12, 2011
 */
 
 
@@ -114,7 +114,8 @@ enum
   LANG_SL,			/* Slovenian */
   LANG_SON,                     /* Songhay */
   LANG_SQ,			/* Albanian */
-  LANG_SR,			/* Serbian */
+  LANG_SR,			/* Serbian (cyrillic) */
+  LANG_SR_LATIN,		/* Serbian (latin) */
   LANG_SV,			/* Swedish */
   LANG_SW,			/* Swahili */
   LANG_TA,			/* Tamil */
--
cgit v0.9.1