summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@telfort.nl>2022-01-22 17:56:32 +0100
committerBenno Schulenberg <bensberg@telfort.nl>2022-01-22 18:07:30 +0100
commit32dd7c03e92e01015744867b9b3148c250cc159a (patch)
tree901080cd177ff8938a87872d664f127044f923c6
parent46a066f25103bb909259baea25de8dd5c4a2b338 (diff)
downloadxorg-lib-libX11-32dd7c03e92e01015744867b9b3148c250cc159a.tar.gz
nls: put some entries in their alphabetical order, and adjust alignment
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-rw-r--r--nls/compose.dir.pre18
-rw-r--r--nls/locale.alias.pre13
-rw-r--r--nls/locale.dir.pre62
3 files changed, 48 insertions, 45 deletions
diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index e5e308a7..d1d49aaf 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -172,10 +172,10 @@ georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
iso8859-1/Compose: kl_GL.ISO8859-1
iso8859-15/Compose: kl_GL.ISO8859-15
+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
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
iso8859-4/Compose: lt_LT.ISO8859-4
@@ -187,16 +187,16 @@ iso8859-5/Compose: mk_MK.ISO8859-5
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: 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: nn_NO.ISO8859-1
iso8859-15/Compose: nn_NO.ISO8859-15
+iso8859-1/Compose: no_NO.ISO8859-1
+iso8859-15/Compose: no_NO.ISO8859-15
iso8859-1/Compose: nr_ZA.ISO8859-1
iso8859-15/Compose: nso_ZA.ISO8859-15
iso8859-1/Compose: ny_NO.ISO8859-1
@@ -236,15 +236,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
-iso8859-1/Compose: tl_PH.ISO8859-1
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-9/Compose: tr_TR.ISO8859-9
iso8859-1/Compose: ts_ZA.ISO8859-1
+koi8-c/Compose: tt_RU.KOI8-C
tatar-cyr/Compose: tt_RU.TATAR-CYR
microsoft-cp1251/Compose: uk_UA.CP1251
-koi8-c/Compose: tt_RU.KOI8-C
koi8-u/Compose: uk_UA.KOI8-U
iso8859-5/Compose: uk_UA.ISO8859-5
microsoft-cp1256/Compose: ur_PK.CP1256
@@ -288,8 +288,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
-en_US.UTF-8/Compose: ast_ES.UTF-8
en_US.UTF-8/Compose: as_IN.UTF-8
+en_US.UTF-8/Compose: ast_ES.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
en_US.UTF-8/Compose: be_BY.UTF-8
en_US.UTF-8/Compose: bg_BG.UTF-8
@@ -406,12 +406,12 @@ 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: 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: nr_ZA.UTF-8
en_US.UTF-8/Compose: nso_ZA.UTF-8
en_US.UTF-8/Compose: ny_NO.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 3b5aecdb..b9669f10 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -103,13 +103,13 @@ ar_TN: ar_TN.ISO8859-6
ar_TN.iso88596: ar_TN.ISO8859-6
ar_TN.ISO-8859-6: ar_TN.ISO8859-6
ar_TN.utf8: ar_TN.UTF-8
-as: as_IN.UTF-8
-as_IN: as_IN.UTF-8
-as_IN.utf8: 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
+as: as_IN.UTF-8
+as_IN: as_IN.UTF-8
+as_IN.utf8: as_IN.UTF-8
az: az_AZ.ISO8859-9E
az_AZ: az_AZ.ISO8859-9E
az_AZ.iso88599e: az_AZ.ISO8859-9E
@@ -345,8 +345,8 @@ en_IE.UTF-8@euro: en_IE.UTF-8
en_IE.utf8: en_IE.UTF-8
en_IL: en_IL.ISO8859-1
en_IL.utf8: en_IL.UTF-8
-en_IN.utf8: en_IN.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
@@ -1183,6 +1183,7 @@ french_france.8859: fr_FR.ISO8859-1
german_germany.8859: de_DE.ISO8859-1
portuguese_brazil.8859: pt_BR.ISO8859-1
spanish_spain.8859: es_ES.ISO8859-1
+
XCOMM The following locale names are used in HPUX 9.x
american.iso88591: en_US.ISO8859-1
arabic.iso88596: ar_AA.ISO8859-6
@@ -1219,8 +1220,8 @@ hebrew: he_IL.ISO8859-8
hebrew.iso88598: he_IL.ISO8859-8
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
-icelandic.iso88591: is_IS.ISO8859-1
icelandic: is_IS.ISO8859-1
+icelandic.iso88591: is_IS.ISO8859-1
italian: it_IT.ISO8859-1
italian.iso88591: it_IT.ISO8859-1
japanese: ja_JP.eucJP
@@ -1256,6 +1257,7 @@ XCOMM Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES
XCOMM to augment LANG=C
iso_8859_1: en_US.ISO8859-1
iso_8859_15: en_US.ISO8859-15
+
#ifdef WIN32
XCOMM Microsoft Windows/NT 4.0 SP3
XCOMM parser doesn't grok embedded spaces in locale name
@@ -1360,6 +1362,7 @@ Chinese(PRC)_Hong Kong.950: zh_HK.EUC
Chinese(Singapore)_Signapore.936: zh_SG.EUC
Chinese(Taiwan)_Taiwan.950: zh_TW.EUC
#endif
+
XCOMM Other miscellaneous locale names
ISO8859-1: en_US.ISO8859-1
ISO-8859-1: en_US.ISO8859-1
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 45343cdf..4df9a97e 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -8,6 +8,7 @@ XCOMM
C/XLC_LOCALE: C
iso8859-1/XLC_LOCALE: af_ZA.ISO8859-1
iso8859-6/XLC_LOCALE: ar_AA.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
@@ -24,7 +25,6 @@ iso8859-6/XLC_LOCALE: ar_SD.ISO8859-6
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-6/XLC_LOCALE: ar_AE.ISO8859-6
iso8859-9e/XLC_LOCALE: az_AZ.ISO8859-9E
koi8-c/XLC_LOCALE: az_AZ.KOI8-C
iso8859-5/XLC_LOCALE: be_BY.ISO8859-5
@@ -32,10 +32,10 @@ microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
microsoft-cp1251/XLC_LOCALE: bg_BG.CP1251
koi8-r/XLC_LOCALE: bg_BG.KOI8-R
-iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
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
@@ -62,14 +62,14 @@ iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
iso8859-15/XLC_LOCALE: de_LI.ISO8859-15
iso8859-1/XLC_LOCALE: de_LU.ISO8859-1
iso8859-15/XLC_LOCALE: de_LU.ISO8859-15
-iso8859-7/XLC_LOCALE: el_GR.ISO8859-7
iso8859-4/XLC_LOCALE: ee_EE.ISO8859-4
+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-15/XLC_LOCALE: en_BE.ISO8859-15
-iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
iso8859-1/XLC_LOCALE: en_BW.ISO8859-1
+iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
iso8859-1/XLC_LOCALE: en_CA.ISO8859-1
iso8859-1/XLC_LOCALE: en_EN.ISO8859-1
iso8859-1/XLC_LOCALE: en_GB.ISO8859-1
@@ -121,8 +121,8 @@ iso8859-15/XLC_LOCALE: es_UY.ISO8859-15
iso8859-1/XLC_LOCALE: es_VE.ISO8859-1
iso8859-15/XLC_LOCALE: es_VE.ISO8859-15
iso8859-1/XLC_LOCALE: et_EE.ISO8859-1
-iso8859-4/XLC_LOCALE: et_EE.ISO8859-4
-iso8859-13/XLC_LOCALE: et_EE.ISO8859-13
+iso8859-4/XLC_LOCALE: et_EE.ISO8859-4
+iso8859-13/XLC_LOCALE: et_EE.ISO8859-13
iso8859-15/XLC_LOCALE: et_EE.ISO8859-15
iso8859-1/XLC_LOCALE: eu_ES.ISO8859-1
iso8859-15/XLC_LOCALE: eu_ES.ISO8859-15
@@ -216,16 +216,16 @@ 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-5/XLC_LOCALE: ru_RU.ISO8859-5
-microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
-koi8-r/XLC_LOCALE: ru_RU.KOI8-R
-microsoft-cp1251/XLC_LOCALE: ru_UA.CP1251
+iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
+microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
+koi8-r/XLC_LOCALE: ru_RU.KOI8-R
+microsoft-cp1251/XLC_LOCALE: ru_UA.CP1251
koi8-u/XLC_LOCALE: ru_UA.KOI8-U
-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-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_YU.ISO8859-2
iso8859-5/XLC_LOCALE: sr_YU.ISO8859-5
microsoft-cp1251/XLC_LOCALE: sr_YU.CP1251
@@ -239,14 +239,14 @@ tscii-0/XLC_LOCALE: ta_IN.TSCII-0
koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
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-9/XLC_LOCALE: tr_TR.ISO8859-9
iso8859-1/XLC_LOCALE: ts_ZA.ISO8859-1
tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR
koi8-c/XLC_LOCALE: tt_RU.KOI8-C
-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
@@ -273,7 +273,7 @@ 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_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
@@ -281,7 +281,6 @@ en_US.UTF-8/XLC_LOCALE: ar_LB.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_LY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_MA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_OM.UTF-8
-en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
@@ -296,8 +295,9 @@ en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8@latin
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: 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: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
@@ -375,7 +375,7 @@ 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
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: hu_HU.UTF-8
en_US.UTF-8/XLC_LOCALE: hy_AM.UTF-8
@@ -392,25 +392,26 @@ 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: km_KH.UTF-8
en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
-en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8
-en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8@devanagari
ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
+en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8@devanagari
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: lo_LA.UTF-8
en_US.UTF-8/XLC_LOCALE: lt_LT.UTF-8
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
-en_US.UTF-8/XLC_LOCALE: mai_IN.UTF-8
+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: 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: ne_NP.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: nr_ZA.UTF-8
@@ -430,10 +431,10 @@ pt_PT.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
ru_RU.UTF-8/XLC_LOCALE: ru_RU.UTF-8
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
-en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
-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: rw_RW.UTF-8
+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
@@ -469,7 +470,6 @@ en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8
en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8
-en_US.UTF-8/XLC_LOCALE: ne_NP.UTF-8
zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8
zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8
zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8