summaryrefslogtreecommitdiff
path: root/nls/locale.alias.pre
diff options
context:
space:
mode:
authorMilos Komarcevic <miloskomarcevic@netscape.net>2009-03-16 17:43:26 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-03-16 17:43:26 -0700
commitda95ecbbdcacc483cd0b5fd7db1fb2e2543341bd (patch)
tree3ff7881dde14ddab24d143db700d537d907c7072 /nls/locale.alias.pre
parent934a6c0519a9e32505beee55b004f36c2a710217 (diff)
Bug 11456: Serbian locale updates (sr_RS and sr_ME)
X.Org Bug #11456 <http://bugs.freedesktop.org/show_bug.cgi?id=11456> Patch #23937 <http://bugs.freedesktop.org/attachment.cgi?id=23937> Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'nls/locale.alias.pre')
-rw-r--r--nls/locale.alias.pre72
1 files changed, 28 insertions, 44 deletions
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 08d9ebcf..5877f823 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -967,14 +967,14 @@ rw_RW.utf8: rw_RW.UTF-8
se_NO: se_NO.UTF-8
se_NO.utf8: se_NO.UTF-8
XCOMM sh was the old ISO code for Serbo-Croatian (now individual sr and hr).
-XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
+XCOMM YU was the old ISO code for Yugoslavia (later CS for Serbia&Montenegro).
+XCOMM CS was the old ISO code for Serbia&Montenegro (now separate RS and ME).
XCOMM These lines should be deleted in the future.
-sh: sr_CS.ISO8859-2
+sh: sr_RS.UTF-8@latin
sh_BA.ISO8859-2@bosnia: sr_CS.ISO8859-2
sh_HR.iso88592: hr_HR.ISO8859-2
-sh_SP: sr_CS.ISO8859-2
-sh_YU: sr_CS.ISO8859-2
-sh_YU.utf8: sr_CS.UTF-8
+sh_YU: sr_RS.UTF-8@latin
+sh_YU.utf8: sr_RS.UTF-8@latin
si: si_LK.UTF-8
si_LK: si_LK.UTF-8
sk: sk_SK.ISO8859-2
@@ -987,49 +987,33 @@ sl_SI: sl_SI.ISO8859-2
sl_SI.iso88592: sl_SI.ISO8859-2
sl_SI.ISO-8859-2: sl_SI.ISO8859-2
sl_SI.utf8: sl_SI.UTF-8
-XCOMM sp is not an ISO 639 language code, but in Cyrillic, "R" looks like "P".
-XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
-XCOMM These lines should be deleted in the future.
-sp: sr_CS.ISO8859-5
-sp_YU: sr_CS.ISO8859-5
sq: sq_AL.ISO8859-2
sq_AL: sq_AL.ISO8859-2
sq_AL.iso88592: sq_AL.ISO8859-2
sq_AL.ISO-8859-2: sq_AL.ISO8859-2
sq_AL.utf8: sq_AL.UTF-8
-XCOMM SP is not an ISO 639 country code, but in Cyrillic, "R" looks like "P".
-XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
+XCOMM YU was the old ISO code for Yugoslavia (later CS for Serbia&Montenegro).
+XCOMM CS was the old ISO code for Serbia&Montenegro (now separate RS and ME).
XCOMM Some of these lines should be deleted in the future.
-sr_SP: sr_CS.ISO8859-2
-sr: sr_CS.ISO8859-5
-sr_YU: sr_CS.ISO8859-5
-sr_YU.iso88592: sr_CS.ISO8859-2
-sr_YU.ISO-8859-2: sr_CS.ISO8859-2
-sr_YU.iso88595: sr_CS.ISO8859-5
-sr_YU.ISO-8859-5: sr_CS.ISO8859-5
-sr@cyrillic: sr_CS.ISO8859-5
-sr_YU@cyrillic: sr_CS.ISO8859-5
-sr_YU.iso88595@cyrillic: sr_CS.ISO8859-5
-sr_YU.ISO-8859-5@cyrillic: sr_CS.ISO8859-5
-sr_YU.ISO8859-5@cyrillic: sr_CS.ISO8859-5
-sr_YU.cp1251@cyrillic: sr_CS.CP1251
-sr_YU.CP1251@cyrillic: sr_CS.CP1251
-sr_YU.microsoftcp1251@cyrillic: sr_CS.CP1251
-sr_YU.microsoft-cp1251@cyrillic: sr_CS.CP1251
-sr_YU.MICROSOFT-CP1251@cyrillic: sr_CS.CP1251
-sr_YU.utf8: sr_CS.UTF-8
-sr_YU.UTF-8@cyrillic: sr_CS.UTF-8
-sr_CS.iso88592: sr_CS.ISO8859-2
-sr_CS.ISO-8859-2: sr_CS.ISO8859-2
-sr_CS.iso88595: sr_CS.ISO8859-5
-sr_CS.ISO-8859-5: sr_CS.ISO8859-5
-sr@Latn: sr_CS.ISO8859-2
-sr_CS@Latn: sr_CS.ISO8859-2
-sr_CS.iso88592@Latn: sr_CS.ISO8859-2
-sr_CS.ISO-8859-2@Latn: sr_CS.ISO8859-2
-sr_CS.ISO8859-2@Latn: sr_CS.ISO8859-2
-sr_CS.utf8: sr_CS.UTF-8
-sr_CS.UTF-8@Latn: sr_CS.UTF-8
+sr: sr_RS.UTF-8
+sr_YU: sr_RS.UTF-8@latin
+sr@cyrillic: sr_RS.UTF-8
+sr_YU@cyrillic: sr_RS.UTF-8
+sr_YU.utf8: sr_RS.UTF-8
+sr_YU.UTF-8@cyrillic: sr_RS.UTF-8
+sr_CS: sr_RS.UTF-8
+sr@Latn: sr_RS.UTF-8@latin
+sr_CS@Latn: sr_RS.UTF-8@latin
+sr_CS.utf8: sr_RS.UTF-8
+sr_CS.UTF-8@Latn: sr_RS.UTF-8@latin
+sr_RS: sr_RS.UTF-8
+sr@latin: sr_RS.UTF-8@latin
+sr_RS@latin: sr_RS.UTF-8@latin
+sr_RS@Latn: sr_RS.UTF-8@latin
+sr_RS.UTF-8@Latn: sr_RS.UTF-8@latin
+sr_RS.utf8: sr_RS.UTF-8
+sr_ME: sr_ME.UTF-8
+sr_ME.utf8: sr_ME.UTF-8
ss: ss_ZA.ISO8859-1
ss_ZA: ss_ZA.ISO8859-1
ss_ZA.iso88591: ss_ZA.ISO8859-1
@@ -1251,7 +1235,7 @@ portuguese.iso88591: pt_PT.ISO8859-1
romanian: ro_RO.ISO8859-2
rumanian: ro_RO.ISO8859-2
russian: ru_RU.ISO8859-5
-serbocroatian: sr_CS.ISO8859-2
+serbocroatian: sr_RS.UTF-8@latin
sinhala: si_LK.UTF-8
slovak: sk_SK.ISO8859-2
slovene: sl_SI.ISO8859-2
@@ -1364,7 +1348,7 @@ Russian_Russia.1251: ru_RU.iso8859-5
Slovak_Slovakia.1250: sk_SK.iso8859-2
Slovene_Slovenia.1250: sl_SI.iso8859-2
Albanian_Albania.1250: sq_AL.iso8859-2
-Serbian (Latin)_Serbia.1250: sr_CS.iso8859-2
+Serbian (Latin)_Serbia.1250: sr_RS.UTF-8@latin
Swedish_Finland.1252: sv_FI.iso8859-1
Swedish_Sweden.1252: sv_SE.iso8859-1
Turkish_Turkey.1254: tr_TR.iso8859-9