libx11: Changes to 'debian-unstable'
nls/compose.dir.pre | 135 -
nls/iso8859-15/Compose.pre | 30
nls/locale.alias.pre | 35
nls/locale.dir.pre | 77
nls/pt_BR.UTF-8/Compose.pre | 4276 +++++++++++++++++++++++++++++++++++++++++++-
5 files changed, 4342 insertions(+), 211 deletions(-)
New commits:
commit 756c5af8a8bc35d12fad67770f0bffc487fbab14
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed Nov 9 14:16:01 2011 -0800
revert accidentally committed changes to upstream source; this was just
applying the patches in-tree
diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 4d368ac..14a2fa9 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -4,17 +4,9 @@ XCOMM The first word is the compose table file name and
XCOMM the second word is full locale name.
XCOMM
XCOMM
-XCOMM Note that no Compose tables exist for ISO 8859-11, Microsoft code
-XCOMM pages, Fujitsu's S90 or U90 character sets, or TIS620 yet.
-XCOMM
iso8859-1/Compose: C
-XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-koi8-c/Compose: a3_AZ.KOI8-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_BH.ISO8859-6
iso8859-6/Compose: ar_DZ.ISO8859-6
iso8859-6/Compose: ar_EG.ISO8859-6
@@ -27,17 +19,13 @@ iso8859-6/Compose: ar_MA.ISO8859-6
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
iso8859-6/Compose: ar_TN.ISO8859-6
iso8859-6/Compose: ar_YE.ISO8859-6
iso8859-9e/Compose: az_AZ.ISO8859-9E
-koi8-c/Compose: az_AZ.KOI8-C
-iso8859-5/Compose: be_BY.ISO8859-5
+koi8-c/Compose: a3_AZ.KOI8-C
microsoft-cp1251/Compose: be_BY.CP1251
iso8859-5/Compose: bg_BG.ISO8859-5
microsoft-cp1251/Compose: bg_BG.CP1251
-koi8-r/Compose: bg_BG.KOI8-R
iso8859-1/Compose: br_FR.ISO8859-1
iso8859-14/Compose: br_FR.ISO8859-14
iso8859-15/Compose: br_FR.ISO8859-15
@@ -58,8 +46,6 @@ iso8859-1/Compose: da_DK.ISO8859-1
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
@@ -69,26 +55,15 @@ iso8859-15/Compose: de_LI.ISO8859-15
iso8859-1/Compose: de_LU.ISO8859-1
iso8859-15/Compose: de_LU.ISO8859-15
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
iso8859-1/Compose: en_BZ.ISO8859-1
iso8859-1/Compose: en_CA.ISO8859-1
-iso8859-1/Compose: en_DK.ISO8859-1
-iso8859-15/Compose: en_DK.ISO8859-15
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_IN.ISO8859-1
-iso8859-15/Compose: en_IN.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_TT.ISO8859-1
iso8859-1/Compose: en_UK.ISO8859-1
iso8859-15/Compose: en_UK.ISO8859-15
@@ -96,7 +71,6 @@ 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
@@ -116,7 +90,6 @@ iso8859-1/Compose: es_PE.ISO8859-1
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
@@ -125,8 +98,6 @@ iso8859-13/Compose: et_EE.ISO8859-13
iso8859-15/Compose: et_EE.ISO8859-15
iso8859-1/Compose: eu_ES.ISO8859-1
iso8859-15/Compose: eu_ES.ISO8859-15
-iso8859-1/Compose: eu_FR.ISO8859-1
-iso8859-15/Compose: eu_FR.ISO8859-15
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
@@ -160,9 +131,11 @@ iso8859-2/Compose: hr_HR.ISO8859-2
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
+iso8859-15/Compose: id_ID.ISO8859-15
iso8859-1/Compose: is_IS.ISO8859-1
iso8859-15/Compose: is_IS.ISO8859-15
iso8859-1/Compose: it_CH.ISO8859-1
+iso8859-15/Compose: it_CH.ISO8859-15
iso8859-1/Compose: it_IT.ISO8859-1
iso8859-15/Compose: it_IT.ISO8859-15
ja/Compose: ja_JP.eucJP
@@ -171,21 +144,14 @@ ja.JIS/Compose: ja_JP.JIS7
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
iso8859-1/Compose: kw_GB.ISO8859-1
iso8859-14/Compose: kw_GB.ISO8859-14
iso8859-15/Compose: kw_GB.ISO8859-15
-iso8859-10/Compose: lg_UG.ISO8859-10
-XCOMM Remove ko/Compose, as requested in http://bugs.debian.org/89703
-XCOMM ko/Compose: ko_KR.eucKR
+ko/Compose: ko_KR.eucKR
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
-#if defined(__FreeBSD__)
-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
-XCOMM generic Latin-1 locale anyway because it is the country code for
-XCOMM Lithuania, which by default uses Latin-7 (ISO-8859-13).
-XCOMM iso8859-1/Compose: lt_LN.ISO8859-1
-#endif
+iso8859-1/Compose: lt_LN.ISO8859-1
iso8859-4/Compose: lt_LT.ISO8859-4
iso8859-13/Compose: lt_LT.ISO8859-13
iso8859-4/Compose: lv_LV.ISO8859-4
@@ -212,33 +178,25 @@ iso8859-1/Compose: ny_NO.ISO8859-1
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
-iso8859-1/Compose: om_KE.ISO8859-1
-XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of
-German.
-XCOMM This is not an ISO language code defined for it, and the GNU C
-Library
-XCOMM doesn't support it.
-XCOMM iso8859-1/Compose: pd_DE.ISO8859-1
-XCOMM iso8859-1/Compose: pd_US.ISO8859-1
+iso8859-1/Compose: pd_DE.ISO8859-1
+iso8859-1/Compose: pd_US.ISO8859-1
iso8859-1/Compose: ph_PH.ISO8859-1
iso8859-2/Compose: pl_PL.ISO8859-2
iso8859-1/Compose: pp_AN.ISO8859-1
iso8859-1/Compose: pt_BR.ISO8859-1
+iso8859-15/Compose: pt_BR.ISO8859-15
iso8859-1/Compose: pt_PT.ISO8859-1
iso8859-15/Compose: pt_PT.ISO8859-15
iso8859-2/Compose: ro_RO.ISO8859-2
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
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-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
@@ -252,53 +210,35 @@ 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
-XCOMM There was once a blank th_TH Compose map, but it was removed. See
-XCOMM <URL: http://linux.thai.net/~thep/thaisupp/ >.
-XCOMM iso8859-11/Compose: th_TH.ISO8859-11
-XCOMM 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
tatar-cyr/Compose: tt_RU.TATAR-CYR
koi8-c/Compose: tt_RU.KOI8-C
-iso8859-5/Compose: uk_UA.ISO8859-5
koi8-u/Compose: uk_UA.KOI8-U
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-15/Compose: wa_BE.ISO8859-15
iso8859-1/Compose: xh_ZA.ISO8859-1
-microsoft-cp1255/Compose: yi_US.CP1255
+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_HK.big5/Compose: zh_HK.big5
-zh_HK.big5hkscs/Compose: zh_HK.big5-hkscs
-zh_HK.big5hkscs/Compose: zh_HK.Big5-HKSCS
-zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
-zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
-zh_CN/Compose: zh_SG.gb2312
-zh_CN.gbk/Compose: zh_SG.gbk
+zh_CN/Compose: zh_CN.GB2312
+zh_CN.gbk/Compose: zh_CN.GBK
zh_CN.gb18030/Compose: zh_CN.GB18030
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
-XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
-XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-en_US.UTF-8/Compose: a3_AZ.UTF-8
-en_US.UTF-8/Compose: aa_ER.UTF-8
-en_US.UTF-8/Compose: aa_ET.UTF-8
+XCOMM
+XCOMM
en_US.UTF-8/Compose: af_ZA.UTF-8
-en_US.UTF-8/Compose: am_ET.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_BH.UTF-8
en_US.UTF-8/Compose: ar_DZ.UTF-8
en_US.UTF-8/Compose: ar_EG.UTF-8
@@ -312,19 +252,16 @@ en_US.UTF-8/Compose: ar_MA.UTF-8
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
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: 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
@@ -342,25 +279,17 @@ en_US.UTF-8/Compose: de_LU.UTF-8
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
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_GB.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
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
@@ -384,7 +313,6 @@ 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: eu_FR.UTF-8
en_US.UTF-8/Compose: fa_IR.UTF-8
fi_FI.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
@@ -395,8 +323,6 @@ 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: gez_ER.UTF-8
-en_US.UTF-8/Compose: gez_ET.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
@@ -411,12 +337,10 @@ en_US.UTF-8/Compose: is_IS.UTF-8
en_US.UTF-8/Compose: it_CH.UTF-8
en_US.UTF-8/Compose: it_IT.UTF-8
en_US.UTF-8/Compose: iu_CA.UTF-8
-en_US.UTF-8/Compose: iw_IL.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: kl_GL.UTF-8
en_US.UTF-8/Compose: kk_KZ.UTF-8
-en_US.UTF-8/Compose: km_KH.UTF-8
en_US.UTF-8/Compose: kn_IN.UTF-8
en_US.UTF-8/Compose: ko_KR.UTF-8
en_US.UTF-8/Compose: ks_IN.UTF-8
@@ -430,11 +354,9 @@ 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: mn_MN.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: 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
@@ -442,19 +364,13 @@ 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
-XCOMM ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
-XCOMM See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
-XCOMM 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: or_IN.UTF-8
-en_US.UTF-8/Compose: om_ET.UTF-8
en_US.UTF-8/Compose: pa_IN.UTF-8
en_US.UTF-8/Compose: pa_PK.UTF-8
-XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-XCOMM This is not an ISO language code defined for it, and the GNU C Library
-XCOMM doesn't support it.
-XCOMM en_US.UTF-8/Compose: pd_DE.UTF-8
-XCOMM en_US.UTF-8/Compose: pd_US.UTF-8
+en_US.UTF-8/Compose: pd_DE.UTF-8
+en_US.UTF-8/Compose: pd_US.UTF-8
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
@@ -467,14 +383,10 @@ en_US.UTF-8/Compose: rw_RW.UTF-8
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: sh_YU.UTF-8
-en_US.UTF-8/Compose: sid_ET.UTF-8
en_US.UTF-8/Compose: si_LK.UTF-8
en_US.UTF-8/Compose: sk_SK.UTF-8
en_US.UTF-8/Compose: sl_SI.UTF-8
-en_US.UTF-8/Compose: so_ET.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
@@ -487,12 +399,7 @@ 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
en_US.UTF-8/Compose: tg_TJ.UTF-8
-XCOMM Following entry commented to allow Thai XIM as default for X apps
-XCOMM See Debian bug#520509
-XCOMM 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
-en_US.UTF-8/Compose: tig_ER.UTF-8
+en_US.UTF-8/Compose: th_TH.UTF-8
en_US.UTF-8/Compose: tl_PH.UTF-8
en_US.UTF-8/Compose: tn_ZA.UTF-8
en_US.UTF-8/Compose: tr_TR.UTF-8
diff --git a/nls/iso8859-15/Compose.pre b/nls/iso8859-15/Compose.pre
index a08896d..ec75cfe 100644
--- a/nls/iso8859-15/Compose.pre
+++ b/nls/iso8859-15/Compose.pre
@@ -155,7 +155,8 @@ XCOMM Special Character
<Multi_key> <minus> <colon> : "\367" division
<Multi_key> <colon> <minus> : "\367" division
<Multi_key> <x> <x> : "\327" multiply
-<Multi_key> <apostrophe> <apostrophe> : "'" apostrophe
+<Multi_key> <apostrophe> <apostrophe> : "\264" acute
+<Multi_key> <comma> <comma> : "\270" cedilla
<Multi_key> <quotedbl> <quotedbl> : "\"" quotedbl
XCOMM Accented Alphabet
<Multi_key> <A> <grave> : "\300" Agrave
@@ -174,6 +175,8 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <A> : "\303" Atilde
<Multi_key> <A> <quotedbl> : "\304" Adiaeresis
<Multi_key> <quotedbl> <A> : "\304" Adiaeresis
+<Multi_key> <A> <diaeresis> : "\304" Adiaeresis
+<Multi_key> <diaeresis> <A> : "\304" Adiaeresis
<Multi_key> <A> <asterisk> : "\305" Aring
<Multi_key> <asterisk> <A> : "\305" Aring
<Multi_key> <A> <A> : "\305" Aring
@@ -195,6 +198,8 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <a> : "\343" atilde
<Multi_key> <a> <quotedbl> : "\344" adiaeresis
<Multi_key> <quotedbl> <a> : "\344" adiaeresis
+<Multi_key> <a> <diaeresis> : "\344" adiaeresis
+<Multi_key> <diaeresis> <a> : "\344" adiaeresis
<Multi_key> <a> <asterisk> : "\345" aring
<Multi_key> <asterisk> <a> : "\345" aring
<Multi_key> <a> <a> : "\345" aring
@@ -226,6 +231,8 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <E> : "\312" Ecircumflex
<Multi_key> <E> <quotedbl> : "\313" Ediaeresis
<Multi_key> <quotedbl> <E> : "\313" Ediaeresis
+<Multi_key> <E> <diaeresis> : "\313" Ediaeresis
+<Multi_key> <diaeresis> <E> : "\313" Ediaeresis
<Multi_key> <e> <grave> : "\350" egrave
<Multi_key> <grave> <e> : "\350" egrave
<Multi_key> <e> <acute> : "\351" eacute
@@ -238,6 +245,8 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <e> : "\352" ecircumflex
<Multi_key> <e> <quotedbl> : "\353" ediaeresis
<Multi_key> <quotedbl> <e> : "\353" ediaeresis
+<Multi_key> <e> <diaeresis> : "\353" ediaeresis
+<Multi_key> <diaeresis> <e> : "\353" ediaeresis
<Multi_key> <I> <grave> : "\314" Igrave
<Multi_key> <grave> <I> : "\314" Igrave
<Multi_key> <I> <acute> : "\315" Iacute
@@ -250,6 +259,8 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <I> : "\316" Icircumflex
<Multi_key> <I> <quotedbl> : "\317" Idiaeresis
<Multi_key> <quotedbl> <I> : "\317" Idiaeresis
+<Multi_key> <I> <diaeresis> : "\317" Idiaeresis
+<Multi_key> <diaeresis> <I> : "\317" Idiaeresis
<Multi_key> <i> <grave> : "\354" igrave
<Multi_key> <grave> <i> : "\354" igrave
<Multi_key> <i> <acute> : "\355" iacute
@@ -262,6 +273,8 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <i> : "\356" icircumflex
<Multi_key> <i> <quotedbl> : "\357" idiaeresis
<Multi_key> <quotedbl> <i> : "\357" idiaeresis
+<Multi_key> <i> <diaeresis> : "\357" idiaeresis
+<Multi_key> <diaeresis> <i> : "\357" idiaeresis
<Multi_key> <N> <asciitilde> : "\321" Ntilde
<Multi_key> <asciitilde> <N> : "\321" Ntilde
<Multi_key> <N> <minus> : "\321" Ntilde
@@ -286,6 +299,8 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <O> : "\325" Otilde
<Multi_key> <O> <quotedbl> : "\326" Odiaeresis
<Multi_key> <quotedbl> <O> : "\326" Odiaeresis
+<Multi_key> <O> <diaeresis> : "\326" Odiaeresis
+<Multi_key> <diaeresis> <O> : "\326" Odiaeresis
<Multi_key> <O> <slash> : "\330" Ooblique
<Multi_key> <slash> <O> : "\330" Ooblique
<Multi_key> <O> <E> : "\274" OE
@@ -305,6 +320,8 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <o> : "\365" otilde
<Multi_key> <o> <quotedbl> : "\366" odiaeresis
<Multi_key> <quotedbl> <o> : "\366" odiaeresis
+<Multi_key> <o> <diaeresis> : "\366" odiaeresis
+<Multi_key> <diaeresis> <o> : "\366" odiaeresis
<Multi_key> <o> <slash> : "\370" oslash
<Multi_key> <slash> <o> : "\370" oslash
<Multi_key> <o> <e> : "\275" oe
@@ -324,6 +341,8 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <U> : "\333" Ucircumflex
<Multi_key> <U> <quotedbl> : "\334" Udiaeresis
<Multi_key> <quotedbl> <U> : "\334" Udiaeresis
+<Multi_key> <U> <diaeresis> : "\334" Udiaeresis
+<Multi_key> <diaeresis> <U> : "\334" Udiaeresis
<Multi_key> <u> <grave> : "\371" ugrave
<Multi_key> <grave> <u> : "\371" ugrave
<Multi_key> <u> <acute> : "\372" uacute
@@ -336,6 +355,8 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <u> : "\373" ucircumflex
<Multi_key> <u> <quotedbl> : "\374" udiaeresis
<Multi_key> <quotedbl> <u> : "\374" udiaeresis
+<Multi_key> <u> <diaeresis> : "\374" udiaeresis
+<Multi_key> <diaeresis> <u> : "\374" udiaeresis
<Multi_key> <s> <s> : "\337" ssharp
<Multi_key> <T> <H> : "\336" THORN
<Multi_key> <t> <h> : "\376" thorn
@@ -345,12 +366,16 @@ XCOMM Accented Alphabet
<Multi_key> <apostrophe> <Y> : "\335" Yacute
<Multi_key> <Y> <quotedbl> : "\276" Ydiaeresis
<Multi_key> <quotedbl> <Y> : "\276" Ydiaeresis
+<Multi_key> <Y> <diaeresis> : "\276" Ydiaeresis
+<Multi_key> <diaeresis> <Y> : "\276" Ydiaeresis
<Multi_key> <y> <acute> : "\375" yacute
<Multi_key> <acute> <y> : "\375" yacute
<Multi_key> <y> <apostrophe> : "\375" yacute
<Multi_key> <apostrophe> <y> : "\375" yacute
<Multi_key> <y> <quotedbl> : "\377" ydiaeresis
<Multi_key> <quotedbl> <y> : "\377" ydiaeresis
+<Multi_key> <y> <diaeresis> : "\377" ydiaeresis
+<Multi_key> <diaeresis> <y> : "\377" ydiaeresis
<Multi_key> <Z> <less> : "\264" Zcaron
<Multi_key> <less> <Z> : "\264" Zcaron
<Multi_key> <z> <less> : "\270" zcaron
@@ -379,7 +404,8 @@ XCOMM These are for us_intl, that does not have diaeresis, etc
<dead_cedilla> <minus> : "\254" notsign
<dead_circumflex> <minus> : "\257" macron
<dead_circumflex> <underscore> : "\257" macron
-<dead_acute> <apostrophe> : "'" apostrophe
+<dead_acute> <apostrophe> : "\264" acute
+<dead_cedilla> <comma> : "\270" cedilla
<dead_diaeresis> <quotedbl> : "\"" quotedbl
XCOMM Accented Alphabet
<dead_abovering> <A> : "\305" Aring
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 23d0f32..65b3dd0 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -308,12 +308,6 @@ 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_DK: en_DK.ISO8859-1
-en_DK.iso88591: en_DK.ISO8859-1
-en_DK.ISO-8859-1: en_DK.ISO8859-1
-en_DK.iso885915: en_DK.ISO8859-15
-en_DK.ISO-8859-15: en_DK.ISO8859-15
-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
@@ -362,16 +356,6 @@ 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_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.ISO-8859-15: 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
@@ -743,10 +727,6 @@ 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.utf8: kl_GL.UTF-8
-km: km_KH.UTF-8
-km_KH: km_KH.UTF-8
-km_KH.utf8: km_KH.UTF-8
-km_KH.UTF-8: km_KH.UTF-8
kn: kn_IN.UTF-8
kn_IN.utf8: kn_IN.UTF-8
kn_IN.UTF-8: kn_IN.UTF-8
@@ -947,6 +927,7 @@ 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.iso885915: pt_BR.ISO8859-15
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
@@ -1007,11 +988,11 @@ XCOMM CS was the old ISO code for Serbia&Montenegro (now separate RS and ME).
XCOMM These lines should be deleted in the future.
sh: sr_RS.UTF-8@latin
sh_BA.ISO8859-2@bosnia: sr_CS.ISO8859-2
+sh_HR.iso88592: hr_HR.ISO8859-2
sh_YU: sr_RS.UTF-8@latin
sh_YU.utf8: sr_RS.UTF-8@latin
si: si_LK.UTF-8
si_LK: si_LK.UTF-8
-sid_ET: sid_ET.UTF-8
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
@@ -1220,7 +1201,7 @@ XCOMM The following locale names are used in HPUX 9.x
american.iso88591: en_US.ISO8859-1
arabic.iso88596: ar_AA.ISO8859-6
bokmal: nb_NO.ISO8859-1
-bokm�: nb_NO.ISO8859-1
+bokm� nb_NO.ISO8859-1
bulgarian: bg_BG.CP1251
c-french.iso88591: fr_CA.ISO8859-1
catalan: ca_ES.ISO8859-1
@@ -1235,11 +1216,11 @@ deutsch: de_DE.ISO8859-1
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
-english.iso88591: en_US.ISO8859-1
+english.iso88591: en_EN.ISO8859-1
estonian: et_EE.ISO8859-1
finnish: fi_FI.ISO8859-1
finnish.iso88591: fi_FI.ISO8859-1
-fran�is: fr_FR.ISO8859-1
+fran�s: fr_FR.ISO8859-1
french: fr_FR.ISO8859-1
french.iso88591: fr_CH.ISO8859-1
galego: gl_ES.ISO8859-1
@@ -1248,8 +1229,8 @@ german: de_DE.ISO8859-1
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
-hebrew: he_IL.ISO8859-8
-hebrew.iso88598: he_IL.ISO8859-8
+hebrew: iw_IL.ISO8859-8
+hebrew.iso88598: iw_IL.ISO8859-8
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
icelandic.iso88591: is_IS.ISO8859-1
@@ -1269,7 +1250,7 @@ portuguese: pt_PT.ISO8859-1
portuguese.iso88591: pt_PT.ISO8859-1
romanian: ro_RO.ISO8859-2
rumanian: ro_RO.ISO8859-2
-russian: ru_RU.KOI8-R
+russian: ru_RU.ISO8859-5
serbocroatian: sr_RS.UTF-8@latin
sinhala: si_LK.UTF-8
slovak: sk_SK.ISO8859-2
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 2414536..e0d9ef7 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -6,13 +6,8 @@ XCOMM
XCOMM
C/XLC_LOCALE: C
-XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-koi8-c/XLC_LOCALE: a3_AZ.KOI8-C
-iso8859-1/XLC_LOCALE: aa_DJ.ISO8859-1
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_BH.ISO8859-6
iso8859-6/XLC_LOCALE: ar_DZ.ISO8859-6
iso8859-6/XLC_LOCALE: ar_EG.ISO8859-6
@@ -40,7 +35,6 @@ 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
@@ -53,6 +47,7 @@ iso8859-2/XLC_LOCALE: cs_CZ.ISO8859-2
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,25 +59,20 @@ iso8859-15/XLC_LOCALE: de_CH.ISO8859-15
iso8859-1/XLC_LOCALE: de_DE.ISO8859-1
iso8859-15/XLC_LOCALE: de_DE.ISO8859-15
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-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_CA.ISO8859-1
-iso8859-1/XLC_LOCALE: en_DK.ISO8859-1
-iso8859-15/XLC_LOCALE: en_DK.ISO8859-15
iso8859-1/XLC_LOCALE: en_GB.ISO8859-1
iso8859-15/XLC_LOCALE: en_GB.ISO8859-15
iso8859-1/XLC_LOCALE: en_HK.ISO8859-1
iso8859-1/XLC_LOCALE: en_IE.ISO8859-1
iso8859-15/XLC_LOCALE: en_IE.ISO8859-15
-iso8859-1/XLC_LOCALE: en_IN.ISO8859-1
iso8859-15/XLC_LOCALE: en_IN.ISO8859-15
iso8859-1/XLC_LOCALE: en_JM.ISO8859-1
iso8859-1/XLC_LOCALE: en_NZ.ISO8859-1
@@ -95,9 +85,7 @@ iso8859-1/XLC_LOCALE: en_US.ISO8859-1
iso8859-15/XLC_LOCALE: en_US.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
iso8859-15/XLC_LOCALE: en_ZA.ISO8859-15
-iso8859-1/XLC_LOCALE: en_ZW.ISO8859-1
-XCOMM The EO territory doesn't exist in ISO 3166.
-XCOMM iso8859-3/XLC_LOCALE: eo_EO.ISO8859-3
+iso8859-3/XLC_LOCALE: eo_EO.ISO8859-3
iso8859-3/XLC_LOCALE: eo_XX.ISO8859-3
iso8859-1/XLC_LOCALE: es_AR.ISO8859-1
iso8859-1/XLC_LOCALE: es_BO.ISO8859-1
@@ -126,8 +114,6 @@ 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
-iso8859-1/XLC_LOCALE: eu_FR.ISO8859-1
-iso8859-15/XLC_LOCALE: eu_FR.ISO8859-15
isiri-3342/XLC_LOCALE: fa_IR.ISIRI-3342
iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1
iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15
@@ -176,7 +162,6 @@ ko/XLC_LOCALE: ko_KR.eucKR
iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14
iso8859-15/XLC_LOCALE: kw_GB.ISO8859-15
-iso8859-10/XLC_LOCALE: lg_UG.ISO8859-10
ibm-cp1133/XLC_LOCALE: lo_LA.IBM-CP1133
mulelao-1/XLC_LOCALE: lo_LA.MULELAO-1
iso8859-4/XLC_LOCALE: lt_LT.ISO8859-4
@@ -204,12 +189,8 @@ iso8859-1/XLC_LOCALE: ny_NO.ISO8859-1
iso8859-1/XLC_LOCALE: ny_NO.ISO8859-15
iso8859-1/XLC_LOCALE: oc_FR.ISO8859-1
iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15
-iso8859-1/XLC_LOCALE: om_KE.ISO8859-1
-XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-XCOMM This is not an ISO language code defined for it, and the GNU C Library
-XCOMM doesn't support it.
-XCOMM iso8859-1/XLC_LOCALE: pd_DE.ISO8859-1
-Iso8859-1/XLC_LOCALE: ph_PH.ISO8859-1
+iso8859-1/XLC_LOCALE: pd_DE.ISO8859-1
+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-1/XLC_LOCALE: pt_BR.ISO8859-1
@@ -219,15 +200,11 @@ 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
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-1/XLC_LOCALE: so_DJ.ISO8859-1
-iso8859-1/XLC_LOCALE: so_KE.ISO8859-1
-iso8859-1/XLC_LOCALE: so_SO.ISO8859-1
iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2
iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2
iso8859-5/XLC_LOCALE: sr_CS.ISO8859-5
@@ -242,8 +219,8 @@ 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-c/XLC_LOCALE: tg_TJ.KOI8-C
-iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
th_TH/XLC_LOCALE: th_TH.TIS620
+iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
iso8859-15/XLC_LOCALE: tn_ZA.ISO8859-15
iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9
@@ -254,7 +231,6 @@ 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
@@ -270,17 +246,10 @@ 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_CN/XLC_LOCALE: zh_SG.gb2312
-zh_CN.gbk/XLC_LOCALE: zh_SG.gbk
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.
-XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like
-XCOMM "3".
-en_US.UTF-8/XLC_LOCALE: a3_AZ.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: af_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: am_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8
@@ -305,13 +274,13 @@ en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
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
en_US.UTF-8/XLC_LOCALE: br_FR.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: ca_FR.UTF-8
@@ -330,26 +299,18 @@ en_US.UTF-8/XLC_LOCALE: el_CY.UTF-8
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
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
-XCOMM The EO territory doesn't exist in ISO 3166.
-XCOMM en_US.UTF-8/XLC_LOCALE: eo_EO.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
en_US.UTF-8/XLC_LOCALE: es_BO.UTF-8
@@ -373,7 +334,6 @@ 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
en_US.UTF-8/XLC_LOCALE: eu_ES.UTF-8
-en_US.UTF-8/XLC_LOCALE: eu_FR.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
@@ -384,8 +344,6 @@ 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: gez_ER.UTF-8
-en_US.UTF-8/XLC_LOCALE: gez_ET.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
@@ -400,12 +358,10 @@ en_US.UTF-8/XLC_LOCALE: is_IS.UTF-8
en_US.UTF-8/XLC_LOCALE: it_CH.UTF-8
en_US.UTF-8/XLC_LOCALE: it_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
-en_US.UTF-8/XLC_LOCALE: iw_IL.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: kl_GL.UTF-8
en_US.UTF-8/XLC_LOCALE: kk_KZ.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@devanagari.UTF-8
@@ -419,31 +375,23 @@ 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: 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: 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
-XCOMM ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
-XCOMM See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
-XCOMM en_US.UTF-8/XLC_LOCALE: ny_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: 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: or_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: pa_PK.UTF-8
-XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-XCOMM This is not an ISO language code defined for it, and the GNU C Library
-XCOMM doesn't support it.
-XCOMM en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
-XCOMM en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
+en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
+en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
@@ -457,13 +405,11 @@ 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@devanagari.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
-en_US.UTF-8/XLC_LOCALE: sid_ET.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: sk_SK.UTF-8
en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8
-en_US.UTF-8/XLC_LOCALE: so_ET.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
@@ -479,7 +425,6 @@ 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: tig_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: tl_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: tn_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index a75a161..bd938aa 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -1,3 +1,4275 @@
-include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
-<dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
+XCOMM UTF-8 (Unicode) compose sequence
+XCOMM David.Monniaux@ens.fr
+XCOMM
+XCOMM Modified for Brazilian Portuguese by Gustavo Noronha Silva <kov@debian.org>
+
+XCOMM Part 1 - Manual definitions
+
+XCOMM Spacing versions of dead accents
+<dead_tilde> <space> : "~" asciitilde
+<dead_tilde> <dead_tilde> : "~" asciitilde
+<dead_acute> <space> : "'" apostrophe
+<dead_acute> <dead_acute> : "´" acute
+<dead_grave> <space> : "`" grave
+<dead_grave> <dead_grave> : "`" grave
+<dead_circumflex> <space> : "^" asciicircum
+<dead_circumflex> <dead_circumflex> : "^" asciicircum
+<dead_abovering> <space> : "°" degree
+<dead_abovering> <dead_abovering> : "°" degree
+<dead_macron> <space> : "¯" macron
+<dead_macron> <dead_macron> : "¯" macron
+<dead_breve> <space> : "˘" breve
+<dead_breve> <dead_breve> : "˘" breve
+<dead_abovedot> <space> : "˙" abovedot
+<dead_abovedot> <dead_abovedot> : "˙" abovedot
+<dead_diaeresis> <dead_diaeresis> : "¨" diaeresis
+<dead_diaeresis> <space> : "\"" quotedbl
+<dead_doubleacute> <space> : "˝" U2dd
+<dead_doubleacute> <dead_doubleacute> : "˝" U2dd
+<dead_caron> <space> : "ˇ" caron
+<dead_caron> <dead_caron> : "ˇ" caron
+<dead_cedilla> <space> : "¸" cedilla
+<dead_cedilla> <dead_cedilla> : "¸" cedilla
+<dead_ogonek> <space> : "˛" ogonek
+<dead_ogonek> <dead_ogonek> : "˛" ogonek
+<dead_iota> <space> : "ͺ" U37a
+<dead_iota> <dead_iota> : "ͺ" U37a
+
+XCOMM ASCII characters that may be difficult to access
+XCOMM on some keyboards.
+<Multi_key> <plus> <plus> : "#" numbersign
+<Multi_key> <apostrophe> <space> : "'" apostrophe
+<Multi_key> <space> <apostrophe> : "'" apostrophe
+<Multi_key> <A> <T> : "@" at
+<Multi_key> <parenleft> <parenleft> : "[" bracketleft
+<Multi_key> <slash> <slash> : "\\" backslash
+<Multi_key> <slash> <less> : "\\" backslash
+<Multi_key> <less> <slash> : "\\" backslash
+<Multi_key> <parenright> <parenright> : "]" bracketright
+
+<Multi_key> <asciicircum> <space> : "^" asciicircum
+<Multi_key> <space> <asciicircum> : "^" asciicircum
+<Multi_key> <greater> <space> : "^" asciicircum
+<Multi_key> <space> <greater> : "^" asciicircum
+
+<Multi_key> <grave> <space> : "`" grave
+<Multi_key> <space> <grave> : "`" grave
+
+<Multi_key> <parenleft> <minus> : "{" braceleft
+<Multi_key> <minus> <parenleft> : "{" braceleft
+
+<Multi_key> <slash> <asciicircum> : "|" bar
+<Multi_key> <asciicircum> <slash> : "|" bar
+<Multi_key> <V> <L> : "|" bar
+<Multi_key> <L> <V> : "|" bar
+<Multi_key> <v> <l> : "|" bar
+<Multi_key> <l> <v> : "|" bar
+
+<Multi_key> <parenright> <minus> : "}" braceright
+<Multi_key> <minus> <parenright> : "}" braceright
+
+<Multi_key> <asciitilde> <space> : "~" asciitilde
+<Multi_key> <space> <asciitilde> : "~" asciitilde
+<Multi_key> <minus> <space> : "~" asciitilde
+<Multi_key> <space> <minus> : "~" asciitilde
Reply to: