i18n: Bring locale.dir and compose.dir in sync.

Some entries for locale/encoding combinations were missing from
either file or just misspelled, some entries were wrong or just
aliases.

Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3 files changed, 87 insertions, 17 deletions

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 427c0664..3d48e504 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -7,6 +7,7 @@ XCOMM
 iso8859-1/Compose:		C
 iso8859-1/Compose:		af_ZA.ISO8859-1
 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
@@ -19,13 +20,17 @@ 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
 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
+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
@@ -46,6 +51,8 @@ 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
@@ -54,16 +61,26 @@ iso8859-1/Compose:		de_LI.ISO8859-1
 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_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_EN.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-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
@@ -71,6 +88,8 @@ 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_EO.ISO8859-3
 iso8859-3/Compose:		eo_XX.ISO8859-3
 iso8859-1/Compose:		es_AR.ISO8859-1
 iso8859-1/Compose:		es_BO.ISO8859-1
@@ -86,12 +105,19 @@ iso8859-1/Compose:		es_HN.ISO8859-1
 iso8859-1/Compose:		es_MX.ISO8859-1
 iso8859-1/Compose:		es_NI.ISO8859-1
 iso8859-1/Compose:		es_PA.ISO8859-1
+iso8859-15/Compose:		es_PA.ISO8859-15
 iso8859-1/Compose:		es_PE.ISO8859-1
+iso8859-15/Compose:		es_PE.ISO8859-15
 iso8859-1/Compose:		es_PR.ISO8859-1
 iso8859-1/Compose:		es_PY.ISO8859-1
+iso8859-15/Compose:		es_PY.ISO8859-15
 iso8859-1/Compose:		es_SV.ISO8859-1
+iso8859-15/Compose:		es_SV.ISO8859-15
+iso8859-1/Compose:		es_US.ISO8859-1
 iso8859-1/Compose:		es_UY.ISO8859-1
+iso8859-15/Compose:		es_UY.ISO8859-15
 iso8859-1/Compose:		es_VE.ISO8859-1
+iso8859-15/Compose:		es_VE.ISO8859-15
 iso8859-1/Compose:		et_EE.ISO8859-1
 iso8859-4/Compose:		et_EE.ISO8859-4
 iso8859-13/Compose:		et_EE.ISO8859-13
@@ -141,6 +167,8 @@ iso8859-15/Compose:		it_IT.ISO8859-15
 ja/Compose:			ja_JP.eucJP
 ja.SJIS/Compose:		ja_JP.SJIS
 ja.JIS/Compose:			ja_JP.JIS7
+ja.S90/Compose:			ja_JP.S90
+ja.U90/Compose:			ja_JP.U90
 georgian-academy/Compose:	ka_GE.GEORGIAN-ACADEMY
 georgian-ps/Compose:		ka_GE.GEORGIAN-PS
 iso8859-1/Compose:		kl_GL.ISO8859-1
@@ -151,7 +179,6 @@ 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-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
@@ -178,7 +205,9 @@ iso8859-15/Compose:		ny_NO.ISO8859-15
 iso8859-1/Compose:		oc_FR.ISO8859-1
 iso8859-15/Compose:		oc_FR.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
@@ -190,16 +219,17 @@ 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-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
+microsoft-cp1251/Compose:	sr_YU.CP1251
 iso8859-5/Compose:		sr_YU.ISO8859-5
 iso8859-1/Compose:		ss_ZA.ISO8859-1
 iso8859-1/Compose:		st_ZA.ISO8859-1
@@ -210,34 +240,39 @@ 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-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
+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
+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.CP1256
+microsoft-cp1255/Compose:	yi_US.CP1255
 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_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
 XCOMM
 en_US.UTF-8/Compose:		af_ZA.UTF-8
+am_ET.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
@@ -251,22 +286,26 @@ 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:		as_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:		be_BY.UTF-8
 en_US.UTF-8/Compose:		bg_BG.UTF-8
 en_US.UTF-8/Compose:		bn_IN.UTF-8
+en_US.UTF-8/Compose:		bn_BD.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:		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
 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
@@ -277,17 +316,27 @@ 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_DK.UTF-8
 en_US.UTF-8/Compose:		en_CA.UTF-8
 en_US.UTF-8/Compose:		en_GB.UTF-8
+en_US.UTF-8/Compose:		en_EN.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_EO.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
@@ -356,6 +405,7 @@ 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:		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
@@ -382,7 +432,9 @@ 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:		si_LK.UTF-8
 en_US.UTF-8/Compose:		sk_SK.UTF-8
 en_US.UTF-8/Compose:		sl_SI.UTF-8
@@ -399,6 +451,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
 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:		tl_PH.UTF-8
 en_US.UTF-8/Compose:		tn_ZA.UTF-8
 en_US.UTF-8/Compose:		tr_TR.UTF-8
@@ -406,6 +460,7 @@ en_US.UTF-8/Compose:		ts_ZA.UTF-8
 en_US.UTF-8/Compose:		tt_RU.UTF-8
 en_US.UTF-8/Compose:		uk_UA.UTF-8
 en_US.UTF-8/Compose:		ur_PK.UTF-8
+en_US.UTF-8/Compose:		ur_IN.UTF-8
 en_US.UTF-8/Compose:		uz_UZ.UTF-8
 en_US.UTF-8/Compose:		ve_ZA.UTF-8
 en_US.UTF-8/Compose:		vi_VN.UTF-8
@@ -416,6 +471,4 @@ zh_CN.UTF-8/Compose:		zh_CN.UTF-8
 zh_HK.UTF-8/Compose:		zh_HK.UTF-8
 zh_TW.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
-am_ET.UTF-8/Compose:		am_ET.UTF-8
+en_US.UTF-8/Compose:		zh_SG.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 26a2cba1..c9d2d398 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -303,6 +303,7 @@ en_BE:						en_BE.ISO8859-1
 en_BE@euro:					en_BE.ISO8859-15
 en_BE.utf8:					en_BE.UTF-8
 en_BW:						en_BW.ISO8859-1
+en_BW.utf8:					en_BW.UTF-8
 en_BW.iso88591:					en_BW.ISO8859-1
 en_BW.ISO-8859-1:				en_BW.ISO8859-1
 en_CA:						en_CA.ISO8859-1
@@ -310,6 +311,7 @@ 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_GB:						en_GB.ISO8859-1
 en_GB.88591:					en_GB.ISO8859-1
 en_GB.88591.en:					en_GB.ISO8859-1
@@ -325,6 +327,7 @@ 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
 en_IE.ISO-8859-1:				en_IE.ISO8859-1
@@ -334,15 +337,18 @@ 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.utf8:					en_IN.UTF-8
 en_IN:						en_IN.ISO8859-1
 en_NZ:						en_NZ.ISO8859-1
 en_NZ.iso88591:					en_NZ.ISO8859-1
 en_NZ.ISO-8859-1:				en_NZ.ISO8859-1
 en_NZ.utf8:					en_NZ.UTF-8
 en_PH:						en_PH.ISO8859-1
+en_PH.utf8:					en_PH.UTF-8
 en_PH.iso88591:					en_PH.ISO8859-1
 en_PH.ISO-8859-1:				en_PH.ISO8859-1
 en_SG:						en_SG.ISO8859-1
+en_SG.utf8:					en_SG.UTF-8
 en_SG.iso88591:					en_SG.ISO8859-1
 en_SG.ISO-8859-1:				en_SG.ISO8859-1
 en_US:						en_US.ISO8859-1
@@ -368,6 +374,7 @@ en_ZA.iso885915:				en_ZA.ISO8859-15
 en_ZA.ISO-8859-15:				en_ZA.ISO8859-15
 en_ZA.utf8:					en_ZA.UTF-8
 en_ZW:						en_ZW.ISO8859-1
+en_ZW.utf8:					en_ZS.UTF-8
 en_ZW.iso88591:					en_ZW.ISO8859-1
 en_ZW.ISO-8859-1:				en_ZW.ISO8859-1
 eo:						eo_XX.ISO8859-3
@@ -1176,6 +1183,10 @@ zh_HK.Big5_hkscs:				zh_HK.big5hkscs
 zh_HK.Big5HKSCS:				zh_HK.big5hkscs
 zh_HK.BIG5-HKSCS:				zh_HK.big5hkscs
 zh_HK.BIG5_HKSCS:				zh_HK.big5hkscs
+zh_HK.Big5-HKSCS:				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:					zh_HK.big5
 zh_HK.utf8:					zh_HK.UTF-8
 ZH_HK.UTF-8:					zh_HK.UTF-8
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index fa3c30f0..8f9a355a 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -48,7 +48,6 @@ 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
@@ -60,6 +59,7 @@ 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-1/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
@@ -158,6 +158,7 @@ iso8859-2/XLC_LOCALE:			hr_HR.ISO8859-2
 iso8859-2/XLC_LOCALE:			hu_HU.ISO8859-2
 armscii-8/XLC_LOCALE:			hy_AM.ARMSCII-8
 iso8859-1/XLC_LOCALE:			id_ID.ISO8859-1
+iso8859-1/XLC_LOCALE:			id_ID.ISO8859-15
 iso8859-1/XLC_LOCALE:			is_IS.ISO8859-1
 iso8859-15/XLC_LOCALE:			is_IS.ISO8859-15
 iso8859-1/XLC_LOCALE:			it_CH.ISO8859-1
@@ -261,10 +262,7 @@ 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_TW.big5/XLC_LOCALE:			zh_TW.big5
 zh_TW/XLC_LOCALE:			zh_TW.eucTW
 iso8859-1/XLC_LOCALE:			zu_ZA.ISO8859-1
@@ -317,17 +315,25 @@ 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_EN.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
 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