koi8-u \
ko_KR.UTF-8 \
microsoft-cp1251 \
---- libX11-1.1.4/nls/compose.dir.pre.orig 2008-03-06 21:45:06.000000000 +0100
-+++ libX11-1.1.4/nls/compose.dir.pre 2008-03-07 23:21:34.487595975 +0100
+--- libX11-1.3/nls/compose.dir.pre.orig 2009-09-03 03:12:27.000000000 +0200
++++ libX11-1.3/nls/compose.dir.pre 2009-10-04 09:54:54.948606747 +0200
@@ -7,8 +7,11 @@
XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
XCOMM
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
iso8859-1/Compose: lt_LN.ISO8859-1
-@@ -158,54 +181,57 @@
+@@ -158,52 +181,57 @@
iso8859-13/Compose: lt_LT.ISO8859-13
iso8859-4/Compose: lv_LV.ISO8859-4
iso8859-13/Compose: lv_LV.ISO8859-13
+XCOMM microsoft-cp1251/Compose: mk_MK.CP1251
iso8859-1/Compose: ms_MY.ISO8859-1
iso8859-3/Compose: mt_MT.ISO8859-3
-+iso8859-1/Compose: nb_NO.ISO8859-1
-+iso8859-15/Compose: nb_NO.ISO8859-15
-+iso8859-1/Compose: nds_DE.ISO8859-1
-+iso8859-15/Compose: nds_DE.ISO8859-15
iso8859-1/Compose: nl_BE.ISO8859-1
iso8859-15/Compose: nl_BE.ISO8859-15
iso8859-1/Compose: nl_NL.ISO8859-1
iso8859-15/Compose: nl_NL.ISO8859-15
-iso8859-1/Compose: no_NO.ISO8859-1
-iso8859-15/Compose: no_NO.ISO8859-15
--iso8859-1/Compose: nb_NO.ISO8859-1
--iso8859-15/Compose: nb_NO.ISO8859-15
+ iso8859-1/Compose: nb_NO.ISO8859-1
+ iso8859-15/Compose: nb_NO.ISO8859-15
++iso8859-1/Compose: nds_DE.ISO8859-1
++iso8859-15/Compose: nds_DE.ISO8859-15
iso8859-1/Compose: nn_NO.ISO8859-1
iso8859-15/Compose: nn_NO.ISO8859-15
iso8859-1/Compose: nr_ZA.ISO8859-1
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-16/Compose: sl_SI.ISO8859-16
+iso8859-1/Compose: so_DJ.ISO8859-1
+iso8859-1/Compose: so_KE.ISO8859-1
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
+XCOMM microsoft-cp1251/Compose: sr_CS.CP1251
iso8859-1/Compose: ss_ZA.ISO8859-1
iso8859-1/Compose: st_ZA.ISO8859-1
iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -213,39 +239,52 @@
+@@ -211,36 +239,47 @@
iso8859-1/Compose: sv_SE.ISO8859-1
iso8859-15/Compose: sv_SE.ISO8859-15
tscii-0/Compose: ta_IN.TSCII-0
-koi8-c/Compose: tg_TJ.KOI8-C
+koi8-c/Compose: tg_TJ.KOI8-K
-+XCOMM koi8-t/Compose: tg_TJ.KOI8-T
++XCOMM koi8-t/Compose: tg_TJ.KOI8-T
iso8859-1/Compose: tl_PH.ISO8859-1
-iso8859-15/Compose: tn_ZA.ISO8859-15
+iso8859-10/Compose: tn_ZA.ISO8859-10
vi_VN.viscii/Compose: vi_VN.VISCII
vi_VN.tcvn/Compose: vi_VN.TCVN
iso8859-1/Compose: wa_BE.ISO8859-1
-+iso8859-15/Compose: wa_BE.ISO8859-15
iso8859-1/Compose: xh_ZA.ISO8859-1
--microsoft-cp1255/Compose: yi_US.CP1256
-+XCOMM microsoft-cp1255/Compose: yi_US.CP1256
+ microsoft-cp1255/Compose: yi_US.CP1256
zh_CN/Compose: zh_CN.eucCN
-zh_CN/Compose: zh_CN.GB2312
-zh_CN.gbk/Compose: zh_CN.GBK
en_US.UTF-8/Compose: ar_BH.UTF-8
en_US.UTF-8/Compose: ar_DZ.UTF-8
en_US.UTF-8/Compose: ar_EG.UTF-8
-+en_US.UTF-8/Compose: ar_IN.UTF-8
- en_US.UTF-8/Compose: ar_IQ.UTF-8
- en_US.UTF-8/Compose: ar_JO.UTF-8
- en_US.UTF-8/Compose: ar_KW.UTF-8
-@@ -255,22 +294,25 @@
+@@ -254,23 +293,26 @@
en_US.UTF-8/Compose: ar_OM.UTF-8
en_US.UTF-8/Compose: ar_QA.UTF-8
en_US.UTF-8/Compose: ar_SA.UTF-8
+en_US.UTF-8/Compose: ar_SY.UTF-8
en_US.UTF-8/Compose: ar_TN.UTF-8
en_US.UTF-8/Compose: ar_YE.UTF-8
--en_US.UTF-8/Compose: bs_BA.UTF-8
+ en_US.UTF-8/Compose: bo_IN.UTF-8
+ en_US.UTF-8/Compose: bs_BA.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
-en_US.UTF-8/Compose: a3_AZ.UTF-8
en_US.UTF-8/Compose: be_BY.UTF-8
+en_US.UTF-8/Compose: bn_BD.UTF-8
en_US.UTF-8/Compose: bn_IN.UTF-8
en_US.UTF-8/Compose: br_FR.UTF-8
-+en_US.UTF-8/Compose: bs_BA.UTF-8
+en_US.UTF-8/Compose: byn_ER.UTF-8
en_US.UTF-8/Compose: ca_AD.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: da_DK.UTF-8
en_US.UTF-8/Compose: de_AT.UTF-8
en_US.UTF-8/Compose: de_BE.UTF-8
-@@ -278,18 +320,26 @@
- en_US.UTF-8/Compose: de_DE.UTF-8
- en_US.UTF-8/Compose: de_LI.UTF-8
- en_US.UTF-8/Compose: de_LU.UTF-8
-+el_GR.UTF-8/Compose: el_CY.UTF-8
+@@ -281,17 +323,24 @@
+ el_GR.UTF-8/Compose: el_CY.UTF-8
el_GR.UTF-8/Compose: el_GR.UTF-8
en_US.UTF-8/Compose: en_AU.UTF-8
+en_US.UTF-8/Compose: en_BE.UTF-8
en_US.UTF-8/Compose: en_IE.UTF-8
+en_US.UTF-8/Compose: en_IN.UTF-8
en_US.UTF-8/Compose: en_JM.UTF-8
+ en_US.UTF-8/Compose: en_MT.UTF-8
en_US.UTF-8/Compose: en_NZ.UTF-8
+en_US.UTF-8/Compose: en_PH.UTF-8
+en_US.UTF-8/Compose: en_SG.UTF-8
en_US.UTF-8/Compose: eo_XX.UTF-8
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
-@@ -308,12 +358,14 @@
- en_US.UTF-8/Compose: es_PR.UTF-8
- en_US.UTF-8/Compose: es_PY.UTF-8
- en_US.UTF-8/Compose: es_SV.UTF-8
-+en_US.UTF-8/Compose: es_US.UTF-8
- en_US.UTF-8/Compose: es_UY.UTF-8
- en_US.UTF-8/Compose: es_VE.UTF-8
- en_US.UTF-8/Compose: et_EE.UTF-8
- en_US.UTF-8/Compose: eu_ES.UTF-8
- en_US.UTF-8/Compose: fa_IR.UTF-8
- en_US.UTF-8/Compose: fi_FI.UTF-8
-+en_US.UTF-8/Compose: fil_PH.UTF-8
- en_US.UTF-8/Compose: fo_FO.UTF-8
- en_US.UTF-8/Compose: fr_BE.UTF-8
- en_US.UTF-8/Compose: fr_CA.UTF-8
-@@ -322,12 +374,14 @@
+@@ -325,6 +374,7 @@
en_US.UTF-8/Compose: fr_LU.UTF-8
en_US.UTF-8/Compose: ga_IE.UTF-8
en_US.UTF-8/Compose: gd_GB.UTF-8
en_US.UTF-8/Compose: gl_ES.UTF-8
en_US.UTF-8/Compose: gu_IN.UTF-8
en_US.UTF-8/Compose: gv_GB.UTF-8
- en_US.UTF-8/Compose: he_IL.UTF-8
+@@ -332,6 +382,7 @@
en_US.UTF-8/Compose: hi_IN.UTF-8
+ en_US.UTF-8/Compose: hne_IN.UTF-8
en_US.UTF-8/Compose: hr_HR.UTF-8
+en_US.UTF-8/Compose: hsb_DE.UTF-8
en_US.UTF-8/Compose: hu_HU.UTF-8
en_US.UTF-8/Compose: hy_AM.UTF-8
en_US.UTF-8/Compose: id_ID.UTF-8
-@@ -337,51 +391,75 @@
- en_US.UTF-8/Compose: iu_CA.UTF-8
- en_US.UTF-8/Compose: ja_JP.UTF-8
- en_US.UTF-8/Compose: ka_GE.UTF-8
-+en_US.UTF-8/Compose: kk_KZ.UTF-8
- en_US.UTF-8/Compose: kl_GL.UTF-8
-+en_US.UTF-8/Compose: kn_IN.UTF-8
- en_US.UTF-8/Compose: ko_KR.UTF-8
+@@ -349,6 +400,9 @@
+ en_US.UTF-8/Compose: ks_IN@devanagari.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
+en_US.UTF-8/Compose: lg_UG.UTF-8
en_US.UTF-8/Compose: lo_LA.UTF-8
en_US.UTF-8/Compose: lt_LT.UTF-8
en_US.UTF-8/Compose: lv_LV.UTF-8
+@@ -356,26 +410,28 @@
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
-+en_US.UTF-8/Compose: ml_IN.UTF-8
+ en_US.UTF-8/Compose: ml_IN.UTF-8
+en_US.UTF-8/Compose: mn_MN.UTF-8
-+en_US.UTF-8/Compose: mr_IN.UTF-8
+ en_US.UTF-8/Compose: mr_IN.UTF-8
en_US.UTF-8/Compose: ms_MY.UTF-8
-+en_US.UTF-8/Compose: mt_MT.UTF-8
-+en_US.UTF-8/Compose: nb_NO.UTF-8
+ en_US.UTF-8/Compose: mt_MT.UTF-8
+en_US.UTF-8/Compose: nds_DE.UTF-8
-+en_US.UTF-8/Compose: ne_NP.UTF-8
en_US.UTF-8/Compose: nl_BE.UTF-8
en_US.UTF-8/Compose: nl_NL.UTF-8
+ en_US.UTF-8/Compose: nn_NO.UTF-8
-en_US.UTF-8/Compose: no_NO.UTF-8
--en_US.UTF-8/Compose: nb_NO.UTF-8
-+en_US.UTF-8/Compose: nn_NO.UTF-8
+ en_US.UTF-8/Compose: nb_NO.UTF-8
en_US.UTF-8/Compose: nr_ZA.UTF-8
en_US.UTF-8/Compose: nso_ZA.UTF-8
--en_US.UTF-8/Compose: ny_NO.UTF-8
+ en_US.UTF-8/Compose: ny_NO.UTF-8
en_US.UTF-8/Compose: oc_FR.UTF-8
+en_US.UTF-8/Compose: om_ET.UTF-8
+en_US.UTF-8/Compose: om_KE.UTF-8
-+en_US.UTF-8/Compose: or_IN.UTF-8
+ en_US.UTF-8/Compose: or_IN.UTF-8
en_US.UTF-8/Compose: pa_IN.UTF-8
+ en_US.UTF-8/Compose: pa_PK.UTF-8
+en_US.UTF-8/Compose: pap_AN.UTF-8
en_US.UTF-8/Compose: pd_DE.UTF-8
en_US.UTF-8/Compose: pd_US.UTF-8
pt_BR.UTF-8/Compose: pt_BR.UTF-8
en_US.UTF-8/Compose: pt_PT.UTF-8
en_US.UTF-8/Compose: ro_RO.UTF-8
- en_US.UTF-8/Compose: ru_RU.UTF-8
- en_US.UTF-8/Compose: ru_UA.UTF-8
- en_US.UTF-8/Compose: rw_RW.UTF-8
+@@ -385,15 +441,20 @@
+ en_US.UTF-8/Compose: sa_IN.UTF-8
+ en_US.UTF-8/Compose: sd_IN.UTF-8
+ en_US.UTF-8/Compose: sd_IN@devanagari.UTF-8
+en_US.UTF-8/Compose: se_NO.UTF-8
+ en_US.UTF-8/Compose: sh_BA.UTF-8
en_US.UTF-8/Compose: si_LK.UTF-8
+en_US.UTF-8/Compose: sid_ET.UTF-8
en_US.UTF-8/Compose: sk_SK.UTF-8
+en_US.UTF-8/Compose: so_SO.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: sr_ME.UTF-8
en_US.UTF-8/Compose: ss_ZA.UTF-8
en_US.UTF-8/Compose: st_ZA.UTF-8
en_US.UTF-8/Compose: sv_FI.UTF-8
- en_US.UTF-8/Compose: sv_SE.UTF-8
- en_US.UTF-8/Compose: ta_IN.UTF-8
-+en_US.UTF-8/Compose: te_IN.UTF-8
+@@ -402,8 +463,13 @@
+ en_US.UTF-8/Compose: te_IN.UTF-8
en_US.UTF-8/Compose: tg_TJ.UTF-8
en_US.UTF-8/Compose: th_TH.UTF-8
+en_US.UTF-8/Compose: ti_ER.UTF-8
en_US.UTF-8/Compose: tr_TR.UTF-8
en_US.UTF-8/Compose: ts_ZA.UTF-8
en_US.UTF-8/Compose: tt_RU.UTF-8
-@@ -391,8 +469,7 @@
- en_US.UTF-8/Compose: ve_ZA.UTF-8
- en_US.UTF-8/Compose: vi_VN.UTF-8
- en_US.UTF-8/Compose: wa_BE.UTF-8
--en_US.UTF-8/Compose: yi_US.UTF-8
+@@ -417,6 +483,5 @@
en_US.UTF-8/Compose: xh_ZA.UTF-8
-+en_US.UTF-8/Compose: yi_US.UTF-8
en_US.UTF-8/Compose: zh_TW.UTF-8
en_US.UTF-8/Compose: zu_ZA.UTF-8
-en_US.UTF-8/Compose: bs_BA.UTF-8
---- libX11-1.1.5/nls/locale.alias.pre.orig 2008-05-07 19:03:34.000000000 +0200
-+++ libX11-1.1.5/nls/locale.alias.pre 2008-09-09 08:28:09.120985632 +0200
-@@ -17,17 +17,34 @@
+ en_US.UTF-8/Compose: ne_NP.UTF-8
+
+--- libX11-1.3/nls/locale.alias.pre.orig 2009-09-03 03:12:28.000000000 +0200
++++ libX11-1.3/nls/locale.alias.pre 2009-10-04 10:34:53.228614289 +0200
+@@ -17,17 +17,31 @@
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
English_United-States.437: C
+aa_DJ: aa_DJ.ISO8859-1
+aa_DJ.iso88591: aa_DJ.ISO8859-1
+aa_DJ.ISO-8859-1: aa_DJ.ISO8859-1
-+aa_DJ.ISO_8859-1: aa_DJ.ISO8859-1
+aa_DJ.utf8: aa_DJ.UTF-8
+aa_ER: aa_ER.UTF-8
+aa_ER.utf8: aa_ER.UTF-8
af_ZA.iso88591: af_ZA.ISO8859-1
af_ZA.ISO-8859-1: af_ZA.ISO8859-1
-af_ZA.utf8: af_ZA.UTF-8
-+af_ZA.ISO_8859-1: af_ZA.ISO8859-1
am: am_ET.UTF-8
am_ET: am_ET.UTF-8
+am_ET.utf8: am_ET.UTF-8
+an_ES: an_ES.ISO8859-15
+an_ES.iso885915: an_ES.ISO8859-15
+an_ES.ISO-8859-15: an_ES.ISO8859-15
-+an_ES.ISO_8859-15: an_ES.ISO8859-15
+an_ES.utf8: an_ES.UTF-8
ar: ar_AA.ISO8859-6
ar_AA: ar_AA.ISO8859-6
AR_AA: ar_AA.ISO8859-6
-@@ -38,78 +55,101 @@
- ar_AE: ar_AE.ISO8859-6
- ar_AE.iso88596: ar_AE.ISO8859-6
- ar_AE.ISO-8859-6: ar_AE.ISO8859-6
-+ar_AE.ISO_8859-6: ar_AE.ISO8859-6
- ar_AE.utf8: ar_AE.UTF-8
- ar_BH: ar_BH.ISO8859-6
- ar_BH.iso88596: ar_BH.ISO8859-6
- ar_BH.ISO-8859-6: ar_BH.ISO8859-6
-+ar_BH.ISO_8859-6: ar_BH.ISO8859-6
- ar_BH.utf8: ar_BH.UTF-8
- ar_DZ: ar_DZ.ISO8859-6
- ar_DZ.iso88596: ar_DZ.ISO8859-6
- ar_DZ.ISO-8859-6: ar_DZ.ISO8859-6
-+ar_DZ.ISO_8859-6: ar_DZ.ISO8859-6
- ar_DZ.utf8: ar_DZ.UTF-8
- ar_EG: ar_EG.ISO8859-6
+@@ -51,8 +65,8 @@
ar_EG.iso88596: ar_EG.ISO8859-6
ar_EG.ISO-8859-6: ar_EG.ISO8859-6
-+ar_EG.ISO_8859-6: ar_EG.ISO8859-6
ar_EG.utf8: ar_EG.UTF-8
+ar_IN: ar_IN.UTF-8
-+ar_IN.utf8: ar_IN.UTF-8
+ ar_IN.utf8: ar_IN.UTF-8
+-ar_IN.UTF-8: ar_IN.UTF-8
ar_IQ: ar_IQ.ISO8859-6
ar_IQ.iso88596: ar_IQ.ISO8859-6
ar_IQ.ISO-8859-6: ar_IQ.ISO8859-6
-+ar_IQ.ISO_8859-6: ar_IQ.ISO8859-6
- ar_IQ.utf8: ar_IQ.UTF-8
- ar_JO: ar_JO.ISO8859-6
- ar_JO.iso88596: ar_JO.ISO8859-6
- ar_JO.ISO-8859-6: ar_JO.ISO8859-6
-+ar_JO.ISO_8859-6: ar_JO.ISO8859-6
- ar_JO.utf8: ar_JO.UTF-8
- ar_KW: ar_KW.ISO8859-6
- ar_KW.iso88596: ar_KW.ISO8859-6
--ar_KW.iso88596: ar_KW.ISO8859-6
- ar_KW.ISO-8859-6: ar_KW.ISO8859-6
-+ar_KW.ISO_8859-6: ar_KW.ISO8859-6
- ar_KW.utf8: ar_KW.UTF-8
- ar_LB: ar_LB.ISO8859-6
- ar_LB.iso88596: ar_LB.ISO8859-6
- ar_LB.ISO-8859-6: ar_LB.ISO8859-6
-+ar_LB.ISO_8859-6: ar_LB.ISO8859-6
- ar_LB.utf8: ar_LB.UTF-8
- ar_LY: ar_LY.ISO8859-6
- ar_LY.iso88596: ar_LY.ISO8859-6
- ar_LY.ISO-8859-6: ar_LY.ISO8859-6
-+ar_LY.ISO_8859-6: ar_LY.ISO8859-6
- ar_LY.utf8: ar_LY.UTF-8
- ar_MA: ar_MA.ISO8859-6
- ar_MA.iso88596: ar_MA.ISO8859-6
- ar_MA.ISO-8859-6: ar_MA.ISO8859-6
-+ar_MA.ISO_8859-6: ar_MA.ISO8859-6
- ar_MA.utf8: ar_MA.UTF-8
- ar_OM: ar_OM.ISO8859-6
- ar_OM.iso88596: ar_OM.ISO8859-6
- ar_OM.ISO-8859-6: ar_OM.ISO8859-6
-+ar_OM.ISO_8859-6: ar_OM.ISO8859-6
- ar_OM.utf8: ar_OM.UTF-8
- ar_QA: ar_QA.ISO8859-6
- ar_QA.iso88596: ar_QA.ISO8859-6
- ar_QA.ISO-8859-6: ar_QA.ISO8859-6
-+ar_QA.ISO_8859-6: ar_QA.ISO8859-6
- ar_QA.utf8: ar_QA.UTF-8
- ar_SA: ar_SA.ISO8859-6
- ar_SA.iso88596: ar_SA.ISO8859-6
- ar_SA.ISO-8859-6: ar_SA.ISO8859-6
-+ar_SA.ISO_8859-6: ar_SA.ISO8859-6
- ar_SA.utf8: ar_SA.UTF-8
- ar_SD: ar_SD.ISO8859-6
- ar_SD.iso88596: ar_SD.ISO8859-6
- ar_SD.ISO-8859-6: ar_SD.ISO8859-6
-+ar_SD.ISO_8859-6: ar_SD.ISO8859-6
- ar_SD.utf8: ar_SD.UTF-8
- ar_SY: ar_SY.ISO8859-6
- ar_SY.iso88596: ar_SY.ISO8859-6
- ar_SY.ISO-8859-6: ar_SY.ISO8859-6
-+ar_SY.ISO_8859-6: ar_SY.ISO8859-6
- ar_SY.utf8: ar_SY.UTF-8
- ar_TN: ar_TN.ISO8859-6
- ar_TN.iso88596: ar_TN.ISO8859-6
- ar_TN.ISO-8859-6: ar_TN.ISO8859-6
-+ar_TN.ISO_8859-6: ar_TN.ISO8859-6
+@@ -103,14 +117,18 @@
ar_TN.utf8: ar_TN.UTF-8
--as: as_IN.UTF-8
--as_IN.utf8: as_IN.UTF-8
+ as: as_IN.UTF-8
+ as_IN.utf8: as_IN.UTF-8
-as_IN.UTF-8: as_IN.UTF-8
ar_YE: ar_YE.ISO8859-6
ar_YE.iso88596: ar_YE.ISO8859-6
ar_YE.ISO-8859-6: ar_YE.ISO8859-6
-+ar_YE.ISO_8859-6: ar_YE.ISO8859-6
ar_YE.utf8: ar_YE.UTF-8
-az: az_AZ.ISO8859-9E
-az_AZ: az_AZ.ISO8859-9E
-+as: as_IN.UTF-8
-+as_IN.utf8: as_IN.UTF-8
-+as_IN.UTF-8: as_IN.UTF-8
+az: az_AZ.UTF-8
+az_AZ: az_AZ.UTF-8
az_AZ.iso88599e: az_AZ.ISO8859-9E
+az_AZ@cyrillic: az_AZ.KOI8-K
+az_AZ.koi8k@cyrillic: az_AZ.KOI8-K
be: be_BY.CP1251
+ be@latin: be_BY.UTF-8@latin
be_BY: be_BY.CP1251
- be_BY.cp1251: be_BY.CP1251
-@@ -123,28 +163,36 @@
+@@ -127,14 +145,14 @@
bg_BG.microsoftcp1251: bg_BG.CP1251
bg_BG.microsoft-cp1251: bg_BG.CP1251
bg_BG.MICROSOFT-CP1251: bg_BG.CP1251
+bn_IN: bn_IN.UTF-8
bn_IN.utf8: bn_IN.UTF-8
-bn_IN.UTF-8: bn_IN.UTF-8
+ bo_IN.utf8: bo_IN.UTF-8
+-bo_IN.UTF-8: bo_IN.UTF-8
br: br_FR.ISO8859-1
br_FR: br_FR.ISO8859-1
br_FR.iso88591: br_FR.ISO8859-1
- br_FR.ISO-8859-1: br_FR.ISO8859-1
-+br_FR.ISO_8859-1: br_FR.ISO8859-1
+@@ -142,9 +160,12 @@
br_FR.iso885914: br_FR.ISO8859-14
br_FR.ISO-8859-14: br_FR.ISO8859-14
-+br_FR.ISO_8859-14: br_FR.ISO8859-14
br_FR.iso885915: br_FR.ISO8859-15
+br_FR.iso885915@euro: br_FR.ISO8859-15
br_FR.ISO-8859-15: br_FR.ISO8859-15
-+br_FR.ISO_8859-15: br_FR.ISO8859-15
br_FR.ISO-8859-15@euro: br_FR.ISO8859-15
-+br_FR.ISO_8859-15@euro: br_FR.ISO8859-15
br_FR@euro: br_FR.ISO8859-15
+br_FR.utf8: br_FR.UTF-8
++br_FR.utf8@euro: br_FR.UTF-8
br_FR.UTF-8@euro: br_FR.UTF-8
bs: bs_BA.ISO8859-2
bs_BA: bs_BA.ISO8859-2
- bs_BA.iso88592: bs_BA.ISO8859-2
- bs_BA.ISO-8859-2: bs_BA.ISO8859-2
- bs_BA.ISO_8859-2: bs_BA.ISO8859-2
-+bs_BA.utf8: bs_BA.UTF-8
- ca: ca_ES.ISO8859-1
- ca_AD: ca_AD.ISO8859-1
- ca_AD@euro: ca_AD.ISO8859-15
-@@ -159,11 +207,15 @@
- ca_ES@euro: ca_ES.ISO8859-15
+@@ -166,10 +187,11 @@
ca_ES.iso88591: ca_ES.ISO8859-1
ca_ES.ISO-8859-1: ca_ES.ISO8859-1
-+ca_ES.ISO_8859-1: ca_ES.ISO8859-1
ca_ES.iso885915: ca_ES.ISO8859-15
-ca_ES.utf8: ca_ES.UTF-8
+ca_ES.iso885915@euro: ca_ES.ISO8859-15
ca_ES.ISO-8859-15: ca_ES.ISO8859-15
-+ca_ES.ISO_8859-15: ca_ES.ISO8859-15
ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
-+ca_ES.ISO_8859-15@euro: ca_ES.ISO8859-15
ca_ES.UTF-8@euro: ca_ES.UTF-8
+ca_ES.utf8: ca_ES.UTF-8
ca_FR: ca_FR.ISO8859-1
ca_FR@euro: ca_FR.ISO8859-15
ca_FR.iso88591: ca_FR.ISO8859-1
-@@ -191,19 +243,26 @@
+@@ -197,19 +219,23 @@
cs_CZ.ISO-8859-2: cs_CZ.ISO8859-2
cs_CZ.ISO_8859-2: cs_CZ.ISO8859-2
cs_CZ.utf8: cs_CZ.UTF-8
+cy_GB: cy_GB.ISO8859-14
cy_GB.iso88591: cy_GB.ISO8859-1
cy_GB.ISO-8859-1: cy_GB.ISO8859-1
-+cy_GB.ISO_8859-1: cy_GB.ISO8859-1
cy_GB.iso885914: cy_GB.ISO8859-14
cy_GB.ISO-8859-14: cy_GB.ISO8859-14
-+cy_GB.ISO_8859-14: cy_GB.ISO8859-14
cy_GB.iso885915: cy_GB.ISO8859-15
cy_GB.ISO-8859-15: cy_GB.ISO8859-15
-+cy_GB.ISO_8859-15: cy_GB.ISO8859-15
+cy_GB.utf8: cy_GB.UTF-8
+XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
+cz: cs_CZ.ISO8859-2
+cz_CZ.utf8: cs_CZ.UTF-8
+cz_CZ.UTF-8: cs_CZ.UTF-8
da: da_DK.ISO8859-1
+ da.ISO8859-15: da_DK.ISO8859-15
da_DK: da_DK.ISO8859-1
- DA_DK: da_DK.ISO8859-1
-@@ -225,18 +284,23 @@
+@@ -233,18 +259,22 @@
de_AT.ISO_8859-1: de_AT.ISO8859-1
de_AT.iso885915: de_AT.ISO8859-15
de_AT.ISO-8859-15: de_AT.ISO8859-15
de_AT.utf8: de_AT.UTF-8
de_BE: de_BE.ISO8859-1
+de_BE.iso885915@euro: de_BE.ISO8859-15
-+de_BE.ISO_8859-15@euro: de_BE.ISO8859-15
+de_BE.ISO-8859-15@euro: de_BE.ISO8859-15
de_BE@euro: de_BE.ISO8859-15
+de_BE.utf8: de_BE.UTF-8
de_BE.UTF-8@euro: de_BE.UTF-8
de_CH: de_CH.ISO8859-1
de_CH.iso88591: de_CH.ISO8859-1
-@@ -258,7 +322,9 @@
+@@ -266,6 +296,7 @@
de_DE.ISO_8859-15: de_DE.ISO8859-15
de_DE.8859-15: de_DE.ISO8859-15
de_DE.8859-15@euro: de_DE.ISO8859-15
+de_DE.iso885915@euro: de_DE.ISO8859-15
de_DE.ISO-8859-15@euro: de_DE.ISO8859-15
-+de_DE.ISO_8859-15@euro: de_DE.ISO8859-15
de_DE.UTF-8@euro: de_DE.UTF-8
de_DE.utf8: de_DE.UTF-8
- de_LU: de_LU.ISO8859-1
-@@ -266,22 +332,31 @@
+@@ -274,22 +305,29 @@
de_LU.iso88591: de_LU.ISO8859-1
de_LU.ISO_8859-1: de_LU.ISO8859-1
de_LU.ISO-8859-1: de_LU.ISO8859-1
+de_LU.iso885915@euro: de_LU.ISO8859-15
-+de_LU.ISO_8859-15@euro: de_LU.ISO8859-15
+de_LU.ISO-8859-15@euro: de_LU.ISO8859-15
de_LU.iso885915: de_LU.ISO8859-15
de_LU.ISO_8859-15: de_LU.ISO8859-15
el_GR.iso88597: el_GR.ISO8859-7
el_GR.ISO-8859-7: el_GR.ISO8859-7
-el_GR@euro: el_GR.ISO8859-15
-+el_GR.ISO_8859-7: el_GR.ISO8859-7
+el_GR@euro: el_GR.UTF-8
el_GR.utf8: el_GR.UTF-8
en: en_US.ISO8859-1
en.ISO-8859-1: en_US.ISO8859-1
-@@ -296,11 +371,18 @@
+@@ -304,11 +342,16 @@
en_BW: en_BW.ISO8859-1
en_BW.iso88591: en_BW.ISO8859-1
en_BW.ISO-8859-1: en_BW.ISO8859-1
-+en_BW.ISO_8859-1: en_BW.ISO8859-1
+en_BW.utf8: en_BW.UTF-8
en_CA: en_CA.ISO8859-1
en_CA.iso88591: en_CA.ISO8859-1
+en_DK: en_DK.ISO8859-1
+en_DK.iso88591: en_DK.ISO8859-1
+en_DK.ISO-8859-1: en_DK.ISO8859-1
-+en_DK.ISO_8859-1: en_DK.ISO8859-1
+en_DK.utf8: en_DK.UTF-8
en_GB: en_GB.ISO8859-1
en_GB.88591: en_GB.ISO8859-1
en_GB.88591.en: en_GB.ISO8859-1
-@@ -311,31 +393,45 @@
+@@ -319,21 +362,26 @@
en_GB.ISO-8859-15: en_GB.ISO8859-15
en_GB.utf8: en_GB.UTF-8
en_UK: en_GB.ISO8859-1
en_HK: en_HK.ISO8859-1
en_HK.iso88591: en_HK.ISO8859-1
en_HK.ISO-8859-1: en_HK.ISO8859-1
-+en_HK.ISO_8859-1: en_HK.ISO8859-1
+en_HK.utf8: en_HK.UTF-8
en_IE: en_IE.ISO8859-1
en_IE.iso88591: en_IE.ISO8859-1
en_IE.ISO-8859-1: en_IE.ISO8859-1
-+en_IE.ISO_8859-1: en_IE.ISO8859-1
en_IE.iso885915: en_IE.ISO8859-15
en_IE.ISO-8859-15: en_IE.ISO8859-15
-+en_IE.ISO_8859-15: en_IE.ISO8859-15
+en_IE.iso885915@euro: en_IE.ISO8859-15
en_IE.ISO-8859-15@euro: en_IE.ISO8859-15
-+en_IE.ISO_8859-15@euro: en_IE.ISO8859-15
en_IE@euro: en_IE.ISO8859-15
en_IE.UTF-8@euro: en_IE.UTF-8
en_IE.utf8: en_IE.UTF-8
en_NZ: en_NZ.ISO8859-1
en_NZ.iso88591: en_NZ.ISO8859-1
en_NZ.ISO-8859-1: en_NZ.ISO8859-1
-+en_NZ.ISO_8859-1: en_NZ.ISO8859-1
- en_NZ.utf8: en_NZ.UTF-8
+@@ -341,9 +389,11 @@
en_PH: en_PH.ISO8859-1
en_PH.iso88591: en_PH.ISO8859-1
en_PH.ISO-8859-1: en_PH.ISO8859-1
-+en_PH.ISO_8859-1: en_PH.ISO8859-1
+en_PH.utf8: en_PH.UTF-8
en_SG: en_SG.ISO8859-1
en_SG.iso88591: en_SG.ISO8859-1
en_SG.ISO-8859-1: en_SG.ISO8859-1
-+en_SG.ISO_8859-1: en_SG.ISO8859-1
+en_SG.utf8: en_SG.UTF-8
en_US: en_US.ISO8859-1
EN_US: en_US.ISO8859-1
en_US.88591: en_US.ISO8859-1
-@@ -349,15 +445,6 @@
- en_US.ISO8859-15@euro: en_US.ISO8859-15
- en_US.utf8: en_US.UTF-8
- EN_US.UTF-8: en_US.UTF-8
--en_US.88591.en: en_US.ISO8859-1
--en_US.iso88591: en_US.ISO8859-1
--en_US.ISO-8859-1: en_US.ISO8859-1
--en_US.ISO_8859-1: en_US.ISO8859-1
--en_US.iso885915: en_US.ISO8859-15
--en_US.8859-15: en_US.ISO8859-15
--en_US.ISO8859-15@euro: en_US.ISO8859-15
--en_US.utf8: en_US.UTF-8
--EN_US.UTF-8: en_US.UTF-8
- en_ZA: en_ZA.ISO8859-1
- en_ZA.88591: en_ZA.ISO8859-1
- en_ZA.88591.en: en_ZA.ISO8859-1
-@@ -370,104 +457,128 @@
+@@ -369,11 +419,12 @@
en_ZW: en_ZW.ISO8859-1
en_ZW.iso88591: en_ZW.ISO8859-1
en_ZW.ISO-8859-1: en_ZW.ISO8859-1
-+en_ZW.ISO_8859-1: en_ZW.ISO8859-1
+en_ZW.utf8: en_ZW.UTF-8
eo: eo_XX.ISO8859-3
-eo_EO: eo_EO.ISO8859-3
-eo_EO.ISO8859-3: eo_EO.ISO8859-3
+-eo_XX: eo_XX.ISO8859-3
+-eo_XX.ISO8859-3: eo_XX.ISO8859-3
+eo_EO: eo_XX.ISO8859-3
+eo_EO.ISO8859-3: eo_XX.ISO8859-3
- eo_XX: eo_XX.ISO8859-3
--eo_XX.ISO8859-3: eo_XX.ISO8859-3
+eo_XX.iso88593: eo_XX.ISO8859-3
+eo_XX.ISO-8859-3: eo_XX.ISO8859-3
-+eo_XX.ISO_8859-3: eo_XX.ISO8859-3
es: es_ES.ISO8859-1
+ es.UTF-8: es_ES.UTF-8
es_AR: es_AR.ISO8859-1
- es_AR.iso88591: es_AR.ISO8859-1
- es_AR.ISO-8859-1: es_AR.ISO8859-1
-+es_AR.ISO_8859-1: es_AR.ISO8859-1
- es_AR.utf8: es_AR.UTF-8
- es_BO: es_BO.ISO8859-1
--es_BO.iso88591: es_BO.ISO8859-1
- es_BO.ISO-8859-1: es_BO.ISO8859-1
-+es_BO.ISO_8859-1: es_BO.ISO8859-1
-+es_BO.iso88591: es_BO.ISO8859-1
- es_BO.utf8: es_BO.UTF-8
-+es_CL.ISO-8859-1: es_CL.ISO8859-1
-+es_CL.ISO_8859-1: es_CL.ISO8859-1
- es_CL: es_CL.ISO8859-1
- es_CL.iso88591: es_CL.ISO8859-1
--es_CL.ISO-8859-1: es_CL.ISO8859-1
- es_CL.utf8: es_CL.UTF-8
- es_CO: es_CO.ISO8859-1
--es_CO.iso88591: es_CO.ISO8859-1
- es_CO.ISO-8859-1: es_CO.ISO8859-1
-+es_CO.ISO_8859-1: es_CO.ISO8859-1
-+es_CO.iso88591: es_CO.ISO8859-1
- es_CO.utf8: es_CO.UTF-8
- es_CR: es_CR.ISO8859-1
--es_CR.iso88591: es_CR.ISO8859-1
- es_CR.ISO-8859-1: es_CR.ISO8859-1
-+es_CR.ISO_8859-1: es_CR.ISO8859-1
-+es_CR.iso88591: es_CR.ISO8859-1
- es_CR.utf8: es_CR.UTF-8
- es_DO: es_DO.ISO8859-1
- es_DO.iso88591: es_DO.ISO8859-1
- es_DO.ISO-8859-1: es_DO.ISO8859-1
-+es_DO.ISO_8859-1: es_DO.ISO8859-1
- es_DO.utf8: es_DO.UTF-8
- es_EC: es_EC.ISO8859-1
- es_EC.iso88591: es_EC.ISO8859-1
- es_EC.ISO-8859-1: es_EC.ISO8859-1
-+es_EC.ISO_8859-1: es_EC.ISO8859-1
- es_EC.utf8: es_EC.UTF-8
--es_ES: es_ES.ISO8859-1
--es_ES.88591: es_ES.ISO8859-1
--es_ES.88591.en: es_ES.ISO8859-1
- es_ES.iso88591: es_ES.ISO8859-1
+@@ -411,6 +462,7 @@
es_ES.ISO-8859-1: es_ES.ISO8859-1
es_ES.ISO_8859-1: es_ES.ISO8859-1
es_ES.iso885915: es_ES.ISO8859-15
+es_ES.iso885915@euro: es_ES.ISO8859-15
es_ES.ISO-8859-15: es_ES.ISO8859-15
es_ES.ISO-8859-15@euro: es_ES.ISO8859-15
-+es_ES.ISO_8859-15@euro: es_ES.ISO8859-15
es_ES@euro: es_ES.ISO8859-15
- es_ES.UTF-8@euro: es_ES.UTF-8
- es_ES.utf8: es_ES.UTF-8
--es_GT: es_GT.ISO8859-1
-+es_ES: es_ES.ISO8859-1
- es_GT.iso88591: es_GT.ISO8859-1
- es_GT.ISO-8859-1: es_GT.ISO8859-1
-+es_GT.ISO_8859-1: es_GT.ISO8859-1
-+es_GT: es_GT.ISO8859-1
- es_GT.utf8: es_GT.UTF-8
-+es_HN.ISO-8859-1: es_HN.ISO8859-1
-+es_HN.ISO_8859-1: es_HN.ISO8859-1
- es_HN: es_HN.ISO8859-1
- es_HN.iso88591: es_HN.ISO8859-1
--es_HN.ISO-8859-1: es_HN.ISO8859-1
- es_HN.utf8: es_HN.UTF-8
-+es_MX.ISO-8859-1: es_MX.ISO8859-1
-+es_MX.ISO_8859-1: es_MX.ISO8859-1
- es_MX: es_MX.ISO8859-1
- es_MX.iso88591: es_MX.ISO8859-1
--es_MX.ISO-8859-1: es_MX.ISO8859-1
- es_MX.utf8: es_MX.UTF-8
- es_NI: es_NI.ISO8859-1
- es_NI.iso88591: es_NI.ISO8859-1
- es_NI.ISO-8859-1: es_NI.ISO8859-1
-+es_NI.ISO_8859-1: es_NI.ISO8859-1
- es_NI.utf8: es_NI.UTF-8
+@@ -435,12 +487,10 @@
es_PA: es_PA.ISO8859-1
es_PA.iso88591: es_PA.ISO8859-1
es_PA.ISO-8859-1: es_PA.ISO8859-1
-es_PA.iso885915: es_PA.ISO8859-15
-+es_PA.ISO_8859-1: es_PA.ISO8859-1
es_PA.utf8: es_PA.UTF-8
es_PE: es_PE.ISO8859-1
es_PE.iso88591: es_PE.ISO8859-1
es_PE.ISO-8859-1: es_PE.ISO8859-1
-es_PE.iso885915: es_PE.ISO8859-15
-+es_PE.ISO_8859-1: es_PE.ISO8859-1
es_PE.utf8: es_PE.UTF-8
es_PR: es_PR.ISO8859-1
es_PR.iso88591: es_PR.ISO8859-1
- es_PR.ISO-8859-1: es_PR.ISO8859-1
-+es_PR.ISO_8859-1: es_PR.ISO8859-1
- es_PR.utf8: es_PR.UTF-8
+@@ -449,25 +499,26 @@
es_PY: es_PY.ISO8859-1
es_PY.iso88591: es_PY.ISO8859-1
es_PY.ISO-8859-1: es_PY.ISO8859-1
-es_PY.iso885915: es_PY.ISO8859-15
-+es_PY.ISO_8859-1: es_PY.ISO8859-1
es_PY.utf8: es_PY.UTF-8
es_SV: es_SV.ISO8859-1
es_SV.iso88591: es_SV.ISO8859-1
es_SV.ISO-8859-1: es_SV.ISO8859-1
-+es_SV.ISO_8859-1: es_SV.ISO8859-1
es_SV.iso885915: es_SV.ISO8859-15
+es_SV.ISO-8859-15: es_SV.ISO8859-15
-+es_SV.ISO_8859-15: es_SV.ISO8859-15
es_SV.utf8: es_SV.UTF-8
es_US: es_US.ISO8859-1
es_US.iso88591: es_US.ISO8859-1
es_US.ISO-8859-1: es_US.ISO8859-1
-+es_US.ISO_8859-1: es_US.ISO8859-1
+es_US.utf8: es_US.UTF-8
es_UY: es_UY.ISO8859-1
es_UY.iso88591: es_UY.ISO8859-1
es_UY.ISO-8859-1: es_UY.ISO8859-1
-+es_UY.ISO_8859-1: es_UY.ISO8859-1
es_UY.iso885915: es_UY.ISO8859-15
+es_UY.ISO-8859-15: es_UY.ISO8859-15
-+es_UY.ISO_8859-15: es_UY.ISO8859-15
es_UY.utf8: es_UY.UTF-8
es_VE: es_VE.ISO8859-1
es_VE.iso88591: es_VE.ISO8859-1
es_VE.ISO-8859-1: es_VE.ISO8859-1
-es_VE.iso885915: es_VE.ISO8859-15
-+es_VE.ISO_8859-1: es_VE.ISO8859-1
es_VE.utf8: es_VE.UTF-8
#if defined(SVR4) && defined(sun)
XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
-@@ -475,47 +586,64 @@
+@@ -475,8 +526,9 @@
#endif
XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
+et_EE: et_EE.ISO8859-1
et_EE.iso88591: et_EE.ISO8859-1
et_EE.ISO-8859-1: et_EE.ISO8859-1
-+et_EE.ISO_8859-1: et_EE.ISO8859-1
et_EE.iso88594: et_EE.ISO8859-4
- et_EE.ISO-8859-4: et_EE.ISO8859-4
- et_EE.iso885913: et_EE.ISO8859-13
-+et_EE.ISO-8859-15: et_EE.ISO8859-15
-+et_EE.ISO_8859-15: et_EE.ISO8859-15
- et_EE.ISO-8859-13: et_EE.ISO8859-13
- et_EE.iso885915: et_EE.ISO8859-15
--et_EE.ISO-8859-15: et_EE.ISO8859-15
- et_EE.utf8: et_EE.UTF-8
- eu: eu_ES.ISO8859-1
- eu_ES: eu_ES.ISO8859-1
- eu_ES.iso88591: eu_ES.ISO8859-1
- eu_ES.ISO-8859-1: eu_ES.ISO8859-1
-+eu_ES.ISO_8859-1: eu_ES.ISO8859-1
- eu_ES.iso885915: eu_ES.ISO8859-15
- eu_ES.ISO-8859-15: eu_ES.ISO8859-15
-+eu_ES.ISO_8859-15: eu_ES.ISO8859-15
-+eu_ES.iso885915@euro: eu_ES.ISO8859-15
+@@ -495,24 +547,31 @@
eu_ES.ISO-8859-15@euro: eu_ES.ISO8859-15
-+eu_ES.ISO_8859-15@euro: eu_ES.ISO8859-15
eu_ES@euro: eu_ES.ISO8859-15
eu_ES.UTF-8@euro: eu_ES.UTF-8
+eu_ES.utf8: eu_ES.UTF-8
fa_IR.isiri3342: fa_IR.ISIRI-3342
fa_IR.utf8: fa_IR.UTF-8
-fi: fi_FI.ISO8859-15
--fi_FI: fi_FI.ISO8859-15
+fi: fi_FI.ISO8859-1
+ fi.ISO8859-15: fi_FI.ISO8859-15
+-fi_FI: fi_FI.ISO8859-15
+fi_FI: fi_FI.ISO8859-1
fi_FI.88591: fi_FI.ISO8859-1
fi_FI.88591.en: fi_FI.ISO8859-1
fi_FI.ISO-8859-1: fi_FI.ISO8859-1
fi_FI.ISO_8859-1: fi_FI.ISO8859-1
fi_FI.iso885915: fi_FI.ISO8859-15
--fi_FI.ISO-8859-15: fi_FI.ISO8859-15
+fi_FI.iso885915@euro: fi_FI.ISO8859-15
+ fi_FI.ISO-8859-15: fi_FI.ISO8859-15
fi_FI.ISO-8859-15@euro: fi_FI.ISO8859-15
-+fi_FI.ISO_8859-15@euro: fi_FI.ISO8859-15
-+fi_FI.ISO-8859-15: fi_FI.ISO8859-15
fi_FI@euro: fi_FI.ISO8859-15
fi_FI.utf8: fi_FI.UTF-8
fi_FI.UTF-8@euro: fi_FI.UTF-8
+fil_PH: fil_PH.ISO8859-1
+fil_PH.iso88591: fil_PH.ISO8859-1
+fil_PH.ISO-8859-1: fil_PH.ISO8859-1
-+fil_PH.ISO_8859-1: fil_PH.ISO8859-1
+fil_PH.utf8: fil_PH.UTF-8
fo: fo_FO.ISO8859-1
fo_FO: fo_FO.ISO8859-1
fo_FO.iso88591: fo_FO.ISO8859-1
- fo_FO.ISO-8859-1: fo_FO.ISO8859-1
-+fo_FO.ISO_8859-1: fo_FO.ISO8859-1
- fo_FO.iso885915: fo_FO.ISO8859-15
- fo_FO.ISO-8859-15: fo_FO.ISO8859-15
- fo_FO.utf8: fo_FO.UTF-8
-@@ -523,11 +651,15 @@
+@@ -526,10 +585,12 @@
fr_BE: fr_BE.ISO8859-1
fr_BE.88591: fr_BE.ISO8859-1
fr_BE.88591.en: fr_BE.ISO8859-1
fr_BE.ISO_8859-1: fr_BE.ISO8859-1
fr_BE.iso885915: fr_BE.ISO8859-15
fr_BE.ISO-8859-15: fr_BE.ISO8859-15
-+fr_BE.ISO_8859-15: fr_BE.ISO8859-15
+fr_BE.iso885915@euro: fr_BE.ISO8859-15
fr_BE.ISO-8859-15@euro: fr_BE.ISO8859-15
-+fr_BE.ISO_8859-15@euro: fr_BE.ISO8859-15
fr_BE@euro: fr_BE.ISO8859-15
fr_BE.utf8: fr_BE.UTF-8
- fr_BE.UTF-8@euro: fr_BE.UTF-8
-@@ -543,11 +675,15 @@
+@@ -546,11 +607,14 @@
fr_CH: fr_CH.ISO8859-1
fr_CH.88591: fr_CH.ISO8859-1
fr_CH.88591.en: fr_CH.ISO8859-1
fr_CH.utf8: fr_CH.UTF-8
+fr_FR.iso885915@euro: fr_FR.ISO8859-15
+fr_FR.ISO-8859-15@euro: fr_FR.ISO8859-15
-+fr_FR.ISO_8859-15@euro: fr_FR.ISO8859-15
fr_FR: fr_FR.ISO8859-1
fr_FR.88591: fr_FR.ISO8859-1
fr_FR.88591.en: fr_FR.ISO8859-1
-@@ -556,10 +692,12 @@
+@@ -559,7 +623,6 @@
fr_FR.ISO_8859-1: fr_FR.ISO8859-1
fr_FR.iso885915: fr_FR.ISO8859-15
fr_FR.ISO-8859-15: fr_FR.ISO8859-15
fr_FR@euro: fr_FR.ISO8859-15
fr_FR.UTF-8@euro: fr_FR.UTF-8
fr_FR.utf8: fr_FR.UTF-8
-+fr_LU.iso885915@euro: fr_LU.ISO8859-15
-+fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
-+fr_LU.ISO_8859-15@euro: fr_LU.ISO8859-15
- fr_LU: fr_LU.ISO8859-1
- fr_LU.88591: fr_LU.ISO8859-1
- fr_LU.88591.en: fr_LU.ISO8859-1
-@@ -568,7 +706,6 @@
+@@ -570,6 +633,7 @@
+ fr_LU.ISO-8859-1: fr_LU.ISO8859-1
fr_LU.ISO_8859-1: fr_LU.ISO8859-1
fr_LU.iso885915: fr_LU.ISO8859-15
++fr_LU.iso885915@euro: fr_LU.ISO8859-15
fr_LU.ISO-8859-15: fr_LU.ISO8859-15
--fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
+ fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
fr_LU@euro: fr_LU.ISO8859-15
- fr_LU.UTF-8@euro: fr_LU.UTF-8
- fr_LU.utf8: fr_LU.UTF-8
-@@ -578,11 +715,16 @@
- ga_IE: ga_IE.ISO8859-1
- ga_IE.iso88591: ga_IE.ISO8859-1
- ga_IE.ISO-8859-1: ga_IE.ISO8859-1
-+ga_IE.ISO_8859-1: ga_IE.ISO8859-1
- ga_IE.iso885914: ga_IE.ISO8859-14
+@@ -585,6 +649,7 @@
ga_IE.ISO-8859-14: ga_IE.ISO8859-14
-+ga_IE.ISO_8859-14: ga_IE.ISO8859-14
ga_IE.iso885915: ga_IE.ISO8859-15
ga_IE.ISO-8859-15: ga_IE.ISO8859-15
-+ga_IE.ISO_8859-15: ga_IE.ISO8859-15
+ga_IE.iso885915@euro: ga_IE.ISO8859-15
ga_IE.ISO-8859-15@euro: ga_IE.ISO8859-15
-+ga_IE.ISO_8859-15@euro: ga_IE.ISO8859-15
ga_IE@euro: ga_IE.ISO8859-15
ga_IE.UTF-8@euro: ga_IE.UTF-8
- ga_IE.utf8: ga_IE.UTF-8
-@@ -590,44 +732,62 @@
- gd_GB: gd_GB.ISO8859-1
- gd_GB.iso88591: gd_GB.ISO8859-1
- gd_GB.ISO-8859-1: gd_GB.ISO8859-1
-+gd_GB.ISO_8859-1: gd_GB.ISO8859-1
- gd_GB.iso885914: gd_GB.ISO8859-14
+@@ -597,16 +662,23 @@
gd_GB.ISO-8859-14: gd_GB.ISO8859-14
-+gd_GB.ISO_8859-14: gd_GB.ISO8859-14
gd_GB.iso885915: gd_GB.ISO8859-15
gd_GB.ISO-8859-15: gd_GB.ISO8859-15
-+gd_GB.ISO_8859-15: gd_GB.ISO8859-15
+gez_ER: gez_ER.UTF-8
+gez_ER@abegede: gez_ER.UTF-8
+gez_ER.utf8: gez_ER.UTF-8
gl_ES: gl_ES.ISO8859-1
gl_ES.iso88591: gl_ES.ISO8859-1
gl_ES.ISO-8859-1: gl_ES.ISO8859-1
-+gl_ES.ISO_8859-1: gl_ES.ISO8859-1
gl_ES.iso885915: gl_ES.ISO8859-15
gl_ES.ISO-8859-15: gl_ES.ISO8859-15
-+gl_ES.ISO_8859-15: gl_ES.ISO8859-15
+gl_ES.iso885915@euro: gl_ES.ISO8859-15
gl_ES.ISO-8859-15@euro: gl_ES.ISO8859-15
-+gl_ES.ISO_8859-15@euro: gl_ES.ISO8859-15
gl_ES@euro: gl_ES.ISO8859-15
gl_ES.UTF-8@euro: gl_ES.UTF-8
gl_ES.utf8: gl_ES.UTF-8
gu_IN.utf8: gu_IN.UTF-8
gu_IN.UTF-8: gu_IN.UTF-8
gv: gv_GB.ISO8859-1
- gv_GB: gv_GB.ISO8859-1
- gv_GB.iso88591: gv_GB.ISO8859-1
- gv_GB.ISO-8859-1: gv_GB.ISO8859-1
-+gv_GB.ISO_8859-1: gv_GB.ISO8859-1
- gv_GB.iso885914: gv_GB.ISO8859-14
+@@ -617,6 +689,7 @@
gv_GB.ISO-8859-14: gv_GB.ISO8859-14
-+gv_GB.ISO_8859-14: gv_GB.ISO8859-14
gv_GB.iso885915: gv_GB.ISO8859-15
gv_GB.ISO-8859-15: gv_GB.ISO8859-15
-+gv_GB.ISO_8859-15: gv_GB.ISO8859-15
+gv_GB.utf8: gv_GB.UTF-8
he: he_IL.ISO8859-8
he_IL: he_IL.ISO8859-8
HE_IL: he_IL.ISO8859-8
- he_IL.iso88598: he_IL.ISO8859-8
- he_IL.ISO-8859-8: he_IL.ISO8859-8
-+he_IL.ISO_8859-8: he_IL.ISO8859-8
- he_IL.cp1255: he_IL.CP1255
- he_IL.microsoftcp1255: he_IL.CP1255
- he_IL.microsoft-cp1255: he_IL.CP1255
+@@ -628,9 +701,9 @@
he_IL.MICROSOFT-CP1255: he_IL.CP1255
he_IL.utf8: he_IL.UTF-8
HE_IL.UTF-8: he_IL.UTF-8
hi_IN.isciidev: hi_IN.ISCII-DEV
hi_IN.utf8: hi_IN.UTF-8
HI_IN.UTF-8: hi_IN.UTF-8
-@@ -637,10 +797,31 @@
+@@ -643,11 +716,27 @@
hr_HR.ISO-8859-2: hr_HR.ISO8859-2
hr_HR.ISO_8859-2: hr_HR.ISO8859-2
hr_HR.utf8: hr_HR.UTF-8
+hsb_DE: hsb_DE.ISO8859-2
+hsb_DE.iso88592: hsb_DE.ISO8859-2
+hsb_DE.ISO-8859-2: hsb_DE.ISO8859-2
-+hsb_DE.ISO_8859-2: hsb_DE.ISO8859-2
+hsb_DE.utf8: hsb_DE.UTF-8
hu: hu_HU.ISO8859-2
hu_HU: hu_HU.ISO8859-2
hu_HU.iso88592: hu_HU.ISO8859-2
hu_HU.ISO-8859-2: hu_HU.ISO8859-2
-+hu_HU.ISO_8859-2: hu_HU.ISO8859-2
+hu_HU.iso885916: hu_HU.ISO8859-16
+hu_HU.ISO-8859-16: hu_HU.ISO8859-16
-+hu_HU.ISO_8859-16: hu_HU.ISO8859-16
-+hu_HU.utf8: hu_HU.UTF-8
+ hu_HU.utf8: hu_HU.UTF-8
+hy: hy_AM.UTF-8
+hy_AM: hy_AM.UTF-8
+hy_AM.armscii8: hy_AM.ARMSCII-8
+id_ID: id_ID.ISO8859-1
+id_ID.iso88591: id_ID.ISO8859-1
+id_ID.ISO-8859-1: id_ID.ISO8859-1
-+id_ID.ISO_8859-1: id_ID.ISO8859-1
+id_ID.utf8: id_ID.UTF-8
XCOMM in was the old ISO code for Indonesian (now id). These lines should be
XCOMM deleted in the future.
in: id_ID.ISO8859-1
-@@ -656,8 +837,8 @@
- it: it_IT.ISO8859-1
- it_CH: it_CH.ISO8859-1
- it_CH.iso88591: it_CH.ISO8859-1
--it_CH.ISO_8859-1: it_CH.ISO8859-1
- it_CH.ISO-8859-1: it_CH.ISO8859-1
-+it_CH.ISO_8859-1: it_CH.ISO8859-1
- it_CH.iso885915: it_CH.ISO8859-15
- it_CH.utf8: it_CH.UTF-8
- it_IT: it_IT.ISO8859-1
-@@ -668,13 +849,16 @@
+@@ -677,13 +766,14 @@
it_IT.ISO_8859-1: it_IT.ISO8859-1
it_IT.iso885915: it_IT.ISO8859-15
it_IT.ISO-8859-15: it_IT.ISO8859-15
-+it_IT.ISO_8859-15: it_IT.ISO8859-15
+it_IT.iso885915@euro: it_IT.ISO8859-15
it_IT.ISO-8859-15@euro: it_IT.ISO8859-15
-+it_IT.ISO_8859-15@euro: it_IT.ISO8859-15
it_IT@euro: it_IT.ISO8859-15
it_IT.utf8: it_IT.UTF-8
it_IT.UTF-8@euro: it_IT.UTF-8
XCOMM iw was the old ISO code for Hebrew (now he). These lines should be
XCOMM deleted in the future.
iw: he_IL.ISO8859-8
-@@ -683,20 +867,20 @@
- iw_IL.iso88598: he_IL.ISO8859-8
- iw_IL.ISO-8859-8: he_IL.ISO8859-8
- #ifndef __uxp__
-+ja: ja_JP.eucJP
- ja_JP: ja_JP.eucJP
- #else /* __uxp__ */
-+ja: ja_JP.U90
- ja_JP: ja_JP.U90
- ja_JP.U90: ja_JP.U90
- ja_JP.S90: ja_JP.S90
- #endif /* __uxp__ */
--ja: ja_JP.eucJP
- ja.JIS: ja_JP.JIS7
- ja.SJIS: ja_JP.SJIS
--ja_JP: ja_JP.eucJP
- ja_JP.ujis: ja_JP.eucJP
--ja_JP.eucjp: ja_JP.eucJP
- Jp_JP: ja_JP.eucJP
- ja_JP.AJEC: ja_JP.eucJP
-+ja_JP.eucjp: ja_JP.eucJP
- ja_JP.EUC: ja_JP.eucJP
- ja_JP.EUC-JP: ja_JP.eucJP
- ja_JP.EUC_JP: ja_JP.eucJP
-@@ -705,24 +889,28 @@
- ja_JP.JIS: ja_JP.JIS7
+@@ -713,24 +803,27 @@
ja_JP.jis7: ja_JP.JIS7
ja_JP.mscode: ja_JP.SJIS
+ ja_JP.PCK: ja_JP.SJIS
-ja_JP.SJIS: ja_JP.SJIS
ja_JP.sjis: ja_JP.SJIS
ja_JP.utf8: ja_JP.UTF-8
kl_GL.iso88591: kl_GL.ISO8859-1
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
-kl_GL.iso885915: kl_GL.ISO8859-15
-+kl_GL.ISO_8859-1: kl_GL.ISO8859-1
kl_GL.utf8: kl_GL.UTF-8
kn: kn_IN.UTF-8
+kn_IN: kn_IN.UTF-8
kn_IN.utf8: kn_IN.UTF-8
-kn_IN.UTF-8: kn_IN.UTF-8
ko: ko_KR.eucKR
+ ko.UTF-8: ko_KR.UTF-8
ko_KR: ko_KR.eucKR
- KO_KR: ko_KR.eucKR
-@@ -732,23 +920,56 @@
- ko_KR.euckr: ko_KR.eucKR
- ko_KR.utf8: ko_KR.UTF-8
- KO_KR.UTF-8: ko_KR.UTF-8
+@@ -747,6 +840,9 @@
+ ks_IN@devanagari: ks_IN@devanagari.UTF-8
+ ks_IN@devanagari.utf8: ks_IN@devanagari.UTF-8
+ ks_IN@devanagari.UTF-8: ks_IN@devanagari.UTF-8
+ku: ku_TR.UTF-8
+ku_TR: ku_TR.UTF-8
+ku_TR.utf8: ku_TR.UTF-8
kw: kw_GB.ISO8859-1
kw_GB: kw_GB.ISO8859-1
kw_GB.iso88591: kw_GB.ISO8859-1
- kw_GB.ISO-8859-1: kw_GB.ISO8859-1
-+kw_GB.ISO_8859-1: kw_GB.ISO8859-1
- kw_GB.iso885914: kw_GB.ISO8859-14
+@@ -755,15 +851,37 @@
kw_GB.ISO-8859-14: kw_GB.ISO8859-14
-+kw_GB.ISO_8859-14: kw_GB.ISO8859-14
kw_GB.iso885915: kw_GB.ISO8859-15
kw_GB.ISO-8859-15: kw_GB.ISO8859-15
-+kw_GB.ISO_8859-15: kw_GB.ISO8859-15
+kw_GB.utf8: kw_GB.UTF-8
ky: ky_KG.UTF-8
ky_KG: ky_KG.UTF-8
+lg_UG: lg_UG.ISO8859-10
+lg_UG.iso885910: lg_UG.ISO8859-10
+lg_UG.ISO-8859-10: lg_UG.ISO8859-10
-+lg_UG.ISO_8859-10: lg_UG.ISO8859-10
+lg_UG.utf8: lg_UG.UTF-8
+li: li_BE.ISO8859-1
+li_BE: li_BE.ISO8859-1
+li_BE.iso88591: li_BE.ISO8859-1
+li_BE.ISO-8859-1: li_BE.ISO8859-1
-+li_BE.ISO_8859-1: li_BE.ISO8859-1
+li_BE.iso885915@euro: li_BE.ISO8859-15
+li_BE.ISO-8859-15@euro: li_BE.ISO8859-15
-+li_BE.ISO_8859-15@euro: li_BE.ISO8859-15
+li_BE@euro: li_BE.ISO8859-15
+li_BE.utf8: li_BE.UTF-8
+li_NL: li_NL.ISO8859-1
+li_NL.iso88591: li_NL.ISO8859-1
+li_NL.ISO-8859-1: li_NL.ISO8859-1
-+li_NL.ISO_8859-1: li_NL.ISO8859-1
+li_NL.iso885915@euro: li_NL.ISO8859-15
+li_NL.ISO-8859-15@euro: li_NL.ISO8859-15
-+li_NL.ISO_8859-15@euro: li_NL.ISO8859-15
+li_NL@euro: li_NL.ISO8859-15
+li_NL.utf8: li_NL.UTF-8
+lo: lo_LA.UTF-8
#if defined(VeryOldFreeBSD)
XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
-@@ -765,6 +986,8 @@
+@@ -780,6 +898,8 @@
lt_LT.ISO-8859-13: lt_LT.ISO8859-13
lt_LT.ISO_8859-13: lt_LT.ISO8859-13
lt_LT.utf8: lt_LT.UTF-8
lv: lv_LV.ISO8859-13
lv_LV: lv_LV.ISO8859-13
lv_LV.iso88594: lv_LV.ISO8859-4
-@@ -776,34 +999,68 @@
+@@ -794,6 +914,8 @@
mi: mi_NZ.ISO8859-1
mi_NZ: mi_NZ.ISO8859-1
mi_NZ.iso88591: mi_NZ.ISO8859-1
+mi_NZ.ISO-8859-1: mi_NZ.ISO8859-1
-+mi_NZ.ISO_8859-1: mi_NZ.ISO8859-1
+mi_NZ.utf8: mi_NZ.UTF-8
mk: mk_MK.ISO8859-5
mk_MK: mk_MK.ISO8859-5
mk_MK.iso88595: mk_MK.ISO8859-5
- mk_MK.ISO-8859-5: mk_MK.ISO8859-5
-+mk_MK.ISO_8859-5: mk_MK.ISO8859-5
- mk_MK.cp1251: mk_MK.CP1251
- mk_MK.microsoftcp1251: mk_MK.CP1251
- mk_MK.microsoft-cp1251: mk_MK.CP1251
+@@ -804,8 +926,12 @@
mk_MK.MICROSOFT-CP1251: mk_MK.CP1251
mk_MK.utf8: mk_MK.UTF-8
ml: ml_IN.UTF-8
+mn: mn_MN.UTF-8
+mn_MN: mn_MN.UTF-8
+mn_MN.utf8: mn_MN.UTF-8
+ mr: mr_IN.UTF-8
mr_IN: mr_IN.UTF-8
mr_IN.utf8: mr_IN.UTF-8
- ms: ms_MY.ISO8859-1
+@@ -814,9 +940,12 @@
ms_MY: ms_MY.ISO8859-1
ms_MY.iso88591: ms_MY.ISO8859-1
ms_MY.ISO-8859-1: ms_MY.ISO8859-1
-+ms_MY.ISO_8859-1: ms_MY.ISO8859-1
+ms_MY.utf8: ms_MY.UTF-8
mt: mt_MT.ISO8859-3
mt_MT: mt_MT.ISO8859-3
+mt_MT.iso88593: mt_MT.ISO8859-3
mt_MT.ISO-8859-3: mt_MT.ISO8859-3
-+mt_MT.ISO_8859-3: mt_MT.ISO8859-3
+mt_MT.utf8: mt_MT.UTF-8
nb: nb_NO.ISO8859-1
nb_NO: nb_NO.ISO8859-1
nb_NO.88591: nb_NO.ISO8859-1
- nb_NO.iso88591: nb_NO.ISO8859-1
+@@ -824,6 +953,20 @@
nb_NO.ISO-8859-1: nb_NO.ISO8859-1
-+nb_NO.ISO_8859-1: nb_NO.ISO8859-1
nb_NO.iso885915: nb_NO.ISO8859-15
nb_NO.ISO-8859-15: nb_NO.ISO8859-15
-+nb_NO.ISO_8859-15: nb_NO.ISO8859-15
+nb_NO.utf8: nb_NO.UTF-8
+nds: nds_DE.ISO8859-1
+nds_DE: nds_DE.ISO8859-1
+nds_DE.iso88591: nds_DE.ISO8859-1
+nds_DE.ISO-8859-1: nds_DE.ISO8859-1
-+nds_DE.ISO_8859-1: nds_DE.ISO8859-1
+nds_DE.iso88591@traditional: nds_DE.ISO8859-1
+nds_DE.ISO-8859-1@traditional: nds_DE.ISO8859-1
-+nds_DE.ISO_8859-1@traditional: nds_DE.ISO8859-1
+nds_DE@traditional: nds_DE.ISO8859-1
+nds_DE.iso885915: nds_DE.ISO8859-15
+nds_DE.iso885915@euro: nds_DE.ISO8859-15
+nds_DE.ISO-8859-15@euro: nds_DE.ISO8859-15
-+nds_DE.ISO_8859-15@euro: nds_DE.ISO8859-15
+nds_DE@euro: nds_DE.ISO8859-15
+nds_DE.utf8: nds_DE.UTF-8
+ne: ne_NP.UTF-8
-+ne_NP: ne_NP.UTF-8
-+ne_NP.utf8: ne_NP.UTF-8
+ ne_NP.utf8: ne_NP.UTF-8
+ ne_NP.UTF-8: ne_NP.UTF-8
nl: nl_NL.ISO8859-1
- nl_BE: nl_BE.ISO8859-1
- nl_BE.88591: nl_BE.ISO8859-1
-@@ -812,8 +1069,10 @@
+@@ -835,8 +978,9 @@
nl_BE.ISO-8859-1: nl_BE.ISO8859-1
nl_BE.ISO_8859-1: nl_BE.ISO8859-1
nl_BE.iso885915: nl_BE.ISO8859-15
-nl_BE.ISO-8859-15: nl_BE.ISO8859-15
+nl_BE.iso885915@euro: nl_BE.ISO8859-15
nl_BE.ISO-8859-15@euro: nl_BE.ISO8859-15
-+nl_BE.ISO_8859-15@euro: nl_BE.ISO8859-15
+nl_BE.ISO-8859-15: nl_BE.ISO8859-15
nl_BE@euro: nl_BE.ISO8859-15
nl_BE.utf8: nl_BE.UTF-8
nl_BE.UTF-8@euro: nl_BE.UTF-8
-@@ -821,11 +1080,13 @@
+@@ -844,11 +988,12 @@
nl_NL.88591: nl_NL.ISO8859-1
nl_NL.88591.en: nl_NL.ISO8859-1
nl_NL.iso88591: nl_NL.ISO8859-1
+nl_NL.iso885915@euro: nl_NL.ISO8859-15
+nl_NL.ISO-8859-15@euro: nl_NL.ISO8859-15
-+nl_NL.ISO_8859-15@euro: nl_NL.ISO8859-15
nl_NL.ISO-8859-1: nl_NL.ISO8859-1
nl_NL.ISO_8859-1: nl_NL.ISO8859-1
nl_NL.iso885915: nl_NL.ISO8859-15
nl_NL@euro: nl_NL.ISO8859-15
nl_NL.utf8: nl_NL.UTF-8
nl_NL.UTF-8@euro: nl_NL.UTF-8
-@@ -836,42 +1097,79 @@
+@@ -859,31 +1004,35 @@
nn_NO.ISO_8859-1: nn_NO.ISO8859-1
nn_NO.iso885915: nn_NO.ISO8859-15
nn_NO.ISO-8859-15: nn_NO.ISO8859-15
-no_NO.88591.en: no_NO.ISO8859-1
-no_NO.iso88591: no_NO.ISO8859-1
-no_NO.ISO-8859-1: no_NO.ISO8859-1
+-no_NO.ISO8859-1@bokmal: no_NO.ISO8859-1
+-no_NO.ISO8859-1@nynorsk: no_NO.ISO8859-1
-no_NO.iso885915: no_NO.ISO8859-15
-no_NO.ISO-8859-15: no_NO.ISO8859-15
-no_NO.utf8: no_NO.UTF-8
-+nn_NO.ISO_8859-15: nn_NO.ISO8859-15
-+nn_NO.utf8: nn_NO.UTF-8
+no: nb_NO.ISO8859-1
+no_NO: nb_NO.ISO8859-1
+no_NO.88591: nb_NO.ISO8859-1
+no_NO.88591.en: nb_NO.ISO8859-1
+no_NO.iso88591: nb_NO.ISO8859-1
+no_NO.ISO-8859-1: nb_NO.ISO8859-1
-+no_NO.ISO_8859-1: nb_NO.ISO8859-1
++no_NO.ISO8859-1@bokmal: nb_NO.ISO8859-1
++no_NO.ISO8859-1@nynorsk: nn_NO.ISO8859-1
+no_NO.iso885915: nb_NO.ISO8859-15
+no_NO.ISO-8859-15: nb_NO.ISO8859-15
-+no_NO.ISO_8859-15: nb_NO.ISO8859-15
+no_NO.utf8: nb_NO.UTF-8
nr: nr_ZA.ISO8859-1
nr_ZA: nr_ZA.ISO8859-1
nr_ZA.iso88591: nr_ZA.ISO8859-1
+nr_ZA.ISO-8859-1: nr_ZA.ISO8859-1
-+nr_ZA.ISO_8859-1: nr_ZA.ISO8859-1
nr_ZA.utf8: nr_ZA.UTF-8
-nso: nso_ZA.ISO8859-15
-nso_ZA: nso_ZA.ISO8859-15
+nso: nso_ZA.ISO8859-10
+nso_ZA: nso_ZA.ISO8859-10
-+nso_ZA.iso885910: nso_ZA.ISO8859-10
++nso_ZA.iso885910: nso_ZA.ISO8859-10
+nso_ZA.ISO-8859-10: nso_ZA.ISO8859-10
-+nso_ZA.ISO_8859-10: nso_ZA.ISO8859-10
nso_ZA.iso885915: nso_ZA.ISO8859-15
+nso_ZA.ISO-8859-15: nso_ZA.ISO8859-15
-+nso_ZA.ISO_8859-15: nso_ZA.ISO8859-15
nso_ZA.utf8: nso_ZA.UTF-8
-ny: ny_NO.ISO8859-1
-ny_NO: ny_NO.ISO8859-1
+ny_NO: nn_NO.ISO8859-1
+ny_NO.88591: nn_NO.ISO8859-1
+ny_NO.ISO-8859-1: nn_NO.ISO8859-1
-+ny_NO.ISO_8859-1: nn_NO.ISO8859-1
+ny_NO.iso885915: nn_NO.ISO8859-15
-+ny_NO.ISO-8859-15: nn_NO.ISO8859-15
-+ny_NO.ISO_8859-15: nn_NO.ISO8859-15
+no@nynorsk: nn_NO.ISO8859-1
nynorsk: nn_NO.ISO8859-1
oc: oc_FR.ISO8859-1
oc_FR: oc_FR.ISO8859-1
- oc_FR.iso88591: oc_FR.ISO8859-1
+@@ -891,14 +1040,31 @@
oc_FR.ISO-8859-1: oc_FR.ISO8859-1
-+oc_FR.ISO_8859-1: oc_FR.ISO8859-1
oc_FR.iso885915: oc_FR.ISO8859-15
oc_FR.ISO-8859-15: oc_FR.ISO8859-15
-+oc_FR.ISO_8859-15: oc_FR.ISO8859-15
+oc_FR.iso885915@euro: oc_FR.ISO8859-15
+oc_FR.ISO-8859-15@euro: oc_FR.ISO8859-15
-+oc_FR.ISO_8859-15@euro: oc_FR.ISO8859-15
oc_FR@euro: oc_FR.ISO8859-15
+om: om_ET.UTF-8
+om_ET: om_ET.UTF-8
+om_KE: om_KE.ISO8859-1
+om_KE.iso88591: om_KE.ISO8859-1
+om_KE.ISO-8859-1: om_KE.ISO8859-1
-+om_KE.ISO_8859-1: om_KE.ISO8859-1
+om_KE.utf8: om_KE.UTF-8
or: or_IN.UTF-8
+or_IN: or_IN.UTF-8
or_IN.utf8: or_IN.UTF-8
-or_IN.UTF-8: or_IN.UTF-8
-+pa: pa_IN.UTF-8
+ pa: pa_IN.UTF-8
+pa_IN: pa_IN.UTF-8
pa_IN.utf8: pa_IN.UTF-8
-pa_IN.UTF-8: pa_IN.UTF-8
++pa_PK: pa_PK.UTF-8
+ pa_PK.utf8: pa_PK.UTF-8
+pap: pap_AN.ISO8859-1
+pap_AN: pap_AN.ISO8859-1
+pap_AN.iso88591: pap_AN.ISO8859-1
+pap_AN.ISO-8859-1: pap_AN.ISO8859-1
-+pap_AN.ISO_8859-1: pap_AN.ISO8859-1
+pap_AN.iso885915@euro: pap_AN.ISO8859-15
+pap_AN.ISO-8859-15@euro: pap_AN.ISO8859-15
-+pap_AN.ISO_8859-15@euro: pap_AN.ISO8859-15
+pap_AN.utf8: pap_AN.UTF-8
pd: pd_US.ISO8859-1
pd_DE: pd_DE.ISO8859-1
pd_US: pd_US.ISO8859-1
-@@ -879,17 +1177,23 @@
+@@ -906,18 +1072,22 @@
pd_US.iso88591: pd_US.ISO8859-1
pd_DE.iso885915: pd_DE.ISO8859-15
pd_US.iso885915: pd_US.ISO8859-15
+ph_PH.iso88591: fil_PH.ISO8859-1
+ph_PH.ISO8859-1 fil_PH.ISO8859-1
pl: pl_PL.ISO8859-2
+ pl.UTF-8: pl_PL.UTF-8
pl_PL: pl_PL.ISO8859-2
pl_PL.iso88592: pl_PL.ISO8859-2
pl_PL.ISO-8859-2: pl_PL.ISO8859-2
-+pl_PL.ISO_8859-2: pl_PL.ISO8859-2
+pl_PL.iso885916: pl_PL.ISO8859-16
+pl_PL.ISO-8859-16: pl_PL.ISO8859-16
-+pl_PL.ISO_8859-16: pl_PL.ISO8859-16
pl_PL.utf8: pl_PL.UTF-8
-pp: pp_AN.ISO8859-1
-pp_AN: pp_AN.ISO8859-1
+pp: pap_AN.ISO8859-1
+pp_AN: pap_AN.ISO8859-1
+pp_AN.iso88591: pap_AN.ISO8859-1
-+pp_AN.ISO8859-1 pap_AN.ISO8859-1
++pp_AN.ISO-8859-1: pap_AN.ISO8859-1
pt: pt_PT.ISO8859-1
+ pt.ISO8859-15: pt_PT.ISO8859-15
pt_BR: pt_BR.ISO8859-1
- pt_BR.88591: pt_BR.ISO8859-1
-@@ -897,7 +1201,6 @@
+@@ -926,7 +1096,6 @@
pt_BR.iso88591: pt_BR.ISO8859-1
pt_BR.ISO-8859-1: pt_BR.ISO8859-1
pt_BR.ISO_8859-1: pt_BR.ISO8859-1
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -906,8 +1209,10 @@
+@@ -935,8 +1104,9 @@
pt_PT.ISO-8859-1: pt_PT.ISO8859-1
pt_PT.ISO_8859-1: pt_PT.ISO8859-1
pt_PT.iso885915: pt_PT.ISO8859-15
-pt_PT.ISO-8859-15: pt_PT.ISO8859-15
+pt_PT.iso885915@euro: pt_PT.ISO8859-15
pt_PT.ISO-8859-15@euro: pt_PT.ISO8859-15
-+pt_PT.ISO_8859-15@euro: pt_PT.ISO8859-15
+pt_PT.ISO-8859-15: pt_PT.ISO8859-15
pt_PT@euro: pt_PT.ISO8859-15
pt_PT.utf8: pt_PT.UTF-8
pt_PT.UTF-8@euro: pt_PT.UTF-8
-@@ -915,17 +1220,23 @@
+@@ -944,6 +1114,8 @@
ro_RO: ro_RO.ISO8859-2
ro_RO.iso88592: ro_RO.ISO8859-2
ro_RO.ISO-8859-2: ro_RO.ISO8859-2
-+ro_RO.ISO_8859-2: ro_RO.ISO8859-2
+ro_RO.iso885916: ro_RO.ISO8859-16
+ro_RO.ISO-8859-16: ro_RO.ISO8859-16
-+ro_RO.ISO_8859-16: ro_RO.ISO8859-16
ro_RO.utf8: ro_RO.UTF-8
ru: ru_RU.UTF-8
- ru_RU: ru_RU.UTF-8
- ru_RU.utf8: ru_RU.UTF-8
- ru_RU.iso88595: ru_RU.ISO8859-5
- ru_RU.ISO-8859-5: ru_RU.ISO8859-5
-+ru_RU.ISO_8859-5: ru_RU.ISO8859-5
- ru_RU.koi8r: ru_RU.KOI8-R
- ru_RU.cp1251: ru_RU.CP1251
- ru_RU.microsoftcp1251: ru_RU.CP1251
- ru_RU.microsoft-cp1251: ru_RU.CP1251
- ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
-+ru_RU.utf8: ru_RU.UTF-8
- #if defined(INCLUDE_ru_SU)
- XCOMM ru_SU is redundant now
- ru_SU: ru_RU.KOI8-R
-@@ -938,10 +1249,12 @@
+ ru.koi8-r: ru_RU.KOI8-R
+@@ -969,10 +1141,12 @@
ru_UA.microsoftcp1251: ru_UA.CP1251
ru_UA.microsoft-cp1251: ru_UA.CP1251
ru_UA.MICROSOFT-CP1251: ru_UA.CP1251
rw_RW.ISO-8859-1: rw_RW.ISO8859-1
+rw_RW.ISO_8859-1: rw_RW.ISO8859-1
rw_RW.utf8: rw_RW.UTF-8
- se_NO: se_NO.UTF-8
- se_NO.utf8: se_NO.UTF-8
-@@ -955,25 +1268,52 @@
- sh_YU.utf8: sr_CS.UTF-8
+ sd: sd_IN.UTF-8
+ sd_IN.utf8: sd_IN.UTF-8
+@@ -992,6 +1166,10 @@
+ sh_YU.utf8: sr_RS.UTF-8@latin
si: si_LK.UTF-8
si_LK: si_LK.UTF-8
+si_LK.utf8: si_LK.UTF-8
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
- sk_SK.ISO-8859-2: sk_SK.ISO8859-2
-+sk_SK.ISO_8859-2: sk_SK.ISO8859-2
- sk_SK.utf8: sk_SK.UTF-8
- sl: sl_SI.ISO8859-2
+@@ -1001,11 +1179,27 @@
sl_SI: sl_SI.ISO8859-2
sl_SI.iso88592: sl_SI.ISO8859-2
sl_SI.ISO-8859-2: sl_SI.ISO8859-2
-+sl_SI.ISO_8859-2: sl_SI.ISO8859-2
+sl_SI.iso885916: sl_SI.ISO8859-16
+sl_SI.ISO-8859-16: sl_SI.ISO8859-16
-+sl_SI.ISO_8859-16: sl_SI.ISO8859-16
sl_SI.utf8: sl_SI.UTF-8
+-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
+so_DJ: so_DJ.ISO8859-1
+so_DJ.iso88591: so_DJ.ISO8859-1
+so_DJ.ISO-8859-1: so_DJ.ISO8859-1
-+so_DJ.ISO_8859-1: so_DJ.ISO8859-1
+so_DJ.utf8: so_DJ.UTF-8
+so_ET: so_ET.UTF-8
+so_ET.utf8: so_ET.UTF-8
+so_KE: so_KE.ISO8859-1
+so_KE.iso88591: so_KE.ISO8859-1
+so_KE.ISO-8859-1: so_KE.ISO8859-1
-+so_KE.ISO_8859-1: so_KE.ISO8859-1
+so_KE.utf8: so_KE.UTF-8
+so_SO: so_SO.ISO8859-1
+so_SO.iso88591: so_SO.ISO8859-1
+so_SO.ISO-8859-1: so_SO.ISO8859-1
-+so_SO.ISO_8859-1: so_SO.ISO8859-1
+so_SO.utf8: so_SO.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: sq_AL.ISO8859-1
+sq_AL: sq_AL.ISO8859-1
+sq_AL.iso88591: sq_AL.ISO8859-1
+sq_AL.ISO-8859-1: sq_AL.ISO8859-1
-+sq_AL.ISO_8859-1: sq_AL.ISO8859-1
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).
-@@ -983,8 +1323,10 @@
- sr_YU: sr_CS.ISO8859-5
- sr_YU.iso88592: sr_CS.ISO8859-2
- sr_YU.ISO-8859-2: 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_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
-@@ -997,32 +1339,50 @@
- 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: sr_CS.ISO8859-5
- sr_CS.iso88592: sr_CS.ISO8859-2
- sr_CS.ISO-8859-2: 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_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.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_ME: sr_ME.ISO8859-5
-+sr_ME.ISO-8859-5: sr_ME.ISO8859-5
-+sr_ME.ISO_8859-5: sr_ME.ISO8859-5
-+sr_ME.utf8: sr_ME.UTF-8
-+sr@ije: sr_ME.ISO8859-5
-+sr_CS@ije: sr_CS.ISO8859-5
+ 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).
+@@ -1029,13 +1223,17 @@
+ sr_RS.utf8: sr_RS.UTF-8
+ sr_ME: sr_ME.UTF-8
+ sr_ME.utf8: sr_ME.UTF-8
++sr@ije: sr_ME.UTF-8
++sr_CS@ije: sr_CS.UTF-8
ss: ss_ZA.ISO8859-1
ss_ZA: ss_ZA.ISO8859-1
ss_ZA.iso88591: ss_ZA.ISO8859-1
+ss_ZA.ISO-8859-1: ss_ZA.ISO8859-1
-+ss_ZA.ISO_8859-1: ss_ZA.ISO8859-1
ss_ZA.utf8: ss_ZA.UTF-8
st: st_ZA.ISO8859-1
st_ZA: st_ZA.ISO8859-1
st_ZA.iso88591: st_ZA.ISO8859-1
+st_ZA.ISO-8859-1: st_ZA.ISO8859-1
-+st_ZA.ISO_8859-1: st_ZA.ISO8859-1
st_ZA.utf8: st_ZA.UTF-8
sv: sv_SE.ISO8859-1
- sv_FI: sv_FI.ISO8859-1
- sv_FI.iso88591: sv_FI.ISO8859-1
+ sv.ISO8859-15: sv_SE.ISO8859-15
+@@ -1045,6 +1243,7 @@
sv_FI.ISO-8859-1: sv_FI.ISO8859-1
-+sv_FI.ISO_8859-1: sv_FI.ISO8859-1
sv_FI.iso885915: sv_FI.ISO8859-15
sv_FI.ISO-8859-15: sv_FI.ISO8859-15
-+sv_FI.ISO_8859-15: sv_FI.ISO8859-15
+sv_FI.iso885915@euro: sv_FI.ISO8859-15
sv_FI.ISO-8859-15@euro: sv_FI.ISO8859-15
-+sv_FI.ISO_8859-15@euro: sv_FI.ISO8859-15
sv_FI@euro: sv_FI.ISO8859-15
sv_FI.UTF-8@euro: sv_FI.UTF-8
- sv_FI.utf8: sv_FI.UTF-8
-@@ -1036,49 +1396,85 @@
+@@ -1059,32 +1258,56 @@
sv_SE.ISO-8859-15: sv_SE.ISO8859-15
sv_SE@euro: sv_SE.ISO8859-15
sv_SE.utf8: sv_SE.UTF-8
th_TH: th_TH.ISO8859-11
+th_TH.iso885911: th_TH.ISO8859-11
th_TH.ISO-8859-11: th_TH.ISO8859-11
-+th_TH.ISO_8859-11: th_TH.ISO8859-11
th_TH.tis620: th_TH.TIS620
th_TH.TIS-620: th_TH.TIS620
th_TH.TACTIS: th_TH.TIS620
-tn: tn_ZA.ISO8859-15
-tn_ZA: tn_ZA.ISO8859-15
-tn_ZA.iso8859-15: tn_ZA.ISO8859-15
-+tl_PH.ISO_8859-1: tl_PH.ISO8859-1
+tl_PH.utf8: tl_PH.UTF-8
+tn: tn_ZA.ISO8859-10
+tn_ZA: tn_ZA.ISO8859-10
+tn_ZA.iso885910: tn_ZA.ISO8859-10
+tn_ZA.ISO-8859-10: tn_ZA.ISO8859-10
-+tn_ZA.ISO_8859-10: tn_ZA.ISO8859-10
+tn_ZA.iso885915: tn_ZA.ISO8859-15
+tn_ZA.ISO-8859-15: tn_ZA.ISO8859-15
-+tn_ZA.ISO_8859-15: tn_ZA.ISO8859-15
tn_ZA.utf8: tn_ZA.UTF-8
tr: tr_TR.ISO8859-9
+tr_CY: tr_CY.ISO8859-9
+tr_CY.iso88599: tr_CY.ISO8859-9
+tr_CY.ISO-8859-9: tr_CY.ISO8859-9
-+tr_CY.ISO_8859-9: tr_CY.ISO8859-9
+tr_CY.utf8: tr_CY.UTF-8
tr_TR: tr_TR.ISO8859-9
TR_TR: tr_TR.ISO8859-9
tr_TR.iso88599: tr_TR.ISO8859-9
- tr_TR.ISO-8859-9: tr_TR.ISO8859-9
-+tr_TR.ISO_8859-9: tr_TR.ISO8859-9
- tr_TR.utf8: tr_TR.UTF-8
- TR_TR.utf8: tr_TR.UTF-8
+@@ -1094,14 +1317,18 @@
ts: ts_ZA.ISO8859-1
ts_ZA: ts_ZA.ISO8859-1
ts_ZA.iso88591: ts_ZA.ISO8859-1
+ts_ZA.ISO-8859-1: ts_ZA.ISO8859-1
-+ts_ZA.ISO_8859-1: ts_ZA.ISO8859-1
ts_ZA.utf8: ts_ZA.UTF-8
tt: tt_RU.TATAR-CYR
tt_RU: tt_RU.TATAR-CYR
uk_UA: uk_UA.KOI8-U
uk_UA.iso88595: uk_UA.ISO8859-5
+uk_UA.ISO-8859-5: uk_UA.ISO8859-5
-+uk_UA.ISO_8859-5: uk_UA.ISO8859-5
uk_UA.koi8u: uk_UA.KOI8-U
uk_UA.cp1251: uk_UA.CP1251
uk_UA.microsoftcp1251: uk_UA.CP1251
-@@ -1094,35 +1490,53 @@
+@@ -1117,23 +1344,33 @@
ur_PK.microsoftcp1256: ur_PK.CP1256
ur_PK.microsoft-cp1256: ur_PK.CP1256
ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
uz_UZ: uz_UZ.UTF-8
+uz_UZ.iso88591: uz_UZ.ISO8859-1
uz_UZ.ISO-8859-1: uz_UZ.ISO8859-1
-+uz_UZ.ISO_8859-1: uz_UZ.ISO8859-1
+uz_UZ.utf8: uz_UZ.UTF-8
+uz@Latn: uz_UZ.ISO8859-1
+uz_UZ@Latn: uz_UZ.ISO8859-1
VI_VN.UTF-8: vi_VN.UTF-8
wa: wa_BE.ISO8859-1
wa_BE: wa_BE.ISO8859-1
- wa_BE.iso88591: wa_BE.ISO8859-1
+@@ -1141,11 +1378,14 @@
wa_BE.ISO-8859-1: wa_BE.ISO8859-1
-+wa_BE.ISO_8859-1: wa_BE.ISO8859-1
wa_BE.iso885915: wa_BE.ISO8859-15
wa_BE.ISO-8859-15: wa_BE.ISO8859-15
-+wa_BE.ISO_8859-15: wa_BE.ISO8859-15
+wa_BE.iso885915@euro: wa_BE.ISO8859-15
wa_BE.ISO-8859-15@euro: wa_BE.ISO8859-15
-+wa_BE.ISO_8859-15@euro: wa_BE.ISO8859-15
wa_BE@euro: wa_BE.ISO8859-15
+wa_BE.utf8: wa_BE.UTF-8
xh: xh_ZA.ISO8859-1
xh_ZA: xh_ZA.ISO8859-1
xh_ZA.iso88591: xh_ZA.ISO8859-1
+xh_ZA.ISO-8859-1: xh_ZA.ISO8859-1
-+xh_ZA.ISO_8859-1: xh_ZA.ISO8859-1
xh_ZA.utf8: xh_ZA.UTF-8
yi: yi_US.CP1255
yi_US: yi_US.CP1255
-@@ -1130,6 +1544,7 @@
+@@ -1153,6 +1393,7 @@
yi_US.microsoftcp1255: yi_US.CP1255
yi_US.microsoft-cp1255: yi_US.CP1255
yi_US.MICROSOFT-CP1255: yi_US.CP1255
zh_CN: zh_CN.gb2312
zh_CN.Big5: zh_TW.big5
zh_CN.EUC: zh_CN.eucCN
-@@ -1141,8 +1556,10 @@
- zh_CN.utf8: zh_CN.UTF-8
+@@ -1165,8 +1406,10 @@
ZH_CN.UTF-8: zh_CN.UTF-8
zh_HK: zh_HK.big5hkscs
+ zh_HK.BIG5HK: zh_HK.big5hkscs
+zh_HK.big5-hkscs: zh_HK.big5hkscs
zh_HK.Big5hkscs: zh_HK.big5hkscs
zh_HK.Big5-hkscs: zh_HK.big5hkscs
zh_HK.Big5_hkscs: zh_HK.big5hkscs
zh_HK.Big5HKSCS: zh_HK.big5hkscs
zh_HK.BIG5-HKSCS: zh_HK.big5hkscs
-@@ -1150,6 +1567,10 @@
+@@ -1174,6 +1417,10 @@
zh_HK.Big5: zh_HK.big5
zh_HK.utf8: zh_HK.UTF-8
ZH_HK.UTF-8: zh_HK.UTF-8
ZH_SG.UTF-8: zh_SG.UTF-8
zh_TW: zh_TW.big5
zh_TW.Big5: zh_TW.big5
-@@ -1159,9 +1580,11 @@
+@@ -1183,9 +1430,11 @@
zh_TW.EUC-TW: zh_TW.eucTW
zh_TW.utf8: zh_TW.UTF-8
ZH_TW.UTF-8: zh_TW.UTF-8
zu_ZA.utf8: zu_ZA.UTF-8
XCOMM The following locale names are used in SCO 3.0
---- libX11-1.1.4/nls/locale.dir.pre.orig 2008-03-06 21:45:06.000000000 +0100
-+++ libX11-1.1.4/nls/locale.dir.pre 2008-03-07 23:25:54.322403116 +0100
+--- libX11-1.3/nls/locale.dir.pre.orig 2009-09-03 03:12:28.000000000 +0200
++++ libX11-1.3/nls/locale.dir.pre 2009-10-04 10:47:01.688606747 +0200
@@ -9,8 +9,11 @@
XCOMM
armscii-8/XLC_LOCALE: hy_AM.ARMSCII-8
iso8859-1/XLC_LOCALE: id_ID.ISO8859-1
iso8859-1/XLC_LOCALE: is_IS.ISO8859-1
-@@ -160,62 +165,71 @@
+@@ -160,60 +165,66 @@
ja.JIS/XLC_LOCALE: ja_JP.JIS7
georgian-academy/XLC_LOCALE: ka_GE.GEORGIAN-ACADEMY
georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS
-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_YU.ISO8859-2
+-iso8859-5/XLC_LOCALE: sr_YU.ISO8859-5
+-microsoft-cp1251/XLC_LOCALE: sr_YU.CP1251
+iso8859-16/XLC_LOCALE: sl_SI.ISO8859-16
-+iso8859-16/XLC_LOCALE: sl_SI.ISO8859-16
+iso8859-1/XLC_LOCALE: so_DJ.ISO8859-1
+iso8859-1/XLC_LOCALE: so_KE.ISO8859-1
+iso8859-1/XLC_LOCALE: so_SO.ISO8859-1
+iso8859-1/XLC_LOCALE: sq_AL.ISO8859-1
- 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
-+microsoft-cp1251/XLC_LOCALE: sr_CS.CP1251
-+iso8859-5/XLC_LOCALE: sr_ME.ISO8859-5
iso8859-1/XLC_LOCALE: ss_ZA.ISO8859-1
iso8859-1/XLC_LOCALE: st_ZA.ISO8859-1
iso8859-1/XLC_LOCALE: sv_FI.ISO8859-1
-@@ -223,19 +237,22 @@
+@@ -221,19 +232,22 @@
iso8859-1/XLC_LOCALE: sv_SE.ISO8859-1
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
vi_VN.tcvn/XLC_LOCALE: vi_VN.TCVN
vi_VN.viscii/XLC_LOCALE: vi_VN.VISCII
iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1
-@@ -247,21 +264,23 @@
+@@ -245,16 +259,17 @@
zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030
zh_HK.big5/XLC_LOCALE: zh_HK.big5
en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_AE.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_BH.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_DZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_EG.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ar_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
-@@ -278,19 +297,20 @@
+@@ -277,20 +292,20 @@
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
en_US.UTF-8/XLC_LOCALE: as_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: bo_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
-+en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
+en_US.UTF-8/XLC_LOCALE: byn_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8
en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8
en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8
-@@ -298,19 +318,26 @@
- en_US.UTF-8/XLC_LOCALE: de_DE.UTF-8
- en_US.UTF-8/XLC_LOCALE: de_LI.UTF-8
- en_US.UTF-8/XLC_LOCALE: de_LU.UTF-8
-+en_US.UTF-8/XLC_LOCALE: el_CY.UTF-8
+@@ -302,17 +317,23 @@
en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8
en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8
en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: en_IE.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: en_JM.UTF-8
+ en_US.UTF-8/XLC_LOCALE: en_MT.UTF-8
en_US.UTF-8/XLC_LOCALE: en_NZ.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_PH.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_SG.UTF-8
en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8
en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8
-@@ -330,12 +357,14 @@
- en_US.UTF-8/XLC_LOCALE: es_PR.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_PY.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_SV.UTF-8
-+en_US.UTF-8/XLC_LOCALE: es_US.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_UY.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_VE.UTF-8
- en_US.UTF-8/XLC_LOCALE: et_EE.UTF-8
+@@ -339,6 +360,7 @@
en_US.UTF-8/XLC_LOCALE: eu_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
en_US.UTF-8/XLC_LOCALE: fr_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: fr_CA.UTF-8
-@@ -344,12 +373,14 @@
+@@ -347,6 +369,7 @@
en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
- en_US.UTF-8/XLC_LOCALE: he_IL.UTF-8
+@@ -354,6 +377,7 @@
en_US.UTF-8/XLC_LOCALE: hi_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: hne_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: hr_HR.UTF-8
+en_US.UTF-8/XLC_LOCALE: hsb_DE.UTF-8
en_US.UTF-8/XLC_LOCALE: hu_HU.UTF-8
en_US.UTF-8/XLC_LOCALE: hy_AM.UTF-8
en_US.UTF-8/XLC_LOCALE: id_ID.UTF-8
-@@ -359,35 +390,42 @@
- en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
- ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8
- en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: kk_KZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8
- en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
+@@ -369,8 +393,12 @@
+ en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ks_IN@devanagari.UTF-8
ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
+en_US.UTF-8/XLC_LOCALE: ku_TR.UTF-8
en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: lo_LA.UTF-8
en_US.UTF-8/XLC_LOCALE: lt_LT.UTF-8
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
+@@ -378,26 +406,27 @@
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: mn_MN.UTF-8
en_US.UTF-8/XLC_LOCALE: mr_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ms_MY.UTF-8
-+en_US.UTF-8/XLC_LOCALE: mt_MT.UTF-8
-+en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
+ en_US.UTF-8/XLC_LOCALE: mt_MT.UTF-8
+en_US.UTF-8/XLC_LOCALE: nds_DE.UTF-8
en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: nl_NL.UTF-8
--en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
+ en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8
-en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: nr_ZA.UTF-8
+en_US.UTF-8/XLC_LOCALE: om_KE.UTF-8
en_US.UTF-8/XLC_LOCALE: or_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: pa_PK.UTF-8
+en_US.UTF-8/XLC_LOCALE: pap_AN.UTF-8
en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
-@@ -395,13 +433,17 @@
- en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
- en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
+@@ -409,15 +438,18 @@
+ en_US.UTF-8/XLC_LOCALE: sd_IN@devanagari.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
+ en_US.UTF-8/XLC_LOCALE: sh_BA.UTF-8
-en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8
+en_US.UTF-8/XLC_LOCALE: sid_ET.UTF-8
+en_US.UTF-8/XLC_LOCALE: so_SO.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: sr_ME.UTF-8
en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
-@@ -412,8 +454,11 @@
+@@ -428,8 +460,11 @@
th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8