Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libX11 mesa pixman git update 10 dec 2012

Conflicts:
	fontconfig/src/fcxml.c

20 files changed, 405 insertions, 465 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index a45f9d956..fe3179948 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -439,7 +439,7 @@ locales="\
  iso8859-1    iso8859-10  iso8859-11  iso8859-13   iso8859-14   iso8859-15 \
  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.S90       ja.SJIS     ja.U90      ko           koi8-c       koi8-r \
+ ja.SJIS      ko          koi8-c      koi8-r                                  \
  koi8-u       ko_KR.UTF-8 microsoft-cp1251         microsoft-cp1255 \
  microsoft-cp1256         mulelao-1   nokhchi-1    pt_BR.UTF-8  ru_RU.UTF-8 \
  tatar-cyr    th_TH       th_TH.UTF-8 tscii-0      vi_VN.tcvn   vi_VN.viscii \
diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre
index 14a2fa987..ef9a519bc 100644
--- a/libX11/nls/compose.dir.pre
+++ b/libX11/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:			a3_AZ.KOI8-C
+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
@@ -151,14 +177,12 @@ 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
 iso8859-13/Compose:		lv_LV.ISO8859-13
 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
 iso8859-1/Compose:		ms_MY.ISO8859-1
 iso8859-3/Compose:		mt_MT.ISO8859-3
@@ -179,7 +203,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
@@ -191,16 +217,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
@@ -211,34 +238,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
@@ -252,23 +284,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:		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_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
@@ -279,17 +314,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
@@ -337,12 +382,13 @@ 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:		ja_JP.UTF-8
+ja_JP.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:		kl_GL.UTF-8
+km_KH.UTF-8/Compose:		mk_KH.UTF-8
 en_US.UTF-8/Compose:		kn_IN.UTF-8
-en_US.UTF-8/Compose:		ko_KR.UTF-8
+ko_KR.UTF-8/Compose:		ko_KR.UTF-8
 en_US.UTF-8/Compose:		ks_IN.UTF-8
 en_US.UTF-8/Compose:		ks_IN@devanagari.UTF-8
 en_US.UTF-8/Compose:		kw_GB.UTF-8
@@ -357,6 +403,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
@@ -377,18 +424,20 @@ 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
 en_US.UTF-8/Compose:		ro_RO.UTF-8
-en_US.UTF-8/Compose:		ru_RU.UTF-8
+ru_RU.UTF-8/Compose:		ru_RU.UTF-8
 en_US.UTF-8/Compose:		ru_UA.UTF-8
 en_US.UTF-8/Compose:		rw_RW.UTF-8
 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
 en_US.UTF-8/Compose:		sq_AL.UTF-8
-en_US.UTF-8/Compose:		sr_CS.UTF-8
+sr_CS.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
@@ -399,7 +448,9 @@ 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
-en_US.UTF-8/Compose:		th_TH.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
@@ -407,14 +458,15 @@ 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
 en_US.UTF-8/Compose:		wa_BE.UTF-8
 en_US.UTF-8/Compose:		yi_US.UTF-8
 en_US.UTF-8/Compose:		xh_ZA.UTF-8
-en_US.UTF-8/Compose:		zh_TW.UTF-8
+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
-
+en_US.UTF-8/Compose:		zh_SG.UTF-8
diff --git a/libX11/nls/ja.S90/XI18N_OBJS b/libX11/nls/ja.S90/XI18N_OBJS
deleted file mode 100644
index d8f0fdd99..000000000
--- a/libX11/nls/ja.S90/XI18N_OBJS
+++ /dev/null
@@ -1,7 +0,0 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-#
-#	XI18N objects table for ja.S90 locale
-#
-XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
-XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
-XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/libX11/nls/ja.S90/XLC_LOCALE.pre b/libX11/nls/ja.S90/XLC_LOCALE.pre
deleted file mode 100644
index cb4e49d13..000000000
--- a/libX11/nls/ja.S90/XLC_LOCALE.pre
+++ /dev/null
@@ -1,150 +0,0 @@
-XCOMM Copyright 1995 by FUJITSU LIMITED
-XCOMM This is source code modified by FUJITSU LIMITED under the Joint
-XCOMM Development Agreement for the CDEnext PST.
-XCOMM This is unpublished proprietary source code of FUJITSU LIMITED
-XCOMM
-XCOMM NLS-DB for ja_JP.S90
-
-XCOMM
-XCOMM	XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0	{
-	charset_name	u90x03.1991-0
-	side		GL
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x28\x32
-	encoding_name	fujitsu.U90X03
-}
-
-csd1	{
-	charset_name	u90x03.1991-0
-	side		GR
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x2f\x32
-	encoding_name	fujitsu.U90X03
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-XCOMM 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name	JISX0201.1976-0:GL
-	}
-	font	{
-		primary		JISX0201.1976-0:GL
-		substitute	ISO8859-1:GL
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs1 class (Kanji)
-fs1	{
-	charset	{
-		name	JISX0208.1983-0:GL
-		udc_area \x7521,\x7e7e
-	}
-	font	{
-		primary		fujitsu.u90x01.1991-0:GL,[\x2121,\x747e];\
-				fujitsu.u90x03.1991-0:GL,[\x7521,\x7e7e]->\x6521
-                substitute      u90x01.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-		vertical_map	u90x01.1991-0.2:GL,\
-			[\x2122,\x2125]->\x7d21,[\x2131,\x2132]->\x7d25,\
-			[\x213c,\x213e]->\x7d27,[\x2141,\x215b]->\x7d2a,\
-			[\x2421,\x2421]->\x7d45,[\x2423,\x2423]->\x7d46,\
-			[\x2425,\x2425]->\x7d47,[\x2427,\x2427]->\x7d48,\
-			[\x2429,\x2429]->\x7d49,[\x2443,\x2443]->\x7d4a,\
-			[\x2463,\x2463]->\x7d4b,[\x2465,\x2465]->\x7d4c,\
-			[\x2467,\x2467]->\x7d4d,[\x246e,\x246e]->\x7d4e,\
-			[\x2521,\x2521]->\x7d4f,[\x2523,\x2523]->\x7d50,\
-			[\x2525,\x2525]->\x7d51,[\x2527,\x2527]->\x7d52,\
-			[\x2529,\x2529]->\x7d53,[\x2543,\x2543]->\x7d54,\
-			[\x2563,\x2563]->\x7d55,[\x2565,\x2565]->\x7d56,\
-			[\x2567,\x2567]->\x7d57,[\x256e,\x256e]->\x7d58,\
-			[\x2575,\x2576]->\x7d59,[\x2475,\x2476]->\x7d5b
-	}
-}
-XCOMM 	fs2 class (Half Kana)
-fs2	{
-	charset	{
-		name		JISX0201.1976-0:GR
-        }
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs3 class (JEF Kanji + User Defined Character)
-fs3	{
-	charset	{
-		name	u90x03.1991-0:GR; u90x03.1991-0:GL
-		udc_area	\x6521,\x787e
-	}
-	font	{
-		primary		fujitsu.u90x03.1991-0:GL
-                substitute      u90x03.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-	}
-}
-END XLC_FONTSET
-
-XCOMM 
-XCOMM 	XLC_XLOCALE category
-XCOMM 
-XLC_XLOCALE
-
-XCOMM encoding_name		ja.euc
-encoding_name ja_JP.S90
-mb_cur_max		3
-state_depend_encoding	False
-
-wc_encoding_mask	\x30000000
-wc_shift_bits		7
-
-
-XCOMM 	cs0 class
-cs0	{
-	side		GL:Default
-	length		1
-	wc_encoding	\x00000000
-	ct_encoding	JISX0201.1976-0:GL; ISO8859-1:GL
-}
-
-XCOMM 	cs1 class
-cs1	{
-	side		GR:Default
-	length		2
-	wc_encoding	\x30000000
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-
-XCOMM 	cs2 class
-cs2	{
-	side		GR
-	length		1
-	mb_encoding	<SS> \x8e
-	wc_encoding	\x10000000
-	ct_encoding	JISX0201.1976-0:GR
-}
-XCOMM 	cs3 class
-cs3	{
-	side		GR
-	length		2
-	mb_encoding	<SS> \x8f
-	wc_encoding	\x20000000
-	ct_encoding	u90x03.1991-0:GR; u90x03.1991-0:GL
-}
-END XLC_XLOCALE
diff --git a/libX11/nls/ja.U90/XI18N_OBJS b/libX11/nls/ja.U90/XI18N_OBJS
deleted file mode 100644
index 8c766a958..000000000
--- a/libX11/nls/ja.U90/XI18N_OBJS
+++ /dev/null
@@ -1,7 +0,0 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-#
-#	XI18N objects table for ja.U90 locale
-#
-XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
-XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
-XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/libX11/nls/ja.U90/XLC_LOCALE.pre b/libX11/nls/ja.U90/XLC_LOCALE.pre
deleted file mode 100644
index 5d8fd3c0a..000000000
--- a/libX11/nls/ja.U90/XLC_LOCALE.pre
+++ /dev/null
@@ -1,151 +0,0 @@
-XCOMM Copyright 1995 by FUJITSU LIMITED
-XCOMM This is source code modified by FUJITSU LIMITED under the Joint
-XCOMM Development Agreement for the CDEnext PST.
-XCOMM This is unpublished proprietary source code of FUJITSU LIMITED
-XCOMM
-XCOMM NLS-DB for ja_JP.U90
-
-XCOMM
-XCOMM	XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0	{
-	charset_name	u90x03.1991-0
-	side		GL
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x28\x32
-	encoding_name	fujitsu.U90X03
-}
-
-csd1	{
-	charset_name	u90x03.1991-0
-	side		GR
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x2f\x32
-	encoding_name	fujitsu.U90X03
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-XCOMM 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name	JISX0201.1976-0:GL
-	}
-	font	{
-		primary		JISX0201.1976-0:GL
-		substitute	ISO8859-1:GL
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs1 class (Kanji)
-fs1	{
-	charset	{
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-                primary         fujitsu.u90x01.1991-0:GL
-XCOMM		primary		JISX0208.1983-0:GL
-                substitute	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR;\
-				u90x01.1991-0:GL
-		vertical_map	u90x01.1991-0.2:GL,\
-			[\x2122,\x2125]->\x7d21,[\x2131,\x2132]->\x7d25,\
-			[\x213c,\x213e]->\x7d27,[\x2141,\x215b]->\x7d2a,\
-			[\x2421,\x2421]->\x7d45,[\x2423,\x2423]->\x7d46,\
-			[\x2425,\x2425]->\x7d47,[\x2427,\x2427]->\x7d48,\
-			[\x2429,\x2429]->\x7d49,[\x2443,\x2443]->\x7d4a,\
-			[\x2463,\x2463]->\x7d4b,[\x2465,\x2465]->\x7d4c,\
-			[\x2467,\x2467]->\x7d4d,[\x246e,\x246e]->\x7d4e,\
-			[\x2521,\x2521]->\x7d4f,[\x2523,\x2523]->\x7d50,\
-			[\x2525,\x2525]->\x7d51,[\x2527,\x2527]->\x7d52,\
-			[\x2529,\x2529]->\x7d53,[\x2543,\x2543]->\x7d54,\
-			[\x2563,\x2563]->\x7d55,[\x2565,\x2565]->\x7d56,\
-			[\x2567,\x2567]->\x7d57,[\x256e,\x256e]->\x7d58,\
-			[\x2575,\x2576]->\x7d59,[\x2475,\x2476]->\x7d5b
-	}
-}
-XCOMM 	fs2 class (Half Kana)
-fs2	{
-	charset	{
-		name		JISX0201.1976-0:GR
-        }
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs3 class (JEF Kanji + User Defined Character)
-fs3	{
-	charset	{
-		name	u90x03.1991-0:GR; u90x03.1991-0:GL
-		udc_area	\x6521,\x787e
-	}
-	font	{
-                primary         fujitsu.u90x03.1991-0:GL
-                substitute      u90x03.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-	}
-}
-END XLC_FONTSET
-
-XCOMM 
-XCOMM 	XLC_XLOCALE category
-XCOMM 
-XLC_XLOCALE
-
-XCOMM encoding_name		ja.euc
-encoding_name ja_JP.U90
-mb_cur_max		3
-state_depend_encoding	False
-
-wc_encoding_mask	\x30000000
-wc_shift_bits		7
-
-
-XCOMM 	cs0 class
-cs0	{
-	side		GL:Default
-	length		1
-	wc_encoding	\x00000000
-	ct_encoding	JISX0201.1976-0:GL; ISO8859-1:GL
-}
-
-XCOMM 	cs1 class
-cs1	{
-	side		GR:Default
-	length		2
-	wc_encoding	\x30000000
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-
-XCOMM 	cs2 class
-cs2	{
-	side		GR
-	length		1
-	mb_encoding	<SS> \x8e
-	wc_encoding	\x10000000
-	ct_encoding	JISX0201.1976-0:GR
-}
-
-XCOMM 	cs3 class
-cs3	{
-	side		GR
-	length		2
-	mb_encoding	<SS> \x8f
-	wc_encoding	\x20000000
-	ct_encoding	u90x03.1991-0:GR; u90x03.1991-0:GL
-}
-
-END XLC_XLOCALE
diff --git a/libX11/nls/ja_JP.UTF-8/Compose.pre b/libX11/nls/ja_JP.UTF-8/Compose.pre
index e69de29bb..6c2c4114d 100644
--- a/libX11/nls/ja_JP.UTF-8/Compose.pre
+++ b/libX11/nls/ja_JP.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/libX11/nls/km_KH.UTF-8/Compose.pre b/libX11/nls/km_KH.UTF-8/Compose.pre
new file mode 100644
index 000000000..77651d085
--- /dev/null
+++ b/libX11/nls/km_KH.UTF-8/Compose.pre
@@ -0,0 +1,8 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+
+# Khmer digraphs
+<U17ff>	:	"ាំ"
+<U17fe>	:	"ោះ"
+<U17fd>	:	"េះ"
+<U17fc>	:	"ុំ"
+<U17fb>	:	"ុះ"
diff --git a/libX11/nls/km_KH.UTF-8/XI18N_OBJS b/libX11/nls/km_KH.UTF-8/XI18N_OBJS
new file mode 100644
index 000000000..f201bf435
--- /dev/null
+++ b/libX11/nls/km_KH.UTF-8/XI18N_OBJS
@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	        # XLC_open
+XOM	common/xomLTRTTB	_XomGenericOpenOM	# XOM_open
+XIM	common/xiiimp		_SwitchOpenIM		# XIM_open
+XIM	common/xiiimp		_XimpLocalOpenIM	# XIM_open
diff --git a/libX11/nls/ja.S90/Compose.pre b/libX11/nls/km_KH.UTF-8/XLC_LOCALE.pre
index e69de29bb..e69de29bb 100644
--- a/libX11/nls/ja.S90/Compose.pre
+++ b/libX11/nls/km_KH.UTF-8/XLC_LOCALE.pre
diff --git a/libX11/nls/ko_KR.UTF-8/Compose.pre b/libX11/nls/ko_KR.UTF-8/Compose.pre
index e69de29bb..6c2c4114d 100644
--- a/libX11/nls/ko_KR.UTF-8/Compose.pre
+++ b/libX11/nls/ko_KR.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/libX11/nls/locale.alias.pre b/libX11/nls/locale.alias.pre
index 7b3546099..11d93f26e 100644
--- a/libX11/nls/locale.alias.pre
+++ b/libX11/nls/locale.alias.pre
@@ -17,9 +17,11 @@ Cextend.en:					en_US.ISO8859-1
 English_United-States.437:			C
 C.UTF-8:					en_US.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:						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.UTF-8:					az_AZ.UTF-8
 af:						af_ZA.ISO8859-1
 af_ZA:						af_ZA.ISO8859-1
 af_ZA.iso88591:					af_ZA.ISO8859-1
@@ -50,6 +52,7 @@ ar_EG:						ar_EG.ISO8859-6
 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_IQ:						ar_IQ.ISO8859-6
 ar_IQ.iso88596:					ar_IQ.ISO8859-6
@@ -100,6 +103,7 @@ 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
@@ -128,7 +132,9 @@ 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
+bn_IN:						bn_IN.UTF-8
 bn_IN.utf8:					bn_IN.UTF-8
+bo_IN:						bo_IN.UTF-8
 bo_IN.utf8:					bo_IN.UTF-8
 br:						br_FR.ISO8859-1
 br_FR:						br_FR.ISO8859-1
@@ -188,7 +194,7 @@ cs_CS:						cs_CZ.ISO8859-2
 cs_CS.ISO8859-2:				cs_CZ.ISO8859-2
 cs_CZ:						cs_CZ.ISO8859-2
 cs_CZ.iso88592:					cs_CZ.ISO8859-2
-cs_CS.iso8859-2:                                cs_CS.ISO8859-2
+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
@@ -297,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
@@ -304,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
@@ -319,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
@@ -328,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
@@ -362,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
@@ -602,6 +615,7 @@ gl_ES.ISO-8859-15@euro:				gl_ES.ISO8859-15
 gl_ES@euro:					gl_ES.ISO8859-15
 gl_ES.UTF-8@euro:				gl_ES.UTF-8
 gl_ES.utf8:					gl_ES.UTF-8
+gu_IN:						gu_IN.UTF-8
 gu_IN.utf8:					gu_IN.UTF-8
 gv:						gv_GB.ISO8859-1
 gv_GB:						gv_GB.ISO8859-1
@@ -629,6 +643,7 @@ hi_IN.isciidev:					hi_IN.ISCII-DEV
 hi_IN.utf8:					hi_IN.UTF-8
 HI_IN.UTF-8:					hi_IN.UTF-8
 hne:						hne_IN.UTF-8
+hne_IN:						hne_IN.UTF-8
 hne_IN.utf8:					hne_IN.UTF-8
 hr:						hr_HR.ISO8859-2
 hr_HR:						hr_HR.ISO8859-2
@@ -674,6 +689,8 @@ it_IT.ISO-8859-15@euro:				it_IT.ISO8859-15
 it_IT@euro:					it_IT.ISO8859-15
 it_IT.utf8:					it_IT.UTF-8
 it_IT.UTF-8@euro:				it_IT.UTF-8
+XCOMM 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
@@ -684,13 +701,7 @@ iw_IL:						he_IL.ISO8859-8
 Iw_IL:						he_IL.ISO8859-8
 iw_IL.iso88598:					he_IL.ISO8859-8
 iw_IL.ISO-8859-8:				he_IL.ISO8859-8
-#ifndef __uxp__
 ja_JP:						ja_JP.eucJP
-#else /* __uxp__ */
-ja_JP:						ja_JP.U90
-ja_JP.U90:					ja_JP.U90
-ja_JP.S90:					ja_JP.S90
-#endif /* __uxp__ */
 ja:						ja_JP.eucJP
 ja.JIS:						ja_JP.JIS7
 ja.SJIS:					ja_JP.SJIS
@@ -721,7 +732,10 @@ 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_KH:						mk_KH.UTF-8
+km_KH.utf8:					mk_KH.UTF-8
 kn:						kn_IN.UTF-8
+kn_IN:						kn_IN.UTF-8
 kn_IN.utf8:					kn_IN.UTF-8
 ko:						ko_KR.eucKR
 ko.UTF-8:					ko_KR.UTF-8
@@ -734,6 +748,7 @@ ko_KR.euckr:					ko_KR.eucKR
 ko_KR.utf8:					ko_KR.UTF-8
 KO_KR.UTF-8:					ko_KR.UTF-8
 ks:						ks_IN.UTF-8
+ks_IN:						ks_IN.UTF-8
 ks_IN.utf8:					ks_IN.UTF-8
 ks_IN@devanagari:				ks_IN@devanagari.UTF-8
 ks_IN@devanagari.utf8:				ks_IN@devanagari.UTF-8
@@ -748,6 +763,7 @@ kw_GB.ISO-8859-15:				kw_GB.ISO8859-15
 ky:						ky_KG.UTF-8
 ky_KG:							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
 lo_LA.cp1133:					lo_LA.IBM-CP1133
@@ -778,6 +794,7 @@ lv_LV.ISO-8859-13:				lv_LV.ISO8859-13
 lv_LV.ISO_8859-13:				lv_LV.ISO8859-13
 lv_LV.utf8:					lv_LV.UTF-8
 mai:						mai_IN.UTF-8
+mai_IN:						mai_IN.UTF-8
 mai_IN.utf8:					mai_IN.UTF-8
 mi:						mi_NZ.ISO8859-1
 mi_NZ:						mi_NZ.ISO8859-1
@@ -792,6 +809,7 @@ mk_MK.microsoft-cp1251:				mk_MK.CP1251
 mk_MK.MICROSOFT-CP1251:				mk_MK.CP1251
 mk_MK.utf8:					mk_MK.UTF-8
 ml:						ml_IN.UTF-8
+ml_IN:						ml_IN.UTF-8
 ml_IN.utf8:					ml_IN.UTF-8
 mr:						mr_IN.UTF-8
 mr_IN:						mr_IN.UTF-8
@@ -811,6 +829,7 @@ 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
+ne_NP:						ne_NP.UTF-8
 ne_NP.utf8:					ne_NP.UTF-8
 nl:						nl_NL.ISO8859-1
 nl.ISO8859-15:					nl_NL.ISO8859-15
@@ -880,8 +899,10 @@ oc_FR.iso885915:				oc_FR.ISO8859-15
 oc_FR.ISO-8859-15:				oc_FR.ISO8859-15
 oc_FR@euro:					oc_FR.ISO8859-15
 or:						or_IN.UTF-8
+or_IN:						or_IN.UTF-8
 or_IN.utf8:					or_IN.UTF-8
 pa:						pa_IN.UTF-8
+pa_IN:						pa_IN.UTF-8
 pa_IN.utf8:					pa_IN.UTF-8
 pa_PK.utf8:					pa_PK.UTF-8
 pd:						pd_US.ISO8859-1
@@ -961,7 +982,8 @@ 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
-sd:						sd_IN@devanagari.UTF-8
+sd@devanagari:					sd_IN@devanagari.UTF-8
+sd_IN@devanagari:				sd_IN@devanagari.UTF-8
 sd_IN@devanagari.utf8:				sd_IN@devanagari.UTF-8
 se_NO:						se_NO.UTF-8
 se_NO.utf8:					se_NO.UTF-8
@@ -1000,11 +1022,11 @@ sr@cyrillic:					sr_RS.UTF-8
 sr_YU@cyrillic:					sr_RS.UTF-8
 sr_YU.utf8:					sr_RS.UTF-8
 sr_YU.UTF-8@cyrillic:				sr_RS.UTF-8
-sr_CS:						sr_RS.UTF-8
-sr@Latn:					sr_RS.UTF-8@latin
-sr_CS@Latn:					sr_RS.UTF-8@latin
-sr_CS.utf8:					sr_RS.UTF-8
-sr_CS.UTF-8@Latn:				sr_RS.UTF-8@latin
+sr_CS:						sr_CS.UTF-8
+sr@Latn:					sr_CS.UTF-8@latin
+sr_CS@Latn:					sr_CS.UTF-8@latin
+sr_CS.utf8:					sr_CS.UTF-8
+sr_CS.UTF-8@Latn:				sr_CS.UTF-8@latin
 sr_RS:						sr_RS.UTF-8
 sr@latin:					sr_RS.UTF-8@latin
 sr_RS@latin:				sr_RS.UTF-8@latin
@@ -1048,6 +1070,7 @@ ta_IN:						ta_IN.TSCII-0
 ta_IN.tscii:					ta_IN.TSCII-0
 ta_IN.tscii0:					ta_IN.TSCII-0
 te:						te_IN.UTF-8
+te.UTF-8:					te_IN.UTF-8
 te_IN.utf8:					te_IN.UTF-8
 tg:						tg_TJ.KOI8-C
 tg_TJ:						tg_TJ.KOI8-C
@@ -1092,6 +1115,7 @@ uk_UA.microsoft-cp1251:				uk_UA.CP1251
 uk_UA.MICROSOFT-CP1251:				uk_UA.CP1251
 uk_UA.utf8:					uk_UA.UTF-8
 ur:						ur_IN.UTF-8
+ur_IN:						ur_IN.UTF-8
 ur_IN.utf8:					ur_IN.UTF-8
 ur:						ur_PK.CP1256
 ur_PK:						ur_PK.CP1256
@@ -1153,6 +1177,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
@@ -1210,8 +1238,8 @@ german:						de_DE.ISO8859-1
 german.iso88591:				de_CH.ISO8859-1
 greek:						el_GR.ISO8859-7
 greek.iso88597:					el_GR.ISO8859-7
-hebrew:						iw_IL.ISO8859-8
-hebrew.iso88598:				iw_IL.ISO8859-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
@@ -1254,102 +1282,102 @@ 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
-Afrikaans_South Africa.1252:			af_ZA.iso8859-1
-Arabic_Bahrain.1256:				ar_BH.iso8859-6
-Arabic_Algeria.1256:				ar_DZ.iso8859-6
-Arabic_Egypt.1256:				ar_EG.iso8859-6
-Arabic_Iraq.1256:				ar_IQ.iso8859-6
-Arabic_Jordan.1256:				ar_JO.iso8859-6
-Arabic_Kuwait.1256:				ar_KW.iso8859-6
-Arabic_Lebanon.1256:				ar_LB.iso8859-6
-Arabic_Libya.1256:				ar_LY.iso8859-6
-Arabic_Morocco.1256:				ar_MA.iso8859-6
-Arabic_Oman.1256:				ar_OM.iso8859-6
-Arabic_Qatar.1256:				ar_QA.iso8859-6
-Arabic_Saudi Arabia.1256:			ar_SA.iso8859-6
-Arabic_Tunisia.1256:				ar_TN.iso8859-6
-Arabic_Yemen.1256:				ar_YE.iso8859-6
-Belarusian_Belarus.1251:			be_BY.iso8859-5
-Bulgarian_Bulgaria.1251:			bg_BG.iso8859-5
-Catalan_Andorra.1252:				ca_AD.iso8859-1
-Catalan_Spain.1252:				ca_ES.iso8859-1
-Catalan_France.1252:				ca_FR.iso8859-1
-Catalan_Italy.1252:				ca_IT.iso8859-1
-Czech_Czech Republic.1250:			cs_CZ.iso8859-2
-Danish_Denmark.1252:				da_DK.iso8859-1
-German_Austria.1252:				de_AT.iso8859-1
-German_Switzerland.1252:			de_CH.iso8859-1
-German_Germany.1252:				de_DE.iso8859-1
-German_Liechtenstein.1252:			de_LI.iso8859-1
-German_Luxembourg.1252:				de_LU.iso8859-1
-Greek_Greece.1253:				el_GR.iso8859-7
-English_Australia.1252:				en_AU.iso8859-1
-English_Belize.1252:				en_BZ.iso8859-1
-English_Canada.1252:				en_CA.iso8859-1
-English_Ireland.1252:				en_IE.iso8859-1
-English_Jamaica.1252:				en_JM.iso8859-1
-English_New Zealand.1252:			en_NZ.iso8859-1
-English_Trinidad y Tobago.1252:			en_TT.iso8859-1
-English_United Kingdom.1252:			en_UK.iso8859-1
-English_United States.1252:			en_US.iso8859-1
-English_South Africa.1252:			en_ZA.iso8859-1
-Spanish_Argentina.1252:				es_AR.iso8859-1
-Spanish_Bolivia.1252:				es_BO.iso8859-1
-Spanish_Chile.1252:				es_CL.iso8859-1
-Spanish_Colombia.1252:				es_CO.iso8859-1
-Spanish_Costa Rica.1252:			es_CR.iso8859-1
-Spanish_Dominican Republic.1252:		es_DO.iso8859-1
-Spanish_Ecuador.1252:				es_EC.iso8859-1
-Spanish - Modern Sort_Spain.1252:		es_ES.iso8859-1
-Spanish - Traditional Sort_Spain.1252:		es_ES.iso8859-1
-Spanish_Guatemala.1252:				es_GT.iso8859-1
-Spanish_Honduras.1252:				es_HN.iso8859-1
-Spanish_Mexican.1252:				es_MX.iso8859-1
-Spanish_Nicaragua.1252:				es_NI.iso8859-1
-Spanish_Panama.1252:				es_PA.iso8859-1
-Spanish_Paraguay.1252:				es_PY.iso8859-1
-Spanish_Peru.1252:				es_PE.iso8859-1
-Spanish_Puerto Rico.1252:			es_PR.iso8859-1
-Spanish_El Salvador.1252:			es_SV.iso8859-1
-Spanish_Uruguay.1252:				es_UY.iso8859-1
-Spanish_Venezuela.1252:				es_VE.iso8859-1
-Estonian_Estonia.1257:				et_EE.iso8859-13
-Basque_Spain.1252:				eu_ES.iso8859-1
-Finnish_Finland.1252:				fi_FI.iso8859-1
-French_Belgium.1252:				fr_BE.iso8859-1
-French_Canada.1252:				fr_CA.iso8859-1
-French_Switzerland.1252:			fr_CH.iso8859-1
-French_France.1252:				fr_FR.iso8859-1
-French_Luxembourg.1252:				fr_LU.iso8859-1
-Faeroese_Faeroe Islands.1252:			fo_FO.iso8859-1
-Hebrew_Israel.1255:				he_IL.iso8859-8
-Croatian_Croatia.1250:				hr_HR.iso8859-2
-Hungarian_Hungary.1250:				hu_HU.iso8859-2
-Indonesian_Indonesia.1252:			id_ID.iso8859-1
-Icelandic_Iceland.1252:				is_IS.iso8859-1
-Italian_Switzerland.1252:			it_CH.iso8859-1
-Italian_Italy.1252:				it_IT.iso8859-1
+Afrikaans_South Africa.1252:			af_ZA.ISO8859-1
+Arabic_Bahrain.1256:				ar_BH.ISO8859-6
+Arabic_Algeria.1256:				ar_DZ.ISO8859-6
+Arabic_Egypt.1256:				ar_EG.ISO8859-6
+Arabic_Iraq.1256:				ar_IQ.ISO8859-6
+Arabic_Jordan.1256:				ar_JO.ISO8859-6
+Arabic_Kuwait.1256:				ar_KW.ISO8859-6
+Arabic_Lebanon.1256:				ar_LB.ISO8859-6
+Arabic_Libya.1256:				ar_LY.ISO8859-6
+Arabic_Morocco.1256:				ar_MA.ISO8859-6
+Arabic_Oman.1256:				ar_OM.ISO8859-6
+Arabic_Qatar.1256:				ar_QA.ISO8859-6
+Arabic_Saudi Arabia.1256:			ar_SA.ISO8859-6
+Arabic_Tunisia.1256:				ar_TN.ISO8859-6
+Arabic_Yemen.1256:				ar_YE.ISO8859-6
+Belarusian_Belarus.1251:			be_BY.ISO8859-5
+Bulgarian_Bulgaria.1251:			bg_BG.ISO8859-5
+Catalan_Andorra.1252:				ca_AD.ISO8859-1
+Catalan_Spain.1252:				ca_ES.ISO8859-1
+Catalan_France.1252:				ca_FR.ISO8859-1
+Catalan_Italy.1252:				ca_IT.ISO8859-1
+Czech_Czech Republic.1250:			cs_CZ.ISO8859-2
+Danish_Denmark.1252:				da_DK.ISO8859-1
+German_Austria.1252:				de_AT.ISO8859-1
+German_Switzerland.1252:			de_CH.ISO8859-1
+German_Germany.1252:				de_DE.ISO8859-1
+German_Liechtenstein.1252:			de_LI.ISO8859-1
+German_Luxembourg.1252:				de_LU.ISO8859-1
+Greek_Greece.1253:				el_GR.ISO8859-7
+English_Australia.1252:				en_AU.ISO8859-1
+English_Belize.1252:				en_BZ.ISO8859-1
+English_Canada.1252:				en_CA.ISO8859-1
+English_Ireland.1252:				en_IE.ISO8859-1
+English_Jamaica.1252:				en_JM.ISO8859-1
+English_New Zealand.1252:			en_NZ.ISO8859-1
+English_Trinidad y Tobago.1252:			en_TT.ISO8859-1
+English_United Kingdom.1252:			en_UK.ISO8859-1
+English_United States.1252:			en_US.ISO8859-1
+English_South Africa.1252:			en_ZA.ISO8859-1
+Spanish_Argentina.1252:				es_AR.ISO8859-1
+Spanish_Bolivia.1252:				es_BO.ISO8859-1
+Spanish_Chile.1252:				es_CL.ISO8859-1
+Spanish_Colombia.1252:				es_CO.ISO8859-1
+Spanish_Costa Rica.1252:			es_CR.ISO8859-1
+Spanish_Dominican Republic.1252:		es_DO.ISO8859-1
+Spanish_Ecuador.1252:				es_EC.ISO8859-1
+Spanish - Modern Sort_Spain.1252:		es_ES.ISO8859-1
+Spanish - Traditional Sort_Spain.1252:		es_ES.ISO8859-1
+Spanish_Guatemala.1252:				es_GT.ISO8859-1
+Spanish_Honduras.1252:				es_HN.ISO8859-1
+Spanish_Mexican.1252:				es_MX.ISO8859-1
+Spanish_Nicaragua.1252:				es_NI.ISO8859-1
+Spanish_Panama.1252:				es_PA.ISO8859-1
+Spanish_Paraguay.1252:				es_PY.ISO8859-1
+Spanish_Peru.1252:				es_PE.ISO8859-1
+Spanish_Puerto Rico.1252:			es_PR.ISO8859-1
+Spanish_El Salvador.1252:			es_SV.ISO8859-1
+Spanish_Uruguay.1252:				es_UY.ISO8859-1
+Spanish_Venezuela.1252:				es_VE.ISO8859-1
+Estonian_Estonia.1257:				et_EE.ISO8859-13
+Basque_Spain.1252:				eu_ES.ISO8859-1
+Finnish_Finland.1252:				fi_FI.ISO8859-1
+French_Belgium.1252:				fr_BE.ISO8859-1
+French_Canada.1252:				fr_CA.ISO8859-1
+French_Switzerland.1252:			fr_CH.ISO8859-1
+French_France.1252:				fr_FR.ISO8859-1
+French_Luxembourg.1252:				fr_LU.ISO8859-1
+Faeroese_Faeroe Islands.1252:			fo_FO.ISO8859-1
+Hebrew_Israel.1255:				he_IL.ISO8859-8
+Croatian_Croatia.1250:				hr_HR.ISO8859-2
+Hungarian_Hungary.1250:				hu_HU.ISO8859-2
+Indonesian_Indonesia.1252:			id_ID.ISO8859-1
+Icelandic_Iceland.1252:				is_IS.ISO8859-1
+Italian_Switzerland.1252:			it_CH.ISO8859-1
+Italian_Italy.1252:				it_IT.ISO8859-1
 Japanese_Japan.932:				ja_JP.SJIS
 Korean_Korea.949:				ko_KR.EUC
-Lithuanian_Lithuania.1257:			lt_LT.iso8859-13
-Latvian_Latvia.1257:				lv_LV.iso8859-13
-Dutch_Belgium.1252:				nl_BE.iso8859-1
-Dutch_Netherlands.1252:				nl_NL.iso8859-1
-Norwegian (Nynorsk)_Norway.1252:		no_NO.iso8859-1
-Norwegian (Bokm�l)_Norway.1252:			no_NO.iso8859-1
-Polish_Poland.1250:				pl_PL.iso8859-2
-Portuguese_Brazil.1252:				pt_BR.iso8859-1
-Portuguese_Portugal.1252:			pt_PT.iso8859-1
-Romanian_Romania.1250:				ro_RO.iso8859-2
-Russian_Russia.1251:				ru_RU.iso8859-5
-Slovak_Slovakia.1250:				sk_SK.iso8859-2
-Slovene_Slovenia.1250:				sl_SI.iso8859-2
-Albanian_Albania.1250:				sq_AL.iso8859-2
+Lithuanian_Lithuania.1257:			lt_LT.ISO8859-13
+Latvian_Latvia.1257:				lv_LV.ISO8859-13
+Dutch_Belgium.1252:				nl_BE.ISO8859-1
+Dutch_Netherlands.1252:				nl_NL.ISO8859-1
+Norwegian (Nynorsk)_Norway.1252:		no_NO.ISO8859-1
+Norwegian (Bokm�l)_Norway.1252:			no_NO.ISO8859-1
+Polish_Poland.1250:				pl_PL.ISO8859-2
+Portuguese_Brazil.1252:				pt_BR.ISO8859-1
+Portuguese_Portugal.1252:			pt_PT.ISO8859-1
+Romanian_Romania.1250:				ro_RO.ISO8859-2
+Russian_Russia.1251:				ru_RU.ISO8859-5
+Slovak_Slovakia.1250:				sk_SK.ISO8859-2
+Slovene_Slovenia.1250:				sl_SI.ISO8859-2
+Albanian_Albania.1250:				sq_AL.ISO8859-2
 Serbian (Latin)_Serbia.1250:			sr_RS.UTF-8@latin
-Swedish_Finland.1252:				sv_FI.iso8859-1
-Swedish_Sweden.1252:				sv_SE.iso8859-1
-Turkish_Turkey.1254:				tr_TR.iso8859-9
-Ukrainian_Ukraine.1251:				uk_UA.iso8859-5
+Swedish_Finland.1252:				sv_FI.ISO8859-1
+Swedish_Sweden.1252:				sv_SE.ISO8859-1
+Turkish_Turkey.1254:				tr_TR.ISO8859-9
+Ukrainian_Ukraine.1251:				uk_UA.ISO8859-5
 Chinese(PRC)_People's Republic of China.936:	zh_CN.EUC
 Chinese(PRC)_Hong Kong.950:			zh_HK.EUC
 Chinese(Singapore)_Signapore.936:		zh_SG.EUC
@@ -1358,9 +1386,5 @@ Chinese(Taiwan)_Taiwan.950:			zh_TW.EUC
 XCOMM Other miscellaneous locale names
 ISO8859-1:					en_US.ISO8859-1
 ISO-8859-1:					en_US.ISO8859-1
-#ifndef __uxp__
 japan:						ja_JP.eucJP
-#else
-japan:						ja_JP.U90
-#endif
 Japanese-EUC:					ja_JP.eucJP
diff --git a/libX11/nls/locale.dir.pre b/libX11/nls/locale.dir.pre
index e0d9ef7ef..4ec929745 100644
--- a/libX11/nls/locale.dir.pre
+++ b/libX11/nls/locale.dir.pre
@@ -24,6 +24,7 @@ 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
@@ -47,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
@@ -59,15 +59,19 @@ 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
+iso8859-7/XLC_LOCALE:			el_GR.ISO8859-7
+iso8859-4/XLC_LOCALE:			ee_EE.ISO8859-4
 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_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
@@ -85,6 +89,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
 iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
 iso8859-3/XLC_LOCALE:			eo_XX.ISO8859-3
 iso8859-1/XLC_LOCALE:			es_AR.ISO8859-1
@@ -101,13 +106,19 @@ iso8859-1/XLC_LOCALE:			es_HN.ISO8859-1
 iso8859-1/XLC_LOCALE:			es_MX.ISO8859-1
 iso8859-1/XLC_LOCALE:			es_NI.ISO8859-1
 iso8859-1/XLC_LOCALE:			es_PA.ISO8859-1
+iso8859-15/XLC_LOCALE:			es_PA.ISO8859-15
 iso8859-1/XLC_LOCALE:			es_PE.ISO8859-1
+iso8859-15/XLC_LOCALE:			es_PE.ISO8859-15
 iso8859-1/XLC_LOCALE:			es_PR.ISO8859-1
 iso8859-1/XLC_LOCALE:			es_PY.ISO8859-1
+iso8859-15/XLC_LOCALE:			es_PY.ISO8859-15
 iso8859-1/XLC_LOCALE:			es_SV.ISO8859-1
+iso8859-15/XLC_LOCALE:			es_SV.ISO8859-15
 iso8859-1/XLC_LOCALE:			es_US.ISO8859-1
 iso8859-1/XLC_LOCALE:			es_UY.ISO8859-1
+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
@@ -147,9 +158,11 @@ 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
+iso8859-15/XLC_LOCALE:			it_CH.ISO8859-15
 iso8859-1/XLC_LOCALE:			it_IT.ISO8859-1
 iso8859-15/XLC_LOCALE:			it_IT.ISO8859-15
 ja/XLC_LOCALE:				ja_JP.eucJP
@@ -158,6 +171,7 @@ ja.JIS/XLC_LOCALE:			ja_JP.JIS7
 georgian-academy/XLC_LOCALE:		ka_GE.GEORGIAN-ACADEMY
 georgian-ps/XLC_LOCALE:			ka_GE.GEORGIAN-PS
 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
@@ -190,16 +204,21 @@ 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:			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-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-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
@@ -231,6 +250,7 @@ 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
@@ -242,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
@@ -274,7 +291,6 @@ 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
@@ -299,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
@@ -360,8 +384,9 @@ en_US.UTF-8/XLC_LOCALE:			it_IT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			iu_CA.UTF-8
 ja_JP.UTF-8/XLC_LOCALE:			ja_JP.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ka_GE.UTF-8
-en_US.UTF-8/XLC_LOCALE:			kl_GL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kk_KZ.UTF-8
+en_US.UTF-8/XLC_LOCALE:			kl_GL.UTF-8
+en_US.UTF-8/XLC_LOCALE:			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
@@ -445,7 +470,3 @@ zh_HK.UTF-8/XLC_LOCALE:			zh_HK.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_SG.UTF-8
 zh_TW.UTF-8/XLC_LOCALE:			zh_TW.UTF-8
 en_US.UTF-8/XLC_LOCALE:			zu_ZA.UTF-8
-#ifdef __uxp__
-ja.U90/XLC_LOCALE:			ja_JP.U90
-ja.S90/XLC_LOCALE:			ja_JP.S90
-#endif
diff --git a/libX11/nls/sr_CS.UTF-8/Compose.pre b/libX11/nls/sr_CS.UTF-8/Compose.pre
new file mode 100644
index 000000000..119e23ec4
--- /dev/null
+++ b/libX11/nls/sr_CS.UTF-8/Compose.pre
@@ -0,0 +1,128 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+
+# Serbian accented Cyrillic
+# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
+# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
+# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
+# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
+# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
+#
+# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+# ́ - U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+# ̏ - U+030F  <dead_diaeresis>, <dead_doubleacute>
+# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+<dead_grave> <Cyrillic_a>         : "а̀"
+<combining_grave> <Cyrillic_a>    : "а̀"
+<Multi_key> <grave> <Cyrillic_a>  : "а̀"
+<dead_grave> <Cyrillic_A>         : "А̀"
+<combining_grave> <Cyrillic_A>    : "А̀"
+<Multi_key> <grave> <Cyrillic_A>  : "А̀"
+<dead_grave> <Cyrillic_e>         : "ѐ"
+<combining_grave> <Cyrillic_e>    : "ѐ"
+<Multi_key> <grave> <Cyrillic_e>  : "ѐ"
+<dead_grave> <Cyrillic_E>         : "Ѐ"
+<combining_grave> <Cyrillic_E>    : "Ѐ"
+<Multi_key> <grave> <Cyrillic_E>  : "Ѐ"
+<dead_grave> <Cyrillic_i>         : "ѝ"
+<combining_grave> <Cyrillic_i>    : "ѝ"
+<Multi_key> <grave> <Cyrillic_i>  : "ѝ"
+<dead_grave> <Cyrillic_I>         : "Ѝ"
+<combining_grave> <Cyrillic_I>    : "Ѝ"
+<Multi_key> <grave> <Cyrillic_I>  : "Ѝ"
+<dead_grave> <Cyrillic_o>         : "о̀"
+<combining_grave> <Cyrillic_o>    : "о̀"
+<Multi_key> <grave> <Cyrillic_o>  : "о̀"
+<dead_grave> <Cyrillic_O>         : "О̀"
+<combining_grave> <Cyrillic_O>    : "О̀"
+<Multi_key> <grave> <Cyrillic_O>  : "О̀"
+<dead_grave> <Cyrillic_u>         : "у̀"
+<combining_grave> <Cyrillic_u>    : "у̀"
+<Multi_key> <grave> <Cyrillic_u>  : "у̀"
+<dead_grave> <Cyrillic_U>         : "У̀"
+<combining_grave> <Cyrillic_U>    : "У̀"
+<Multi_key> <grave> <Cyrillic_U>  : "У̀"
+# ́ - dugouzlazni, U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+<dead_acute> <Cyrillic_a>              : "а́"
+<combining_acute> <Cyrillic_a>         : "а́"
+<Multi_key> <acute> <Cyrillic_a>       : "а́"
+<Multi_key> <apostrophe> <Cyrillic_a>  : "а́"
+<dead_acute> <Cyrillic_A>              : "А́"
+<combining_acute> <Cyrillic_A>         : "А́"
+<Multi_key> <acute> <Cyrillic_A>       : "А́"
+<Multi_key> <apostrophe> <Cyrillic_A>  : "А́"
+<dead_acute> <Cyrillic_e>              : "е́"
+<combining_acute> <Cyrillic_e>         : "е́"
+<Multi_key> <acute> <Cyrillic_e>       : "е́"
+<Multi_key> <apostrophe> <Cyrillic_e>  : "е́"
+<dead_acute> <Cyrillic_E>              : "Е́"
+<combining_acute> <Cyrillic_E>         : "Е́"
+<Multi_key> <acute> <Cyrillic_E>       : "Е́"
+<Multi_key> <apostrophe> <Cyrillic_E>  : "Е́"
+<dead_acute> <Cyrillic_i>              : "и́"
+<combining_acute> <Cyrillic_i>         : "и́"
+<Multi_key> <acute> <Cyrillic_i>       : "и́"
+<Multi_key> <apostrophe> <Cyrillic_i>  : "и́"
+<dead_acute> <Cyrillic_I>              : "И́"
+<combining_acute> <Cyrillic_I>         : "И́"
+<Multi_key> <acute> <Cyrillic_I>       : "И́"
+<Multi_key> <apostrophe> <Cyrillic_I>  : "И́"
+<dead_acute> <Cyrillic_o>              : "о́"
+<combining_acute> <Cyrillic_o>         : "о́"
+<Multi_key> <acute> <Cyrillic_o>       : "о́"
+<Multi_key> <apostrophe> <Cyrillic_o>  : "о́"
+<dead_acute> <Cyrillic_O>              : "О́"
+<combining_acute> <Cyrillic_O>         : "О́"
+<Multi_key> <acute> <Cyrillic_O>       : "О́"
+<Multi_key> <apostrophe> <Cyrillic_O>  : "О́"
+<dead_acute>             <Cyrillic_u>  : "у́"
+<combining_acute>        <Cyrillic_u>  : "у́"
+<Multi_key> <acute>      <Cyrillic_u>  : "у́"
+<Multi_key> <apostrophe> <Cyrillic_u>  : "у́"
+<dead_acute>             <Cyrillic_U>  : "У́"
+<combining_acute>        <Cyrillic_U>  : "У́"
+<Multi_key> <acute>      <Cyrillic_U>  : "У́"
+<Multi_key> <apostrophe> <Cyrillic_U>  : "У́"
+# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+<dead_circumflex> <Cyrillic_a>          : "а̂"
+<Multi_key> <asciicircum> <Cyrillic_a>  : "а̂"
+<dead_circumflex> <Cyrillic_A>          : "А̂"
+<Multi_key> <asciicircum> <Cyrillic_A>  : "А̂"
+<dead_circumflex> <Cyrillic_e>          : "е̂"
+<Multi_key> <asciicircum> <Cyrillic_e>  : "е̂"
+<dead_circumflex> <Cyrillic_E>          : "Е̂"
+<Multi_key> <asciicircum> <Cyrillic_E>  : "Е̂"
+<dead_circumflex> <Cyrillic_i>          : "и̂"
+<Multi_key> <asciicircum> <Cyrillic_i>  : "и̂"
+<dead_circumflex> <Cyrillic_I>          : "И̂"
+<Multi_key> <asciicircum> <Cyrillic_I>  : "И̂"
+<dead_circumflex> <Cyrillic_o>          : "о̂"
+<Multi_key> <asciicircum> <Cyrillic_o>  : "о̂"
+<dead_circumflex> <Cyrillic_O>          : "О̂"
+<Multi_key> <asciicircum> <Cyrillic_O>  : "О̂"
+<dead_circumflex> <Cyrillic_u>          : "у̂"
+<Multi_key> <asciicircum> <Cyrillic_u>  : "у̂"
+<dead_circumflex> <Cyrillic_U>          : "У̂"
+<Multi_key> <asciicircum> <Cyrillic_U>  : "У̂"
+# ̏ - kratkosilazni, U+030F  <dead_diaeresis>, <dead_doubleacute>
+# there's no appropriate dead_doublegrave, so we use these two dead keys
+<dead_diaeresis>   <Cyrillic_a>  : "а̏"
+<dead_doubleacute> <Cyrillic_a>  : "а̏"
+<dead_diaeresis>   <Cyrillic_A>  : "А̏"
+<dead_doubleacute> <Cyrillic_A>  : "А̏"
+<dead_diaeresis>   <Cyrillic_e>  : "е̏"
+<dead_doubleacute> <Cyrillic_e>  : "е̏"
+<dead_diaeresis>   <Cyrillic_E>  : "Е̏"
+<dead_doubleacute> <Cyrillic_E>  : "Е̏"
+<dead_diaeresis>   <Cyrillic_i>  : "и̏"
+<dead_doubleacute> <Cyrillic_i>  : "и̏"
+<dead_diaeresis>   <Cyrillic_I>  : "И̏"
+<dead_doubleacute> <Cyrillic_I>  : "И̏"
+<dead_diaeresis>   <Cyrillic_o>  : "о̏"
+<dead_doubleacute> <Cyrillic_o>  : "о̏"
+<dead_diaeresis>   <Cyrillic_O>  : "О̏"
+<dead_doubleacute> <Cyrillic_O>  : "О̏"
+<dead_diaeresis>   <Cyrillic_u>  : "у̏"
+<dead_doubleacute> <Cyrillic_u>  : "у̏"
+<dead_diaeresis>   <Cyrillic_U>  : "У̏"
+<dead_doubleacute> <Cyrillic_U>  : "У̏"
diff --git a/libX11/nls/sr_CS.UTF-8/XI18N_OBJS b/libX11/nls/sr_CS.UTF-8/XI18N_OBJS
new file mode 100644
index 000000000..f201bf435
--- /dev/null
+++ b/libX11/nls/sr_CS.UTF-8/XI18N_OBJS
@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	        # XLC_open
+XOM	common/xomLTRTTB	_XomGenericOpenOM	# XOM_open
+XIM	common/xiiimp		_SwitchOpenIM		# XIM_open
+XIM	common/xiiimp		_XimpLocalOpenIM	# XIM_open
diff --git a/libX11/nls/ja.U90/Compose.pre b/libX11/nls/sr_CS.UTF-8/XLC_LOCALE.pre
index e69de29bb..e69de29bb 100644
--- a/libX11/nls/ja.U90/Compose.pre
+++ b/libX11/nls/sr_CS.UTF-8/XLC_LOCALE.pre
diff --git a/libX11/nls/th_TH.UTF-8/Compose.pre b/libX11/nls/th_TH.UTF-8/Compose.pre
index e69de29bb..6c2c4114d 100644
--- a/libX11/nls/th_TH.UTF-8/Compose.pre
+++ b/libX11/nls/th_TH.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/libX11/nls/zh_CN.UTF-8/Compose.pre b/libX11/nls/zh_CN.UTF-8/Compose.pre
index e69de29bb..6c2c4114d 100644
--- a/libX11/nls/zh_CN.UTF-8/Compose.pre
+++ b/libX11/nls/zh_CN.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/libX11/nls/zh_HK.UTF-8/Compose.pre b/libX11/nls/zh_HK.UTF-8/Compose.pre
index e69de29bb..6c2c4114d 100644
--- a/libX11/nls/zh_HK.UTF-8/Compose.pre
+++ b/libX11/nls/zh_HK.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/libX11/nls/zh_TW.UTF-8/Compose.pre b/libX11/nls/zh_TW.UTF-8/Compose.pre
index e69de29bb..6c2c4114d 100644
--- a/libX11/nls/zh_TW.UTF-8/Compose.pre
+++ b/libX11/nls/zh_TW.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"