Alexandre Julliard : po: Use more standard names for the Serbian locales.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c0b813f002103e8fcfd4c408373e38e7434d3a80
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c0b813f002103e8fcfd4c40837...

Author: Alexandre Julliard 
Date:   Fri Jan  7 12:11:41 2011 +0100

po: Use more standard names for the Serbian locales.

---

configure                            |    4 ++--
 configure.ac                         |    4 ++--
 po/LINGUAS                           |    4 ++--
 po/{sr_SP.po => [e-mail]}   |    0 
 po/{sr_Latn_SP.po => [e-mail]} |    0 
 tools/wrc/po.c                       |   12 ++++++------
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index d5de334..115cf84 100755
--- a/configure
+++ b/configure
@@ -15431,8 +15431,8 @@ ro \
 ru \
 sk \
 sl \
-sr_Latn_SP \
-sr_SP \
+sr_RS@cyrillic \
+sr_RS@latin \
 sv \
 te \
 th \
diff --git a/configure.ac b/configure.ac
index 7a01ac6..9865974 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2960,8 +2960,8 @@ ro \
 ru \
 sk \
 sl \
-sr_Latn_SP \
-sr_SP \
+sr_RS@cyrillic \
+sr_RS@latin \
 sv \
 te \
 th \
diff --git a/po/LINGUAS b/po/LINGUAS
index 82ac3ae..cf4b40b 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -28,8 +28,8 @@ ro
 ru
 sk
 sl
-sr_Latn_SP
-sr_SP
+sr_RS@cyrillic
+sr_RS@latin
 sv
 te
 th
diff --git a/po/sr_SP.po b/po/[e-mail]
similarity index 100%
rename from po/sr_SP.po
rename to po/[e-mail]
diff --git a/po/sr_Latn_SP.po b/po/[e-mail]
similarity index 100%
rename from po/sr_Latn_SP.po
rename to po/[e-mail]
diff --git a/tools/wrc/po.c b/tools/wrc/po.c
index c075a39..e47bda2 100644
--- a/tools/wrc/po.c
+++ b/tools/wrc/po.c
@@ -164,8 +164,8 @@ static const struct
     { LANG_RUSSIAN,        SUBLANG_RUSSIAN_RUSSIA,              "ru_RU" },
     { LANG_SERBIAN,        SUBLANG_NEUTRAL,                     "hr" },
     { LANG_SERBIAN,        SUBLANG_SERBIAN_CROATIA,             "hr_HR" },
-    { LANG_SERBIAN,        SUBLANG_SERBIAN_LATIN,               "sr_Latn_SP" },
-    { LANG_SERBIAN,        SUBLANG_SERBIAN_CYRILLIC,            "sr_SP" },
+    { LANG_SERBIAN,        SUBLANG_SERBIAN_LATIN,               "sr_RS@latin" },
+    { LANG_SERBIAN,        SUBLANG_SERBIAN_CYRILLIC,            "sr_RS@cyrillic" },
     { LANG_SLOVAK,         SUBLANG_NEUTRAL,                     "sk" },
     { LANG_SLOVAK,         SUBLANG_SLOVAK_SLOVAKIA,             "sk_SK" },
     { LANG_ALBANIAN,       SUBLANG_NEUTRAL,                     "sq" },
@@ -198,8 +198,8 @@ static const struct
     { LANG_ARMENIAN,       SUBLANG_NEUTRAL,                     "hy" },
     { LANG_ARMENIAN,       SUBLANG_ARMENIAN_ARMENIA,            "hy_AM" },
     { LANG_AZERI,          SUBLANG_NEUTRAL,                     "az" },
-    { LANG_AZERI,          SUBLANG_AZERI_LATIN,                 "az_Latn_AZ" },
-    { LANG_AZERI,          SUBLANG_AZERI_CYRILLIC,              "az_AZ" },
+    { LANG_AZERI,          SUBLANG_AZERI_LATIN,                 "az_AZ@latin" },
+    { LANG_AZERI,          SUBLANG_AZERI_CYRILLIC,              "az_AZ@cyrillic" },
     { LANG_BASQUE,         SUBLANG_NEUTRAL,                     "eu" },
     { LANG_BASQUE,         SUBLANG_BASQUE_BASQUE,               "eu_ES" },
     { LANG_MACEDONIAN,     SUBLANG_NEUTRAL,                     "mk" },
@@ -222,8 +222,8 @@ static const struct
     { LANG_SWAHILI,        SUBLANG_NEUTRAL,                     "sw" },
     { LANG_SWAHILI,        SUBLANG_SWAHILI_KENYA,               "sw_KE" },
     { LANG_UZBEK,          SUBLANG_NEUTRAL,                     "uz" },
-    { LANG_UZBEK,          SUBLANG_UZBEK_LATIN,                 "uz_Latn_UZ" },
-    { LANG_UZBEK,          SUBLANG_UZBEK_CYRILLIC,              "uz_UZ" },
+    { LANG_UZBEK,          SUBLANG_UZBEK_LATIN,                 "uz_UZ@latin" },
+    { LANG_UZBEK,          SUBLANG_UZBEK_CYRILLIC,              "uz_UZ@cyrillic" },
     { LANG_TATAR,          SUBLANG_NEUTRAL,                     "tt" },
     { LANG_TATAR,          SUBLANG_TATAR_RUSSIA,                "tt_TA" },
     { LANG_PUNJABI,        SUBLANG_NEUTRAL,                     "pa" },