+}
+
+END XLC_XLOCALE
---- libX11-1.0.2/nls/Makefile.am.orig 2006-06-22 23:22:22.000000000 +0200
-+++ libX11-1.0.2/nls/Makefile.am 2006-06-29 18:15:09.024601750 +0200
-@@ -26,6 +26,7 @@
- iso8859-13 \
- iso8859-14 \
- iso8859-15 \
-+ iso8859-16 \
- iso8859-2 \
- iso8859-3 \
- iso8859-4 \
-@@ -44,6 +45,7 @@
- ko \
- koi8-c \
- koi8-r \
-+ koi8-t \
- koi8-u \
- ko_KR.UTF-8 \
- microsoft-cp1251 \
---- 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 $
+--- libX11-1.6.4/configure.ac.orig 2016-10-05 05:41:51.461791657 +0200
++++ libX11-1.6.4/configure.ac 2016-10-05 16:19:07.591355076 +0200
+@@ -359,10 +359,10 @@
+ am_ET.UTF-8 armscii-8 C cs_CZ.UTF-8 el_GR.UTF-8 en_US.UTF-8 \
+ fi_FI.UTF-8 georgian-academy georgian-ps ibm-cp1133 iscii-dev \
+ isiri-3342 iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 \
+- iso8859-15 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 \
++ iso8859-15 iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 \
+ iso8859-7 iso8859-8 iso8859-9 iso8859-9e ja ja.JIS \
+ ja_JP.UTF-8 ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r \
+- koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
++ koi8-t koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
+ microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 pt_PT.UTF-8 \
+ ru_RU.UTF-8 sr_RS.UTF-8 tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
+ vi_VN.tcvn vi_VN.viscii zh_CN zh_CN.gb18030 \
+--- libX11-1.7.4/nls/compose.dir.pre.orig 2022-03-30 22:55:23.000000000 +0200
++++ libX11-1.7.4/nls/compose.dir.pre 2022-03-31 19:41:05.259859016 +0200
+@@ -5,7 +5,9 @@ XCOMM and the second word is the full lo
+ XCOMM
XCOMM
iso8859-1/Compose: C
+iso8859-1/Compose: aa_DJ.ISO8859-1
iso8859-1/Compose: af_ZA.ISO8859-1
+iso8859-15/Compose: an_ES.ISO8859-15
iso8859-6/Compose: ar_AA.ISO8859-6
-+iso8859-6/Compose: ar_AE.ISO8859-6
+ iso8859-6/Compose: ar_AE.ISO8859-6
iso8859-6/Compose: ar_BH.ISO8859-6
- iso8859-6/Compose: ar_DZ.ISO8859-6
- iso8859-6/Compose: ar_EG.ISO8859-6
-@@ -21,13 +24,15 @@
- iso8859-6/Compose: ar_OM.ISO8859-6
- iso8859-6/Compose: ar_QA.ISO8859-6
- iso8859-6/Compose: ar_SA.ISO8859-6
-+iso8859-6/Compose: ar_SD.ISO8859-6
-+iso8859-6/Compose: ar_SY.ISO8859-6
+@@ -25,7 +27,7 @@ iso8859-6/Compose: ar_SY.ISO8859-6
iso8859-6/Compose: ar_TN.ISO8859-6
iso8859-6/Compose: ar_YE.ISO8859-6
iso8859-9e/Compose: az_AZ.ISO8859-9E
--koi8-c/Compose: a3_AZ.KOI8-C
--microsoft-cp1251/Compose: be_BY.CP1251
+-koi8-c/Compose: az_AZ.KOI8-C
+koi8-c/Compose: az_AZ.KOI8-K
-+XCOMM microsoft-cp1251/Compose: be_BY.CP1251
+ microsoft-cp1251/Compose: be_BY.CP1251
+ iso8859-5/Compose: be_BY.ISO8859-5
iso8859-5/Compose: bg_BG.ISO8859-5
--microsoft-cp1251/Compose: bg_BG.CP1251
-+XCOMM microsoft-cp1251/Compose: bg_BG.CP1251
- iso8859-1/Compose: br_FR.ISO8859-1
- iso8859-14/Compose: br_FR.ISO8859-14
- iso8859-15/Compose: br_FR.ISO8859-15
-@@ -48,6 +53,8 @@
- iso8859-15/Compose: da_DK.ISO8859-15
- iso8859-1/Compose: de_AT.ISO8859-1
- iso8859-15/Compose: de_AT.ISO8859-15
-+iso8859-1/Compose: de_BE.ISO8859-1
-+iso8859-15/Compose: de_BE.ISO8859-15
- iso8859-1/Compose: de_CH.ISO8859-1
- iso8859-15/Compose: de_CH.ISO8859-15
- iso8859-1/Compose: de_DE.ISO8859-1
-@@ -56,23 +63,30 @@
- iso8859-15/Compose: de_LI.ISO8859-15
+@@ -62,6 +64,7 @@ iso8859-15/Compose: de_LI.ISO8859-15
iso8859-1/Compose: de_LU.ISO8859-1
iso8859-15/Compose: de_LU.ISO8859-15
+ iso8859-4/Compose: ee_EE.ISO8859-4
+iso8859-7/Compose: el_CY.ISO8859-7
iso8859-7/Compose: el_GR.ISO8859-7
+ iso8859-15/Compose: el_GR.ISO8859-15
iso8859-1/Compose: en_AU.ISO8859-1
-+iso8859-1/Compose: en_BE.ISO8859-1
-+iso8859-15/Compose: en_BE.ISO8859-15
-+iso8859-1/Compose: en_BW.ISO8859-1
+@@ -70,7 +73,7 @@ iso8859-15/Compose: en_BE.ISO8859-15
+ iso8859-1/Compose: en_BW.ISO8859-1
iso8859-1/Compose: en_BZ.ISO8859-1
iso8859-1/Compose: en_CA.ISO8859-1
+-iso8859-1/Compose: en_EN.ISO8859-1
+iso8859-1/Compose: en_DK.ISO8859-1
iso8859-1/Compose: en_GB.ISO8859-1
iso8859-15/Compose: en_GB.ISO8859-15
-+iso8859-1/Compose: en_HK.ISO8859-1
- iso8859-1/Compose: en_IE.ISO8859-1
- iso8859-15/Compose: en_IE.ISO8859-15
- iso8859-1/Compose: en_JM.ISO8859-1
- iso8859-1/Compose: en_NZ.ISO8859-1
-+iso8859-1/Compose: en_PH.ISO8859-1
-+iso8859-1/Compose: en_SG.ISO8859-1
+ iso8859-1/Compose: en_HK.ISO8859-1
+@@ -83,8 +86,6 @@ iso8859-1/Compose: en_NZ.ISO8859-1
+ iso8859-1/Compose: en_PH.ISO8859-1
+ iso8859-1/Compose: en_SG.ISO8859-1
iso8859-1/Compose: en_TT.ISO8859-1
-iso8859-1/Compose: en_UK.ISO8859-1
-iso8859-15/Compose: en_UK.ISO8859-15
iso8859-1/Compose: en_US.ISO8859-1
iso8859-15/Compose: en_US.ISO8859-15
iso8859-1/Compose: en_ZA.ISO8859-1
- iso8859-15/Compose: en_ZA.ISO8859-15
-+iso8859-1/Compose: en_ZW.ISO8859-1
- iso8859-3/Compose: eo_XX.ISO8859-3
- iso8859-1/Compose: es_AR.ISO8859-1
- iso8859-1/Compose: es_BO.ISO8859-1
-@@ -92,6 +106,7 @@
- iso8859-1/Compose: es_PR.ISO8859-1
- iso8859-1/Compose: es_PY.ISO8859-1
- iso8859-1/Compose: es_SV.ISO8859-1
-+iso8859-1/Compose: es_US.ISO8859-1
- iso8859-1/Compose: es_UY.ISO8859-1
- iso8859-1/Compose: es_VE.ISO8859-1
- iso8859-1/Compose: et_EE.ISO8859-1
-@@ -103,6 +118,7 @@
+@@ -128,6 +129,7 @@ iso8859-15/Compose: eu_ES.ISO8859-15
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
iso8859-1/Compose: fo_FO.ISO8859-1
iso8859-15/Compose: fo_FO.ISO8859-15
iso8859-1/Compose: fr_BE.ISO8859-1
-@@ -127,9 +143,10 @@
+@@ -152,9 +154,10 @@ iso8859-1/Compose: gv_GB.ISO8859-1
iso8859-14/Compose: gv_GB.ISO8859-14
iso8859-15/Compose: gv_GB.ISO8859-15
iso8859-8/Compose: he_IL.ISO8859-8
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
-@@ -145,12 +162,18 @@
+@@ -170,12 +173,18 @@ ja.SJIS/Compose: ja_JP.SJIS
ja.JIS/Compose: ja_JP.JIS7
georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
+XCOMM pt-154/Compose: kk_KZ.PT154
iso8859-1/Compose: kl_GL.ISO8859-1
iso8859-15/Compose: kl_GL.ISO8859-15
-+ko/Compose: ko_KR.eucKR
+ ko/Compose: ko_KR.eucKR
iso8859-1/Compose: kw_GB.ISO8859-1
iso8859-14/Compose: kw_GB.ISO8859-14
iso8859-15/Compose: kw_GB.ISO8859-15
--ko/Compose: ko_KR.eucKR
+iso8859-10/Compose: lg_UG.ISO8859-10
+iso8859-1/Compose: li_BE.ISO8859-1
+iso8859-15/Compose: li_BE.ISO8859-15
+iso8859-15/Compose: li_NL.ISO8859-15
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
- iso8859-1/Compose: lt_LN.ISO8859-1
-@@ -158,52 +181,57 @@
- iso8859-13/Compose: lt_LT.ISO8859-13
- iso8859-4/Compose: lv_LV.ISO8859-4
+ iso8859-4/Compose: lt_LT.ISO8859-4
+@@ -184,11 +193,13 @@ iso8859-4/Compose: lv_LV.ISO8859-4
iso8859-13/Compose: lv_LV.ISO8859-13
--iso8859-13/Compose: mi_NZ.ISO8859-13
-+iso8859-1/Compose: mi_NZ.ISO8859-1
+ iso8859-13/Compose: mi_NZ.ISO8859-13
iso8859-5/Compose: mk_MK.ISO8859-5
- XCOMM mk_MK.UTF-8/Compose: mk_MK.UTF-8
-microsoft-cp1251/Compose: mk_MK.CP1251
+XCOMM microsoft-cp1251/Compose: mk_MK.CP1251
iso8859-1/Compose: ms_MY.ISO8859-1
iso8859-3/Compose: mt_MT.ISO8859-3
- 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: 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
+@@ -196,30 +207,41 @@ iso8859-15/Compose: nl_NL.ISO8859-15
iso8859-1/Compose: nn_NO.ISO8859-1
iso8859-15/Compose: nn_NO.ISO8859-15
iso8859-1/Compose: nr_ZA.ISO8859-1
-iso8859-15/Compose: nso_ZA.ISO8859-15
--iso8859-1/Compose: ny_NO.ISO8859-1
--iso8859-15/Compose: ny_NO.ISO8859-15
+iso8859-10/Compose: nso_ZA.ISO8859-10
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
+iso8859-1/Compose: pap_AN.ISO8859-1
+iso8859-15/Compose: pap_AN.ISO8859-15
iso8859-1/Compose: pd_DE.ISO8859-1
+ iso8859-15/Compose: pd_DE.ISO8859-15
iso8859-1/Compose: pd_US.ISO8859-1
+ iso8859-15/Compose: pd_US.ISO8859-15
-iso8859-1/Compose: ph_PH.ISO8859-1
iso8859-2/Compose: pl_PL.ISO8859-2
-iso8859-1/Compose: pp_AN.ISO8859-1
koi8-r/Compose: ru_RU.KOI8-R
iso8859-5/Compose: ru_RU.ISO8859-5
-microsoft-cp1251/Compose: ru_RU.CP1251
+-microsoft-cp1251/Compose: ru_UA.CP1251
+XCOMM microsoft-cp1251/Compose: ru_RU.CP1251
- koi8-u/Compose: ru_UA.KOI8-U
+XCOMM microsoft-cp1251/Compose: ru_UA.CP1251
+ koi8-u/Compose: ru_UA.KOI8-U
iso8859-1/Compose: rw_RW.ISO8859-1
--iso8859-2/Compose: sh_YU.ISO8859-2
iso8859-2/Compose: sk_SK.ISO8859-2
- iso8859-2/Compose: sl_CS.ISO8859-2
iso8859-2/Compose: sl_SI.ISO8859-2
+iso8859-16/Compose: sl_SI.ISO8859-16
+iso8859-1/Compose: so_DJ.ISO8859-1
+iso8859-1/Compose: so_KE.ISO8859-1
+iso8859-1/Compose: so_SO.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_YU.ISO8859-2
--iso8859-5/Compose: sr_YU.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: sr_CS.CP1251
+iso8859-5/Compose: sr_ME.ISO8859-5
++iso8859-16/Compose: sr_ME.ISO8859-16
++iso8859-2/Compose: sr_RS.ISO8859-2
++iso8859-5/Compose: sr_RS.ISO8859-5
iso8859-1/Compose: ss_ZA.ISO8859-1
iso8859-1/Compose: st_ZA.ISO8859-1
iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -211,36 +239,47 @@
+@@ -227,16 +249,18 @@ iso8859-15/Compose: sv_FI.ISO8859-15
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
++koi8-t/Compose: tg_TJ.KOI8-T
+ iso8859-11/Compose: th_TH.ISO8859-11
+ th_TH/Compose: th_TH.TIS620
iso8859-1/Compose: tl_PH.ISO8859-1
-iso8859-15/Compose: tn_ZA.ISO8859-15
+iso8859-10/Compose: tn_ZA.ISO8859-10
+iso8859-9/Compose: tr_CY.ISO8859-9
iso8859-9/Compose: tr_TR.ISO8859-9
iso8859-1/Compose: ts_ZA.ISO8859-1
- tatar-cyr/Compose: tt_RU.TATAR-CYR
-koi8-c/Compose: tt_RU.KOI8-C
+koi8-c/Compose: tt_RU.KOI8-K
- koi8-u/Compose: uk_UA.KOI8-U
--microsoft-cp1256/Compose: ur_PK.CP1256
-+iso8859-5/Compose: uk_UA.ISO8859-5
+ tatar-cyr/Compose: tt_RU.TATAR-CYR
+-microsoft-cp1251/Compose: uk_UA.CP1251
+XCOMM microsoft-cp1251/Compose: uk_UA.CP1251
-+XCOMM microsoft-cp1256/Compose: ur_PK.CP1256
-+iso8859-1/Compose: uz_UZ.ISO8859-1
- vi_VN.viscii/Compose: vi_VN.VISCII
- vi_VN.tcvn/Compose: vi_VN.TCVN
- iso8859-1/Compose: wa_BE.ISO8859-1
- iso8859-1/Compose: xh_ZA.ISO8859-1
- 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
--zh_CN.gb18030/Compose: zh_CN.GB18030
-+zh_CN/Compose: zh_CN.gb2312
-+zh_CN.gbk/Compose: zh_CN.gbk
-+zh_CN.gb18030/Compose: zh_CN.gb18030
-+zh_CN/Compose: zh_SG.gb2312
- zh_HK.big5/Compose: zh_HK.big5
- zh_HK.big5/Compose: zh_HK.Big5
- zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
- zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
- zh_TW.big5/Compose: zh_TW.big5
--zh_TW.big5/Compose: zh_TW.Big5
- zh_TW/Compose: zh_TW.eucTW
- iso8859-1/Compose: zu_ZA.ISO8859-1
+ koi8-u/Compose: uk_UA.KOI8-U
+ iso8859-5/Compose: uk_UA.ISO8859-5
+ microsoft-cp1256/Compose: ur_PK.CP1256
+@@ -259,8 +283,12 @@ iso8859-1/Compose: zu_ZA.ISO8859-1
XCOMM
XCOMM
+ en_US.UTF-8/Compose: C.UTF-8
+en_US.UTF-8/Compose: aa_DJ.UTF-8
+en_US.UTF-8/Compose: aa_ER.UTF-8
+en_US.UTF-8/Compose: aa_ET.UTF-8
en_US.UTF-8/Compose: af_ZA.UTF-8
-+en_US.UTF-8/Compose: am_ET.UTF-8
+ am_ET.UTF-8/Compose: am_ET.UTF-8
+en_US.UTF-8/Compose: an_ES.UTF-8
en_US.UTF-8/Compose: ar_AA.UTF-8
-+en_US.UTF-8/Compose: ar_AE.UTF-8
+ en_US.UTF-8/Compose: ar_AE.UTF-8
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
-@@ -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_SD.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
+@@ -290,11 +318,13 @@ en_US.UTF-8/Compose: bn_IN.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: bg_BG.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: ca_FR.UTF-8
en_US.UTF-8/Compose: ca_IT.UTF-8
- en_US.UTF-8/Compose: cs_CZ.UTF-8
+ cs_CZ.UTF-8/Compose: cs_CZ.UTF-8
+en_US.UTF-8/Compose: csb_PL.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
--en_US.UTF-8/Compose: cz_CZ.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
-@@ -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_BW.UTF-8
+@@ -312,7 +342,6 @@ en_US.UTF-8/Compose: en_BW.UTF-8
en_US.UTF-8/Compose: en_BZ.UTF-8
en_US.UTF-8/Compose: en_CA.UTF-8
-+en_US.UTF-8/Compose: en_DK.UTF-8
+ en_US.UTF-8/Compose: en_DK.UTF-8
+-en_US.UTF-8/Compose: en_EN.UTF-8
en_US.UTF-8/Compose: en_GB.UTF-8
-+en_US.UTF-8/Compose: en_HK.UTF-8
+ en_US.UTF-8/Compose: en_HK.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
+@@ -324,7 +353,6 @@ 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: en_TT.UTF-8
-en_US.UTF-8/Compose: en_UK.UTF-8
en_US.UTF-8/Compose: en_US.UTF-8
en_US.UTF-8/Compose: en_ZA.UTF-8
-+en_US.UTF-8/Compose: en_ZW.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
-@@ -325,6 +374,7 @@
+ en_US.UTF-8/Compose: en_ZW.UTF-8
+@@ -363,6 +391,7 @@ en_US.UTF-8/Compose: fr_FR.UTF-8
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
-@@ -332,6 +382,7 @@
+@@ -370,6 +399,7 @@ en_US.UTF-8/Compose: he_IL.UTF-8
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: hu_HU.UTF-8
en_US.UTF-8/Compose: hy_AM.UTF-8
en_US.UTF-8/Compose: id_ID.UTF-8
-@@ -349,6 +400,9 @@
- en_US.UTF-8/Compose: ks_IN@devanagari.UTF-8
+@@ -389,6 +419,9 @@ en_US.UTF-8/Compose: ks_IN.UTF-8@devana
+ en_US.UTF-8/Compose: ku_TR.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 @@
+@@ -396,10 +429,12 @@ en_US.UTF-8/Compose: mai_IN.UTF-8
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: 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: 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
+@@ -407,14 +442,15 @@ en_US.UTF-8/Compose: nn_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: 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: pl_PL.UTF-8
-en_US.UTF-8/Compose: pp_AN.UTF-8
pt_BR.UTF-8/Compose: pt_BR.UTF-8
- en_US.UTF-8/Compose: pt_PT.UTF-8
+ pt_PT.UTF-8/Compose: pt_PT.UTF-8
en_US.UTF-8/Compose: ro_RO.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
+@@ -427,8 +463,13 @@ en_US.UTF-8/Compose: sd_IN.UTF-8@devana
+ 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: so_KE.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: ss_ZA.UTF-8
- en_US.UTF-8/Compose: st_ZA.UTF-8
- en_US.UTF-8/Compose: sv_FI.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: ti_ET.UTF-8
+ sr_RS.UTF-8/Compose: sr_ME.UTF-8
+ sr_RS.UTF-8/Compose: sr_RS.UTF-8
+@@ -442,8 +483,11 @@ en_US.UTF-8/Compose: tg_TJ.UTF-8
+ th_TH.UTF-8/Compose: th_TH.UTF-8
+ en_US.UTF-8/Compose: ti_ER.UTF-8
+ en_US.UTF-8/Compose: ti_ET.UTF-8
+en_US.UTF-8/Compose: tig_ER.UTF-8
+en_US.UTF-8/Compose: tk_TM.UTF-8
en_US.UTF-8/Compose: tl_PH.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
-@@ -417,6 +483,5 @@
- en_US.UTF-8/Compose: xh_ZA.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
- 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
+--- libX11-1.7.4/nls/locale.alias.pre.orig 2022-03-30 22:55:23.000000000 +0200
++++ libX11-1.7.4/nls/locale.alias.pre 2022-03-31 20:08:30.464279512 +0200
+@@ -18,11 +18,21 @@ English_United-States.437: C
+ C.UTF-8: en_US.UTF-8
+ C.utf8: en_US.UTF-8
+ XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
+-a3: az_AZ.KOI8-C
+-a3_AZ: az_AZ.KOI8-C
+-a3_AZ.koi8c: az_AZ.KOI8-C
+-a3_AZ.KOI-C: az_AZ.KOI8-C
++a3: az_AZ.KOI8-K
++a3_AZ: az_AZ.KOI8-K
++a3_AZ.koi8c: az_AZ.KOI8-K
++a3_AZ.KOI-C: az_AZ.KOI8-K
+ a3_AZ.UTF-8: az_AZ.UTF-8
+aa_DJ: aa_DJ.ISO8859-1
+aa_DJ.iso88591: aa_DJ.ISO8859-1
+aa_DJ.ISO-8859-1: aa_DJ.ISO8859-1
+aa_ER.utf8@saaho: aa_ER.UTF-8
+aa_ET: aa_ET.UTF-8
+aa_ET.utf8: aa_ET.UTF-8
- XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
--a3: a3_AZ.KOI8-C
--a3_AZ: a3_AZ.KOI8-C
--a3_AZ.koi8c: a3_AZ.KOI8-C
-+a3: a3_AZ.KOI8-K
-+a3_AZ: a3_AZ.KOI8-K
-+a3_AZ.koi8c: a3_AZ.KOI8-K
af: af_ZA.ISO8859-1
af_ZA: af_ZA.ISO8859-1
af_ZA.iso88591: af_ZA.ISO8859-1
- af_ZA.ISO-8859-1: af_ZA.ISO8859-1
--af_ZA.utf8: af_ZA.UTF-8
+@@ -30,6 +40,11 @@ af_ZA.ISO-8859-1: af_ZA.ISO8859-1
+ af_ZA.utf8: af_ZA.UTF-8
am: am_ET.UTF-8
am_ET: am_ET.UTF-8
+am_ET.utf8: am_ET.UTF-8
+an_ES.utf8: an_ES.UTF-8
ar: ar_AA.ISO8859-6
ar_AA: ar_AA.ISO8859-6
- AR_AA: ar_AA.ISO8859-6
-@@ -51,8 +65,8 @@
- ar_EG.iso88596: 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.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
-@@ -103,14 +117,18 @@
- ar_TN.utf8: ar_TN.UTF-8
+ ar_AA.iso88596: ar_AA.ISO8859-6
+@@ -107,9 +122,14 @@ ar_YE.utf8: ar_YE.UTF-8
as: as_IN.UTF-8
+ as_IN: 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.utf8: ar_YE.UTF-8
-az: az_AZ.ISO8859-9E
-az_AZ: az_AZ.ISO8859-9E
+az: az_AZ.UTF-8
be: be_BY.CP1251
be@latin: be_BY.UTF-8@latin
be_BY: be_BY.CP1251
-@@ -127,14 +145,14 @@
+@@ -126,10 +146,11 @@ bg_BG.cp1251: bg_BG.CP1251
bg_BG.microsoftcp1251: bg_BG.CP1251
bg_BG.microsoft-cp1251: bg_BG.CP1251
bg_BG.MICROSOFT-CP1251: bg_BG.CP1251
-bg_BG.iso88595: bg_BG.ISO8859-5
-bg_BG.ISO-8859-5: bg_BG.ISO8859-5
bg_BG.koi8r: bg_BG.KOI8-R
- be_BG.utf8: bg_BG.UTF-8
+ bg_BG.utf8: bg_BG.UTF-8
+bn: bn_BD.UTF-8
+bn_BD: bn_BD.UTF-8
+bn_BD.utf8: bn_BD.UTF-8
-+bn_IN: bn_IN.UTF-8
+ 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
-@@ -142,9 +160,12 @@
+ bo_IN: bo_IN.UTF-8
+@@ -141,9 +162,12 @@ br_FR.ISO-8859-1: br_FR.ISO8859-1
br_FR.iso885914: br_FR.ISO8859-14
br_FR.ISO-8859-14: br_FR.ISO8859-14
br_FR.iso885915: br_FR.ISO8859-15
br_FR.UTF-8@euro: br_FR.UTF-8
bs: bs_BA.ISO8859-2
bs_BA: bs_BA.ISO8859-2
-@@ -166,10 +187,11 @@
+@@ -165,10 +189,11 @@ ca_ES@euro: ca_ES.ISO8859-15
ca_ES.iso88591: ca_ES.ISO8859-1
ca_ES.ISO-8859-1: ca_ES.ISO8859-1
ca_ES.iso885915: ca_ES.ISO8859-15
ca_FR: ca_FR.ISO8859-1
ca_FR@euro: ca_FR.ISO8859-15
ca_FR.iso88591: ca_FR.ISO8859-1
-@@ -197,19 +219,23 @@
+@@ -196,14 +221,18 @@ cs_CS.iso8859-2: cs_CZ.ISO8859-2
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
--XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
--cz: cs_CZ.ISO8859-2
--cz_CZ: cs_CZ.ISO8859-2
--cz_CZ.utf8: cs_CZ.UTF-8
--cz_CZ.UTF-8: cs_CZ.UTF-8
-cy: cy_GB.ISO8859-1
-cy_GB: cy_GB.ISO8859-1
+csb: csb_PL.UTF-8
cy_GB.iso885915: 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: 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
-@@ -233,18 +259,22 @@
+@@ -225,18 +254,22 @@ de_AT.ISO-8859-1: de_AT.ISO8859-1
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_BE.UTF-8@euro: de_BE.UTF-8
de_CH: de_CH.ISO8859-1
de_CH.iso88591: de_CH.ISO8859-1
-@@ -266,6 +296,7 @@
+@@ -258,6 +291,7 @@ de_DE.ISO-8859-15: de_DE.ISO8859-15
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.ISO-8859-15@euro: de_DE.ISO8859-15
de_DE.UTF-8@euro: de_DE.UTF-8
de_DE.utf8: de_DE.UTF-8
-@@ -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
+@@ -279,17 +313,24 @@ de_LU.ISO-8859-1: de_LU.ISO8859-1
de_LU.iso885915: de_LU.ISO8859-15
de_LU.ISO_8859-15: de_LU.ISO8859-15
de_LU.ISO-8859-15: de_LU.ISO8859-15
--de_LU.ISO-8859-15@euro: de_LU.ISO8859-15
++de_LU.iso885915@euro: de_LU.ISO8859-15
+ de_LU.ISO-8859-15@euro: de_LU.ISO8859-15
de_LU.UTF-8@euro: de_LU.UTF-8
de_LU.utf8: de_LU.UTF-8
- GER_DE.8859: de_DE.ISO8859-1
- GER_DE.8859.in: de_DE.ISO8859-1
-ee: ee_EE.ISO8859-4
-ee_EE: ee_EE.ISO8859-4
-ee_EE.iso88594: ee_EE.ISO8859-4
el_GR.utf8: el_GR.UTF-8
en: en_US.ISO8859-1
en.ISO-8859-1: en_US.ISO8859-1
-@@ -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.utf8: en_BW.UTF-8
- en_CA: en_CA.ISO8859-1
- en_CA.iso88591: en_CA.ISO8859-1
+@@ -310,7 +351,10 @@ en_CA.iso88591: en_CA.ISO8859-1
en_CA.ISO-8859-1: en_CA.ISO8859-1
en_CA.ISO_8859-1: en_CA.ISO8859-1
en_CA.utf8: en_CA.UTF-8
+-en_DL.utf8: en_DL.UTF-8
+en_DK: en_DK.ISO8859-1
+en_DK.iso88591: en_DK.ISO8859-1
+en_DK.ISO-8859-1: en_DK.ISO8859-1
en_GB: en_GB.ISO8859-1
en_GB.88591: en_GB.ISO8859-1
en_GB.88591.en: en_GB.ISO8859-1
-@@ -319,21 +362,26 @@
+@@ -321,6 +365,8 @@ en_GB.iso885915: en_GB.ISO8859-15
en_GB.ISO-8859-15: en_GB.ISO8859-15
en_GB.utf8: en_GB.UTF-8
en_UK: en_GB.ISO8859-1
+en_UK.ISO8859-1: en_GB.ISO8859-1
+en_UK.UTF-8: en_GB.UTF-8
- ENG_GB.8859: en_GB.ISO8859-1
- ENG_GB.8859.in: 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.utf8: en_HK.UTF-8
- en_IE: en_IE.ISO8859-1
- en_IE.iso88591: en_IE.ISO8859-1
+@@ -330,6 +376,7 @@ en_IE.iso88591: 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@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_IN: en_IN.ISO8859-1
-+en_IN.utf8: en_IN.UTF-8
- en_NZ: en_NZ.ISO8859-1
- en_NZ.iso88591: en_NZ.ISO8859-1
- en_NZ.ISO-8859-1: en_NZ.ISO8859-1
-@@ -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.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.utf8: en_SG.UTF-8
- en_US: en_US.ISO8859-1
- EN_US: en_US.ISO8859-1
- en_US.88591: en_US.ISO8859-1
-@@ -369,11 +419,12 @@
- en_ZW: en_ZW.ISO8859-1
- en_ZW.iso88591: en_ZW.ISO8859-1
+@@ -376,6 +423,8 @@ en_ZW.iso88591: 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.iso88593: 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
-@@ -411,6 +462,7 @@
+@@ -417,6 +466,7 @@ es_ES.iso88591: es_ES.ISO8859-1
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.ISO-8859-15: es_ES.ISO8859-15
es_ES.ISO-8859-15@euro: es_ES.ISO8859-15
es_ES@euro: es_ES.ISO8859-15
-@@ -435,12 +487,10 @@
+@@ -441,12 +491,10 @@ es_NI.utf8: es_NI.UTF-8
es_PA: es_PA.ISO8859-1
es_PA.iso88591: es_PA.ISO8859-1
es_PA.ISO-8859-1: es_PA.ISO8859-1
es_PE.utf8: es_PE.UTF-8
es_PR: es_PR.ISO8859-1
es_PR.iso88591: es_PR.ISO8859-1
-@@ -449,25 +499,26 @@
+@@ -455,25 +503,26 @@ es_PR.utf8: es_PR.UTF-8
es_PY: es_PY.ISO8859-1
es_PY.iso88591: es_PY.ISO8859-1
es_PY.ISO-8859-1: es_PY.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,8 +526,9 @@
+@@ -481,8 +530,9 @@ XCOMM language; however this is clearly
#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.iso88591: et_EE.ISO8859-1
et_EE.ISO-8859-1: et_EE.ISO8859-1
et_EE.iso88594: et_EE.ISO8859-4
-@@ -495,24 +547,31 @@
+@@ -501,24 +551,31 @@ eu_ES.ISO-8859-15: 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
fo: fo_FO.ISO8859-1
fo_FO: fo_FO.ISO8859-1
fo_FO.iso88591: fo_FO.ISO8859-1
-@@ -526,10 +585,12 @@
+@@ -532,10 +589,12 @@ fr.UTF-8: fr_FR.UTF-8
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-15@euro: fr_BE.ISO8859-15
fr_BE@euro: fr_BE.ISO8859-15
fr_BE.utf8: fr_BE.UTF-8
-@@ -546,11 +607,14 @@
+@@ -552,11 +611,14 @@ fr_CA.utf8: fr_CA.UTF-8
fr_CH: fr_CH.ISO8859-1
fr_CH.88591: fr_CH.ISO8859-1
fr_CH.88591.en: fr_CH.ISO8859-1
fr_FR: fr_FR.ISO8859-1
fr_FR.88591: fr_FR.ISO8859-1
fr_FR.88591.en: fr_FR.ISO8859-1
-@@ -559,7 +623,6 @@
+@@ -565,7 +627,6 @@ fr_FR.ISO-8859-1: fr_FR.ISO8859-1
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
-@@ -570,6 +633,7 @@
+@@ -576,6 +637,7 @@ fr_LU.iso88591: fr_LU.ISO8859-1
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.ISO-8859-15: fr_LU.ISO8859-15
fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
fr_LU@euro: fr_LU.ISO8859-15
-@@ -585,6 +649,7 @@
+@@ -589,6 +651,7 @@ ga_IE.iso885914: 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@euro: ga_IE.ISO8859-15
ga_IE@euro: ga_IE.ISO8859-15
ga_IE.UTF-8@euro: ga_IE.UTF-8
-@@ -597,16 +662,23 @@
+@@ -601,16 +664,22 @@ gd_GB.iso885914: 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
gl_ES.UTF-8@euro: gl_ES.UTF-8
gl_ES.utf8: gl_ES.UTF-8
+gu: gu_IN.UTF-8
-+gu_IN: gu_IN.UTF-8
+ gu_IN: gu_IN.UTF-8
gu_IN.utf8: gu_IN.UTF-8
- gu_IN.UTF-8: gu_IN.UTF-8
gv: gv_GB.ISO8859-1
-@@ -617,6 +689,7 @@
+@@ -621,6 +690,7 @@ gv_GB.iso885914: 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.utf8: gv_GB.UTF-8
he: he_IL.ISO8859-8
he_IL: he_IL.ISO8859-8
- HE_IL: he_IL.ISO8859-8
-@@ -628,9 +701,9 @@
+ he_IL.iso88598: he_IL.ISO8859-8
+@@ -630,8 +700,8 @@ he_IL.microsoftcp1255: he_IL.CP1255
+ he_IL.microsoft-cp1255: he_IL.CP1255
he_IL.MICROSOFT-CP1255: he_IL.CP1255
he_IL.utf8: he_IL.UTF-8
- HE_IL.UTF-8: he_IL.UTF-8
-hi: hi_IN.ISCII-DEV
-hi_IN: hi_IN.ISCII-DEV
--HI_IN: hi_IN.ISCII-DEV
+hi: hi_IN.UTF-8
+hi_IN: hi_IN.UTF-8
-+HI_IN: hi_IN.UTF-8
hi_IN.isciidev: hi_IN.ISCII-DEV
hi_IN.utf8: hi_IN.UTF-8
- HI_IN.UTF-8: hi_IN.UTF-8
-@@ -643,11 +716,27 @@
+ hne: hne_IN.UTF-8
+@@ -643,13 +713,29 @@ hr_HR.iso88592: hr_HR.ISO8859-2
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
+hy_AM: hy_AM.UTF-8
+hy_AM.armscii8: hy_AM.ARMSCII-8
+hy_AM.utf8: hy_AM.UTF-8
+ ia: ia.UTF-8
+ ia.utf8: ia.UTF-8
+id: id_ID.ISO8859-1
+id_ID: id_ID.ISO8859-1
+id_ID.iso88591: 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
-@@ -677,13 +766,14 @@
+ ie: ie.UTF-8
+ ie.utf8: ie.UTF-8
+ is: is_IS.ISO8859-1
+@@ -676,6 +762,7 @@ it_IT.iso88591: it_IT.ISO8859-1
+ it_IT.ISO-8859-1: it_IT.ISO8859-1
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.iso885915@euro: it_IT.ISO8859-15
+ it_IT.ISO-8859-15: 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
+@@ -683,9 +770,9 @@ it_IT.utf8: it_IT.UTF-8
it_IT.UTF-8@euro: it_IT.UTF-8
+ XCOMM NUNACOM is an encoding for the Inuktitut syllabics
+ XCOMM we have little else on this encoding.
-iu: iu_CA.NUNACOM-8
-iu_CA: iu_CA.NUNACOM-8
-iu_CA.nunacom8: iu_CA.NUNACOM-8
+iu: iu_CA.UTF-8
+iu_CA: iu_CA.UTF-8
+iu_CA.utf8: iu_CA.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
-@@ -713,24 +803,27 @@
- ja_JP.jis7: ja_JP.JIS7
- ja_JP.mscode: ja_JP.SJIS
+ ja_JP: ja_JP.eucJP
+ ja: ja_JP.eucJP
+ ja.JIS: ja_JP.JIS7
+@@ -703,16 +790,20 @@ 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
- JA_JP.utf8: ja_JP.UTF-8
-ka: ka_GE.GEORGIAN-ACADEMY
-ka_GE: ka_GE.GEORGIAN-ACADEMY
+ka: ka_GE.GEORGIAN-PS
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
-kl_GL.iso885915: kl_GL.ISO8859-15
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
-@@ -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
+ km_KH: km_KH.UTF-8
+ km_KH.utf8: km_KH.UTF-8
+@@ -732,6 +823,9 @@ ks_IN: ks_IN.UTF-8
+ ks_IN.utf8: ks_IN.UTF-8
+ ks_IN@devanagari: ks_IN.UTF-8@devanagari
+ ks_IN.utf8@devanagari: ks_IN.UTF-8@devanagari
+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
-@@ -755,15 +851,37 @@
+@@ -740,14 +834,36 @@ kw_GB.iso885914: 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.utf8: kw_GB.UTF-8
ky: ky_KG.UTF-8
ky_KG: ky_KG.UTF-8
- ky_KG.utf8: ky_KG.UTF-8
- ky_KG.UTF-8: ky_KG.UTF-8
+ ky_KG.utf8: ky_KG.UTF-8
-lo: lo_LA.MULELAO-1
-lo_LA: lo_LA.MULELAO-1
+lg: lg_UG.ISO8859-10
#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
-@@ -780,6 +898,8 @@
+@@ -764,6 +880,8 @@ lt_LT.iso885913: lt_LT.ISO8859-13
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
-@@ -794,6 +914,8 @@
+@@ -778,6 +896,8 @@ mai_IN.utf8: mai_IN.UTF-8
mi: mi_NZ.ISO8859-1
mi_NZ: mi_NZ.ISO8859-1
mi_NZ.iso88591: mi_NZ.ISO8859-1
mk: mk_MK.ISO8859-5
mk_MK: mk_MK.ISO8859-5
mk_MK.iso88595: mk_MK.ISO8859-5
-@@ -804,8 +926,12 @@
- mk_MK.MICROSOFT-CP1251: mk_MK.CP1251
- mk_MK.utf8: mk_MK.UTF-8
+@@ -790,6 +910,9 @@ mk_MK.utf8: mk_MK.UTF-8
ml: ml_IN.UTF-8
-+ml_IN: ml_IN.UTF-8
+ ml_IN: ml_IN.UTF-8
ml_IN.utf8: ml_IN.UTF-8
- ml_IN.UTF-8: 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
-@@ -814,9 +940,12 @@
+@@ -797,9 +920,12 @@ ms: ms_MY.ISO8859-1
ms_MY: ms_MY.ISO8859-1
ms_MY.iso88591: ms_MY.ISO8859-1
ms_MY.ISO-8859-1: ms_MY.ISO8859-1
nb: nb_NO.ISO8859-1
nb_NO: nb_NO.ISO8859-1
nb_NO.88591: nb_NO.ISO8859-1
-@@ -824,6 +953,19 @@
+@@ -808,6 +934,19 @@ 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.utf8: nb_NO.UTF-8
+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.UTF-8: ne_NP.UTF-8
nl: nl_NL.ISO8859-1
-@@ -835,8 +977,9 @@
+@@ -819,8 +958,9 @@ nl_BE.iso88591: nl_BE.ISO8859-1
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@euro: nl_BE.ISO8859-15
nl_BE.utf8: nl_BE.UTF-8
nl_BE.UTF-8@euro: nl_BE.UTF-8
-@@ -844,11 +987,12 @@
+@@ -828,11 +968,12 @@ nl_NL: nl_NL.ISO8859-1
nl_NL.88591: nl_NL.ISO8859-1
nl_NL.88591.en: nl_NL.ISO8859-1
nl_NL.iso88591: nl_NL.ISO8859-1
nl_NL@euro: nl_NL.ISO8859-15
nl_NL.utf8: nl_NL.UTF-8
nl_NL.UTF-8@euro: nl_NL.UTF-8
-@@ -859,31 +1003,35 @@
- nn_NO.iso885915: nn_NO.ISO8859-15
- nn_NO.ISO-8859-15: nn_NO.ISO8859-15
- nn_NO.utf8: nn_NO.UTF-8
--no: no_NO.ISO8859-1
--no_NO: no_NO.ISO8859-1
--no_NO.88591: no_NO.ISO8859-1
--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
-+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.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.utf8: nb_NO.UTF-8
- nr: nr_ZA.ISO8859-1
+@@ -847,10 +988,14 @@ nn_NO.utf8: nn_NO.UTF-8
+ nr: nr_ZA.ISO8859-1
nr_ZA: nr_ZA.ISO8859-1
- nr_ZA.iso88591: nr_ZA.ISO8859-1
+ nr_ZA.iso88591: 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-10
+nso_ZA.iso885910: nso_ZA.ISO8859-10
+nso_ZA.ISO-8859-10: nso_ZA.ISO8859-10
- nso_ZA.iso885915: nso_ZA.ISO8859-15
+ nso_ZA.iso885915: 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.88591: ny_NO.ISO8859-1
--ny_NO.ISO_8859-1: ny_NO.ISO8859-1
--ny_NO.iso885915: ny_NO.ISO8859-15
--no@nynorsk: ny_NO.ISO8859-1
-+ny: nn_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.iso885915: nn_NO.ISO8859-15
-+no@nynorsk: nn_NO.ISO8859-1
+ nso_ZA.utf8: nso_ZA.UTF-8
nynorsk: nn_NO.ISO8859-1
oc: oc_FR.ISO8859-1
- oc_FR: oc_FR.ISO8859-1
-@@ -891,14 +1039,31 @@
+@@ -859,14 +1004,31 @@ oc_FR.iso88591: 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
+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: 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_IN: 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
pd: pd_US.ISO8859-1
pd_DE: pd_DE.ISO8859-1
pd_US: pd_US.ISO8859-1
-@@ -906,18 +1071,22 @@
+@@ -874,18 +1036,22 @@ pd_DE.iso88591: pd_DE.ISO8859-1
pd_US.iso88591: pd_US.ISO8859-1
pd_DE.iso885915: pd_DE.ISO8859-15
pd_US.iso885915: pd_US.ISO8859-15
pt: pt_PT.ISO8859-1
pt.ISO8859-15: pt_PT.ISO8859-15
pt_BR: pt_BR.ISO8859-1
-@@ -926,7 +1095,6 @@
+@@ -894,7 +1060,6 @@ pt_BR.88591.en: pt_BR.ISO8859-1
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
-@@ -935,8 +1103,9 @@
+@@ -903,8 +1068,9 @@ pt_PT.iso88591: pt_PT.ISO8859-1
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@euro: pt_PT.ISO8859-15
pt_PT.utf8: pt_PT.UTF-8
pt_PT.UTF-8@euro: pt_PT.UTF-8
-@@ -944,6 +1113,8 @@
+@@ -912,6 +1078,8 @@ ro: ro_RO.ISO8859-2
ro_RO: ro_RO.ISO8859-2
ro_RO.iso88592: ro_RO.ISO8859-2
ro_RO.ISO-8859-2: ro_RO.ISO8859-2
ro_RO.utf8: ro_RO.UTF-8
ru: ru_RU.UTF-8
ru.koi8-r: ru_RU.KOI8-R
-@@ -969,10 +1140,12 @@
- ru_UA.microsoftcp1251: ru_UA.CP1251
- ru_UA.microsoft-cp1251: ru_UA.CP1251
- ru_UA.MICROSOFT-CP1251: ru_UA.CP1251
-+ru_UA.utf8: ru_UA.UTF-8
- rw: rw_RW.ISO8859-1
- rw_RW: rw_RW.ISO8859-1
- rw_RW.iso8859-1: rw_RW.ISO8859-1
- 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
+@@ -942,6 +1110,7 @@ rw: rw_RW.ISO8859-1
+ rw_RW: rw_RW.ISO8859-1
+ rw_RW.iso8859-1: rw_RW.ISO8859-1
+ 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
sd: sd_IN.UTF-8
sd_IN.utf8: sd_IN.UTF-8
-@@ -992,6 +1165,10 @@
- sh_YU.utf8: sr_RS.UTF-8@latin
+@@ -952,6 +1121,10 @@ se_NO: se_NO.UTF-8
+ se_NO.utf8: se_NO.UTF-8
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
-@@ -1001,11 +1178,27 @@
+@@ -961,11 +1134,27 @@ sl: sl_SI.ISO8859-2
sl_SI: sl_SI.ISO8859-2
sl_SI.iso88592: sl_SI.ISO8859-2
sl_SI.ISO-8859-2: sl_SI.ISO8859-2
+sq_AL.iso88591: sq_AL.ISO8859-1
+sq_AL.ISO-8859-1: sq_AL.ISO8859-1
sq_AL.utf8: sq_AL.UTF-8
- 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 +1222,17 @@
+ sr: sr_RS.UTF-8
+ sr@cyrillic: sr_RS.UTF-8
+@@ -978,13 +1167,17 @@ 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
+sr@ije: sr_ME.UTF-8
-+sr_CS@ije: sr_CS.UTF-8
- ss: ss_ZA.ISO8859-1
++sr_CS@ije: sr_ME.UTF-8
+ ss: ss_ZA.ISO8859-1
ss_ZA: ss_ZA.ISO8859-1
- ss_ZA.iso88591: ss_ZA.ISO8859-1
+ ss_ZA.iso88591: 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: st_ZA.ISO8859-1
st_ZA: st_ZA.ISO8859-1
- st_ZA.iso88591: st_ZA.ISO8859-1
+ st_ZA.iso88591: 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.ISO8859-15: sv_SE.ISO8859-15
-@@ -1045,6 +1242,7 @@
+@@ -994,6 +1187,7 @@ sv_FI.iso88591: 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@euro: sv_FI.ISO8859-15
sv_FI@euro: sv_FI.ISO8859-15
sv_FI.UTF-8@euro: sv_FI.UTF-8
-@@ -1059,32 +1257,56 @@
+@@ -1008,32 +1202,57 @@ sv_SE.iso885915: sv_SE.ISO8859-15
sv_SE.ISO-8859-15: sv_SE.ISO8859-15
sv_SE@euro: sv_SE.ISO8859-15
sv_SE.utf8: sv_SE.UTF-8
ta_IN.tscii0: ta_IN.TSCII-0
+ta_IN.utf8: ta_IN.UTF-8
te: te_IN.UTF-8
+ te.UTF-8: te_IN.UTF-8
+te_IN: te_IN.UTF-8
te_IN.utf8: te_IN.UTF-8
--te_IN.UTF-8: te_IN.UTF-8
--tg: tg_TJ.KOI8-C
--tg_TJ: tg_TJ.KOI8-C
--tg_TJ.koi8c: tg_TJ.KOI8-C
-+tg: tg_TJ.KOI8-T
-+tg_TJ: tg_TJ.KOI8-T
-+tg_TJ.koi8c: tg_TJ.KOI8-K
+ tg: tg_TJ.KOI8-C
+ tg_TJ: tg_TJ.KOI8-C
+ tg_TJ.koi8c: tg_TJ.KOI8-C
+tg_TJ.koi8k: tg_TJ.KOI8-K
+tg_TJ.koi8t: tg_TJ.KOI8-T
+tg_TJ.utf8: tg_TJ.UTF-8
tl_PH.iso88591: tl_PH.ISO8859-1
tl_PH.ISO-8859-1: tl_PH.ISO8859-1
-tn: tn_ZA.ISO8859-15
--tn_ZA: tn_ZA.ISO8859-15
--tn_ZA.iso8859-15: tn_ZA.ISO8859-15
+-tn_ZA: tn_ZA.ISO8859-15
+-tn_ZA.iso8859-15: tn_ZA.ISO8859-15
+tl_PH.utf8: tl_PH.UTF-8
+tn: tn_ZA.ISO8859-10
+tn_ZA: 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.utf8: tn_ZA.UTF-8
+ 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.utf8: tr_CY.UTF-8
tr_TR: tr_TR.ISO8859-9
- TR_TR: tr_TR.ISO8859-9
tr_TR.iso88599: tr_TR.ISO8859-9
-@@ -1094,14 +1316,18 @@
- ts: ts_ZA.ISO8859-1
+ tr_TR.ISO-8859-9: tr_TR.ISO8859-9
+@@ -1041,14 +1260,18 @@ tr_TR.utf8: tr_TR.UTF-8
+ ts: ts_ZA.ISO8859-1
ts_ZA: ts_ZA.ISO8859-1
- ts_ZA.iso88591: ts_ZA.ISO8859-1
+ ts_ZA.iso88591: 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
uk_UA.koi8u: uk_UA.KOI8-U
uk_UA.cp1251: uk_UA.CP1251
uk_UA.microsoftcp1251: uk_UA.CP1251
-@@ -1117,23 +1343,33 @@
+@@ -1064,14 +1287,22 @@ ur_PK.cp1256: ur_PK.CP1256
ur_PK.microsoftcp1256: ur_PK.CP1256
ur_PK.microsoft-cp1256: ur_PK.CP1256
ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
+uz_UZ.iso88591: 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
-+uz@cyrillic: uz_UZ.UTF-8
uz_UZ@cyrillic: uz_UZ.UTF-8
-+uz_UZ.utf8@cyrillic: uz_UZ.UTF-8
uz_UZ.UTF-8@cyrillic: uz_UZ.UTF-8
++uz@latin: uz_UZ.ISO8859-1
++uz_UZ@latin: uz_UZ.ISO8859-1
ve: ve_ZA.UTF-8
--ve_ZA: ve_ZA.UTF-8
--ve_ZA.utf8: ve_ZA.UTF-8
-+ve_ZA: ve_ZA.UTF-8
-+ve_ZA.utf8: ve_ZA.UTF-8
+ ve_ZA: ve_ZA.UTF-8
+ ve_ZA.utf8: ve_ZA.UTF-8
+ven: ve_ZA.UTF-8
+ven_ZA: ve_ZA.UTF-8
+ven_ZA.utf8: ve_ZA.UTF-8
vi: vi_VN.TCVN
vi_VN: vi_VN.TCVN
- Vi_VN: vi_VN.TCVN
- VI_VN: vi_VN.TCVN
vi_VN.tcvn: vi_VN.TCVN
- vi_VN.tcvn5712: vi_VN.TCVN
-+vi_VN.utf8: vi_VN.UTF-8
- vi_VN.viscii: vi_VN.VISCII
- vi_VN.viscii111: vi_VN.VISCII
--vi_VN.utf8: vi_VN.UTF-8
- VI_VN.UTF-8: vi_VN.UTF-8
- wa: wa_BE.ISO8859-1
- wa_BE: wa_BE.ISO8859-1
-@@ -1141,11 +1377,14 @@
+@@ -1085,11 +1316,14 @@ wa_BE.iso88591: 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@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: xh_ZA.ISO8859-1
xh_ZA: xh_ZA.ISO8859-1
- xh_ZA.iso88591: xh_ZA.ISO8859-1
+ xh_ZA.iso88591: 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
-@@ -1153,6 +1392,7 @@
+@@ -1097,6 +1331,7 @@ yi_US.cp1255: yi_US.CP1255
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
-@@ -1165,8 +1405,10 @@
- ZH_CN.UTF-8: zh_CN.UTF-8
+@@ -1108,8 +1343,10 @@ zh_CN.euc: zh_CN.eucCN
+ zh_CN.utf8: zh_CN.UTF-8
zh_HK: zh_HK.big5hkscs
zh_HK.BIG5HK: 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
-@@ -1174,6 +1416,10 @@
+@@ -1120,6 +1357,10 @@ zh_HK.Big5-HKSCS: zh_HK.big5hkscs
+ zh_HK.Big5HKSCS: zh_HK.big5hkscs
zh_HK.Big5: zh_HK.big5
zh_HK.utf8: zh_HK.UTF-8
- ZH_HK.UTF-8: zh_HK.UTF-8
+zh_SG: zh_SG.gb2312
+zh_SG.GB2312: zh_SG.gb2312
+zh_SG.GBK: zh_SG.gbk
+zh_SG.utf8: zh_SG.UTF-8
- ZH_SG.UTF-8: zh_SG.UTF-8
zh_TW: zh_TW.big5
zh_TW.Big5: zh_TW.big5
-@@ -1183,9 +1429,11 @@
- zh_TW.EUC-TW: zh_TW.eucTW
- zh_TW.utf8: zh_TW.UTF-8
- ZH_TW.UTF-8: zh_TW.UTF-8
--zu: zu_ZA.ISO8859-1
-+zu: zu_ZA.ISO8859-1
+ zh_TW.BIG5: zh_TW.big5
+@@ -1129,6 +1370,8 @@ zh_TW.utf8: zh_TW.UTF-8
+ zu: zu_ZA.ISO8859-1
zu_ZA: zu_ZA.ISO8859-1
--zu_ZA.iso88591: zu_ZA.ISO8859-1
-+zu_ZA.iso88591: zu_ZA.ISO8859-1
+ zu_ZA.iso88591: zu_ZA.ISO8859-1
+zu_ZA.ISO-8859-1: zu_ZA.ISO8859-1
+zu_ZA.ISO_8859-1: zu_ZA.ISO8859-1
zu_ZA.utf8: zu_ZA.UTF-8
XCOMM The following locale names are used in SCO 3.0
---- 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 @@
+--- libX11-1.7.4/nls/locale.dir.pre.orig 2022-03-30 22:55:23.000000000 +0200
++++ libX11-1.7.4/nls/locale.dir.pre 2022-03-31 20:35:13.962259284 +0200
+@@ -6,7 +6,9 @@ XCOMM
XCOMM
C/XLC_LOCALE: C
iso8859-1/XLC_LOCALE: af_ZA.ISO8859-1
+iso8859-15/XLC_LOCALE: an_ES.ISO8859-15
iso8859-6/XLC_LOCALE: ar_AA.ISO8859-6
-+iso8859-6/XLC_LOCALE: ar_AE.ISO8859-6
+ iso8859-6/XLC_LOCALE: ar_AE.ISO8859-6
iso8859-6/XLC_LOCALE: ar_BH.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_DZ.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_EG.ISO8859-6
-@@ -28,7 +31,7 @@
+@@ -26,7 +28,7 @@ iso8859-6/XLC_LOCALE: ar_SY.ISO8859-6
iso8859-6/XLC_LOCALE: ar_TN.ISO8859-6
iso8859-6/XLC_LOCALE: ar_YE.ISO8859-6
iso8859-9e/XLC_LOCALE: az_AZ.ISO8859-9E
iso8859-5/XLC_LOCALE: be_BY.ISO8859-5
microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
-@@ -38,6 +41,7 @@
- iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
- iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
- iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
-+iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
- iso8859-1/XLC_LOCALE: ca_AD.ISO8859-1
- iso8859-15/XLC_LOCALE: ca_AD.ISO8859-15
- iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1
-@@ -50,7 +54,6 @@
- iso8859-1/XLC_LOCALE: cy_GB.ISO8859-1
- iso8859-14/XLC_LOCALE: cy_GB.ISO8859-14
- iso8859-15/XLC_LOCALE: cy_GB.ISO8859-15
--iso8859-2/XLC_LOCALE: cz_CZ.ISO8859-2
- iso8859-1/XLC_LOCALE: da_DK.ISO8859-1
- iso8859-15/XLC_LOCALE: da_DK.ISO8859-15
- iso8859-1/XLC_LOCALE: de_AT.ISO8859-1
-@@ -64,13 +67,14 @@
- iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
+@@ -63,6 +65,7 @@ iso8859-15/XLC_LOCALE: de_LI.ISO8859-1
iso8859-1/XLC_LOCALE: de_LU.ISO8859-1
iso8859-15/XLC_LOCALE: de_LU.ISO8859-15
+ iso8859-4/XLC_LOCALE: ee_EE.ISO8859-4
+iso8859-7/XLC_LOCALE: el_CY.ISO8859-7
- iso8859-7/XLC_LOCALE: el_GR.ISO8859-7
--iso8859-15/XLC_LOCALE: el_GR.ISO8859-15
+ iso8859-7/XLC_LOCALE: el_GR.ISO8859-7
+ iso8859-15/XLC_LOCALE: el_GR.ISO8859-15
iso8859-1/XLC_LOCALE: en_AU.ISO8859-1
- iso8859-1/XLC_LOCALE: en_BE.ISO8859-1
--iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
+@@ -71,6 +74,7 @@ iso8859-15/XLC_LOCALE: en_BE.ISO8859-1
iso8859-1/XLC_LOCALE: en_BW.ISO8859-1
-+iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
+ iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
iso8859-1/XLC_LOCALE: en_CA.ISO8859-1
+iso8859-1/XLC_LOCALE: en_DK.ISO8859-1
+ iso8859-1/XLC_LOCALE: en_EN.ISO8859-1
iso8859-1/XLC_LOCALE: en_GB.ISO8859-1
iso8859-15/XLC_LOCALE: en_GB.ISO8859-15
- iso8859-1/XLC_LOCALE: en_HK.ISO8859-1
-@@ -82,8 +86,6 @@
+@@ -84,8 +88,6 @@ iso8859-1/XLC_LOCALE: en_NZ.ISO8859-1
iso8859-1/XLC_LOCALE: en_PH.ISO8859-1
iso8859-1/XLC_LOCALE: en_SG.ISO8859-1
iso8859-1/XLC_LOCALE: en_TT.ISO8859-1
iso8859-1/XLC_LOCALE: en_US.ISO8859-1
iso8859-15/XLC_LOCALE: en_US.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
-@@ -120,6 +122,7 @@
+@@ -129,6 +131,7 @@ iso8859-15/XLC_LOCALE: eu_ES.ISO8859-1
isiri-3342/XLC_LOCALE: fa_IR.ISIRI-3342
iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1
iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15
iso8859-1/XLC_LOCALE: fo_FO.ISO8859-1
iso8859-15/XLC_LOCALE: fo_FO.ISO8859-15
iso8859-1/XLC_LOCALE: fr_BE.ISO8859-1
-@@ -147,7 +150,9 @@
+@@ -156,7 +159,9 @@ iso8859-8/XLC_LOCALE: he_IL.ISO8859-8
microsoft-cp1255/XLC_LOCALE: he_IL.CP1255
iscii-dev/XLC_LOCALE: hi_IN.ISCII-DEV
iso8859-2/XLC_LOCALE: hr_HR.ISO8859-2
+iso8859-16/XLC_LOCALE: hu_HU.ISO8859-16
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,60 +165,66 @@
+ iso8859-1/XLC_LOCALE: id_ID.ISO8859-15
+@@ -171,12 +176,18 @@ ja.SJIS/XLC_LOCALE: ja_JP.SJIS
ja.JIS/XLC_LOCALE: ja_JP.JIS7
georgian-academy/XLC_LOCALE: ka_GE.GEORGIAN-ACADEMY
georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS
+XCOMM pt-154/XLC_LOCALE: kk_KZ.PT154
iso8859-1/XLC_LOCALE: kl_GL.ISO8859-1
+ iso8859-15/XLC_LOCALE: kl_GL.ISO8859-15
ko/XLC_LOCALE: ko_KR.eucKR
iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14
ibm-cp1133/XLC_LOCALE: lo_LA.IBM-CP1133
mulelao-1/XLC_LOCALE: lo_LA.MULELAO-1
iso8859-4/XLC_LOCALE: lt_LT.ISO8859-4
- iso8859-13/XLC_LOCALE: lt_LT.ISO8859-13
- iso8859-4/XLC_LOCALE: lv_LV.ISO8859-4
- iso8859-13/XLC_LOCALE: lv_LV.ISO8859-13
--iso8859-13/XLC_LOCALE: mi_NZ.ISO8859-13
-+iso8859-1/XLC_LOCALE: mi_NZ.ISO8859-1
- iso8859-5/XLC_LOCALE: mk_MK.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: mk_MK.CP1251
+@@ -189,7 +200,9 @@ microsoft-cp1251/XLC_LOCALE: mk_MK.CP12
iso8859-1/XLC_LOCALE: ms_MY.ISO8859-1
iso8859-3/XLC_LOCALE: mt_MT.ISO8859-3
iso8859-1/XLC_LOCALE: nb_NO.ISO8859-1
iso8859-1/XLC_LOCALE: nl_BE.ISO8859-1
iso8859-15/XLC_LOCALE: nl_BE.ISO8859-15
iso8859-1/XLC_LOCALE: nl_NL.ISO8859-1
- iso8859-15/XLC_LOCALE: nl_NL.ISO8859-15
+@@ -197,21 +210,24 @@ iso8859-15/XLC_LOCALE: nl_NL.ISO8859-1
iso8859-1/XLC_LOCALE: nn_NO.ISO8859-1
iso8859-1/XLC_LOCALE: nn_NO.ISO8859-15
--iso8859-1/XLC_LOCALE: no_NO.ISO8859-1
--iso8859-1/XLC_LOCALE: no_NO.ISO8859-15
iso8859-1/XLC_LOCALE: nr_ZA.ISO8859-1
-iso8859-15/XLC_LOCALE: nso_ZA.ISO8859-15
--iso8859-1/XLC_LOCALE: ny_NO.ISO8859-1
--iso8859-1/XLC_LOCALE: ny_NO.ISO8859-15
+iso8859-10/XLC_LOCALE: nso_ZA.ISO8859-10
iso8859-1/XLC_LOCALE: oc_FR.ISO8859-1
iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15
+iso8859-1/XLC_LOCALE: pap_AN.ISO8859-1
+iso8859-15/XLC_LOCALE: pap_AN.ISO8859-15
iso8859-1/XLC_LOCALE: pd_DE.ISO8859-1
+ iso8859-15/XLC_LOCALE: pd_DE.ISO8859-15
+ iso8859-1/XLC_LOCALE: pd_US.ISO8859-1
+ iso8859-15/XLC_LOCALE: pd_US.ISO8859-15
-iso8859-1/XLC_LOCALE: ph_PH.ISO8859-1
iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2
-iso8859-1/XLC_LOCALE: pp_AN.ISO8859-1
+iso8859-16/XLC_LOCALE: pl_PL.ISO8859-16
iso8859-1/XLC_LOCALE: pt_BR.ISO8859-1
+ iso8859-15/XLC_LOCALE: pt_BR.ISO8859-15
iso8859-1/XLC_LOCALE: pt_PT.ISO8859-1
iso8859-15/XLC_LOCALE: pt_PT.ISO8859-15
iso8859-2/XLC_LOCALE: ro_RO.ISO8859-2
+iso8859-16/XLC_LOCALE: ro_RO.ISO8859-16
- iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
- koi8-r/XLC_LOCALE: ru_RU.KOI8-R
- koi8-u/XLC_LOCALE: ru_UA.KOI8-U
-+microsoft-cp1251/XLC_LOCALE: ru_UA.CP1251
- iso8859-1/XLC_LOCALE: rw_RW.ISO8859-1
--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-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-5/XLC_LOCALE: ru_RU.ISO8859-5
+ microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
+ koi8-r/XLC_LOCALE: ru_RU.KOI8-R
+@@ -220,7 +236,15 @@ koi8-u/XLC_LOCALE: ru_UA.KOI8-U
+ iso8859-1/XLC_LOCALE: rw_RW.ISO8859-1
+ iso8859-2/XLC_LOCALE: sk_SK.ISO8859-2
+ iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2
+-iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2
+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-1/XLC_LOCALE: sq_AL.ISO8859-1
++iso8859-2/XLC_LOCALE: sr_ME.ISO8859-2
++iso8859-5/XLC_LOCALE: sr_ME.ISO8859-5
++iso8859-2/XLC_LOCALE: sr_RS.ISO8859-2
++iso8859-5/XLC_LOCALE: sr_RS.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
-@@ -221,19 +232,22 @@
+@@ -228,15 +252,17 @@ iso8859-15/XLC_LOCALE: sv_FI.ISO8859-1
iso8859-1/XLC_LOCALE: sv_SE.ISO8859-1
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
+koi8-t/XLC_LOCALE: tg_TJ.KOI8-T
th_TH/XLC_LOCALE: th_TH.TIS620
iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
- iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
+ iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
-iso8859-15/XLC_LOCALE: tn_ZA.ISO8859-15
+iso8859-10/XLC_LOCALE: tn_ZA.ISO8859-10
+iso8859-9/XLC_LOCALE: tr_CY.ISO8859-9
tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR
-koi8-c/XLC_LOCALE: tt_RU.KOI8-C
+koi8-c/XLC_LOCALE: tt_RU.KOI8-K
- iso8859-5/XLC_LOCALE: uk_UA.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
+ iso8859-5/XLC_LOCALE: uk_UA.ISO8859-5
+ microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
koi8-u/XLC_LOCALE: uk_UA.KOI8-U
- microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
-+iso8859-1/XLC_LOCALE: uz_UZ.ISO8859-1
- vi_VN.tcvn/XLC_LOCALE: vi_VN.TCVN
- vi_VN.viscii/XLC_LOCALE: vi_VN.VISCII
- iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1
-@@ -245,16 +259,17 @@
+@@ -253,13 +279,16 @@ zh_CN/XLC_LOCALE: zh_CN.gb2312
zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030
zh_HK.big5/XLC_LOCALE: zh_HK.big5
--zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs
--zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS
- zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
--zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS
+-zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
zh_TW.big5/XLC_LOCALE: zh_TW.big5
zh_TW/XLC_LOCALE: zh_TW.eucTW
iso8859-1/XLC_LOCALE: zu_ZA.ISO8859-1
- XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
+
+en_US.UTF-8/XLC_LOCALE: aa_DJ.UTF-8
+en_US.UTF-8/XLC_LOCALE: aa_ER.UTF-8
+en_US.UTF-8/XLC_LOCALE: aa_ET.UTF-8
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
-@@ -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: a3_AZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: be_BY.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
+@@ -290,11 +319,13 @@ 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: cs_CZ.UTF-8
+en_US.UTF-8/XLC_LOCALE: csb_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
--en_US.UTF-8/XLC_LOCALE: cs_CZ.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
-@@ -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_BW.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_BZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_CA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_DK.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_GB.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_HK.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
+@@ -324,7 +355,6 @@ 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: en_TT.UTF-8
-en_US.UTF-8/XLC_LOCALE: en_UK.UTF-8
en_US.UTF-8/XLC_LOCALE: en_US.UTF-8
en_US.UTF-8/XLC_LOCALE: en_ZA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_ZW.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
-@@ -339,6 +360,7 @@
+ en_US.UTF-8/XLC_LOCALE: en_ZW.UTF-8
+@@ -355,6 +385,7 @@ en_US.UTF-8/XLC_LOCALE: et_EE.UTF-8
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
-@@ -347,6 +369,7 @@
+@@ -363,6 +394,7 @@ en_US.UTF-8/XLC_LOCALE: fr_FR.UTF-8
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
-@@ -354,6 +377,7 @@
+@@ -370,6 +402,7 @@ en_US.UTF-8/XLC_LOCALE: he_IL.UTF-8
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: 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
-@@ -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: ia.UTF-8
+@@ -391,6 +424,9 @@ en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8@de
+ 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: ky_KG.UTF-8
+en_US.UTF-8/XLC_LOCALE: lg_UG.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 @@
+@@ -398,9 +434,11 @@ en_US.UTF-8/XLC_LOCALE: mai_IN.UTF-8
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: ms_MY.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: nn_NO.UTF-8
--en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ne_NP.UTF-8
+ en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8
+@@ -409,14 +447,15 @@ en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: nr_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: nso_ZA.UTF-8
--en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: oc_FR.UTF-8
+en_US.UTF-8/XLC_LOCALE: om_ET.UTF-8
+en_US.UTF-8/XLC_LOCALE: om_KE.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
-en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
- en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
+ pt_PT.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
-@@ -409,15 +438,18 @@
- en_US.UTF-8/XLC_LOCALE: sd_IN@devanagari.UTF-8
+@@ -427,11 +466,16 @@ en_US.UTF-8/XLC_LOCALE: sa_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8@devanagari
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: sh_BA.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: sk_SK.UTF-8
+en_US.UTF-8/XLC_LOCALE: so_KE.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_BA.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
- en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
-@@ -428,8 +460,11 @@
+ en_US.UTF-8/XLC_LOCALE: sr_RS.UTF-8@latin
+@@ -445,8 +489,11 @@ en_US.UTF-8/XLC_LOCALE: tg_TJ.UTF-8
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
en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8
en_US.UTF-8/XLC_LOCALE: ts_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8
---- libX11-1.0.2/configure.ac.orig 2006-06-23 01:22:12.000000000 +0200
-+++ libX11-1.0.2/configure.ac 2006-06-29 23:06:03.183418500 +0200
-@@ -374,6 +374,7 @@
- nls/iso8859-13/Makefile
- nls/iso8859-14/Makefile
- nls/iso8859-15/Makefile
-+ nls/iso8859-16/Makefile
- nls/iso8859-2/Makefile
- nls/iso8859-3/Makefile
- nls/iso8859-4/Makefile
-@@ -392,6 +393,7 @@
- nls/ko/Makefile
- nls/koi8-c/Makefile
- nls/koi8-r/Makefile
-+ nls/koi8-t/Makefile
- nls/koi8-u/Makefile
- nls/ko_KR.UTF-8/Makefile
- nls/microsoft-cp1251/Makefile
projects / packages / xorg-lib-libX11.git / blobdiff