diff -u xorg_nls-git/compose.dir.pre xorg_nls-sr/compose.dir.pre --- xorg_nls-git/compose.dir.pre 2006-11-25 20:54:38.000000000 +0000 +++ xorg_nls-sr/compose.dir.pre 2007-07-01 17:54:09.359375000 +0100 @@ -193,11 +193,9 @@ iso8859-2/Compose: sk_SK.ISO8859-2 iso8859-2/Compose: sl_CS.ISO8859-2 iso8859-2/Compose: sl_SI.ISO8859-2 -iso8859-5/Compose: sp_YU.ISO8859-5 iso8859-2/Compose: sq_AL.ISO8859-2 iso8859-2/Compose: sr_CS.ISO8859-2 iso8859-5/Compose: sr_CS.ISO8859-5 -iso8859-2/Compose: sr_SP.ISO8859-2 iso8859-2/Compose: sr_YU.ISO8859-2 iso8859-5/Compose: sr_YU.ISO8859-5 iso8859-1/Compose: ss_ZA.ISO8859-1 @@ -363,6 +361,8 @@ en_US.UTF-8/Compose: sl_SI.UTF-8 en_US.UTF-8/Compose: sq_AL.UTF-8 en_US.UTF-8/Compose: sr_CS.UTF-8 +en_US.UTF-8/Compose: sr_ME.UTF-8 +en_US.UTF-8/Compose: sr_RS.UTF-8 en_US.UTF-8/Compose: sr_YU.UTF-8 en_US.UTF-8/Compose: ss_ZA.UTF-8 en_US.UTF-8/Compose: st_ZA.UTF-8 diff -u xorg_nls-git/locale.alias.pre xorg_nls-sr/locale.alias.pre --- xorg_nls-git/locale.alias.pre 2006-11-25 20:55:56.000000000 +0000 +++ xorg_nls-sr/locale.alias.pre 2007-07-02 00:14:30.250000000 +0100 @@ -918,13 +918,13 @@ 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_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 @@ -937,49 +937,33 @@ 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 @@ -1148,7 +1132,7 @@ american.iso88591: en_US.ISO8859-1 arabic.iso88596: ar_AA.ISO8859-6 bokmal: nb_NO.ISO8859-1 -bokmål: nb_NO.ISO8859-1 +bokml: nb_NO.ISO8859-1 bulgarian: bg_BG.CP1251 c-french.iso88591: fr_CA.ISO8859-1 catalan: ca_ES.ISO8859-1 @@ -1167,7 +1151,7 @@ estonian: et_EE.ISO8859-1 finnish: fi_FI.ISO8859-1 finnish.iso88591: fi_FI.ISO8859-1 -français: fr_FR.ISO8859-1 +franais: fr_FR.ISO8859-1 french: fr_FR.ISO8859-1 french.iso88591: fr_CH.ISO8859-1 galego: gl_ES.ISO8859-1 @@ -1198,7 +1182,7 @@ 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 @@ -1299,7 +1283,7 @@ Dutch_Belgium.1252: nl_BE.iso8859-1 Dutch_Netherlands.1252: nl_NL.iso8859-1 Norwegian (Nynorsk)_Norway.1252: no_NO.iso8859-1 -Norwegian (Bokmål)_Norway.1252: no_NO.iso8859-1 +Norwegian (Bokml)_Norway.1252: no_NO.iso8859-1 Polish_Poland.1250: pl_PL.iso8859-2 Portuguese_Brazil.1252: pt_BR.iso8859-1 Portuguese_Portugal.1252: pt_PT.iso8859-1 @@ -1308,7 +1292,7 @@ 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 diff -u xorg_nls-git/locale.dir.pre xorg_nls-sr/locale.dir.pre --- xorg_nls-git/locale.dir.pre 2006-11-25 20:55:18.000000000 +0000 +++ xorg_nls-sr/locale.dir.pre 2007-07-01 23:46:37.437500000 +0100 @@ -202,11 +202,9 @@ iso8859-2/XLC_LOCALE: sh_YU.ISO8859-2 iso8859-2/XLC_LOCALE: sk_SK.ISO8859-2 iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2 -iso8859-5/XLC_LOCALE: sp_YU.ISO8859-5 iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2 iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2 iso8859-5/XLC_LOCALE: sr_CS.ISO8859-5 -iso8859-2/XLC_LOCALE: sr_SP.ISO8859-2 iso8859-2/XLC_LOCALE: sr_YU.ISO8859-2 iso8859-5/XLC_LOCALE: sr_YU.ISO8859-5 microsoft-cp1251/XLC_LOCALE: sr_YU.CP1251 @@ -392,6 +390,8 @@ en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8 en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8 en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8 +en_US.UTF-8/XLC_LOCALE: sr_ME.UTF-8 +en_US.UTF-8/XLC_LOCALE: sr_RS.UTF-8 en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8 en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8 en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8