Updatd X11 data

data/usr/lib/xorg/protocol.txt

@@ -149,6 +149,7 @@ R031 GLX:CreateWindow
 R032 GLX:DeleteWindow
 R033 GLX:SetClientInfoARB
 R034 GLX:CreateContextAttribsARB
+R035 GLX:SetClientInfo2ARB
 R101 GLX:NewList
 R102 GLX:EndList
 R103 GLX:DeleteLists

data/usr/share/X11/Xcms.txt

@@ -1,44 +0,0 @@
-/*
- * (c) Copyright 1990 1991 Tektronix Inc.
- * 	All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Tektronix not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.
- *
- * Tektronix disclaims all warranties with regard to this software, including
- * all implied warranties of merchantability and fitness, in no event shall
- * Tektronix be liable for any special, indirect or consequential damages or
- * any damages whatsoever resulting from loss of use, data or profits,
- * whether in an action of contract, negligence or other tortious action,
- * arising out of or in connection with the use or performance of this
- * software.
- *
- *
- *	NAME
- *		Xcms.txt
- *
- *	DESCRIPTION
- *		Sample Color Name Database
- *
- */
-
-
-This device-independent color name database is provided just as an example.
-There are no claims that these color specifications are or should be bound
-to the corresponding color name.
-
-As you can see, the start of the database is indicated by "XCMS_COLORDB_START".
-Anything before this is assumed to be comments.  The "0.1" indicates the
-version number of the format/syntax used in this file.  The color name is
-delimited from the color specification by one or more tabs.
-
-XCMS_COLORDB_START 0.1
-cms red			CIEXYZ:0.3811/0.2073/0.0213
-cms green		CIEXYZ:0.3203/0.6805/0.1430
-cms blue		CIEXYZ:0.2483/0.1122/1.2417
-XCMS_COLORDB_END

data/usr/share/X11/locale/C/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/C/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for C.

data/usr/share/X11/locale/am_ET.UTF-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # 

data/usr/share/X11/locale/am_ET.UTF-8/XLC_LOCALE

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/armscii-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/armscii-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for armscii-8.

data/usr/share/X11/locale/compose.dir

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #
@@ -51,8 +52,13 @@
 #	and the second word is the full locale name.
 #
 #
+# Note that no Compose tables exist for ISO 8859-11, Microsoft code
+# pages, Fujitsu's S90 or U90 character sets, or TIS620 yet.
+#
 iso8859-1/Compose		C
+iso8859-1/Compose		aa_DJ.ISO8859-1
 iso8859-1/Compose		af_ZA.ISO8859-1
+iso8859-15/Compose		an_ES.ISO8859-15
 iso8859-6/Compose		ar_AA.ISO8859-6
 iso8859-6/Compose		ar_AE.ISO8859-6
 iso8859-6/Compose		ar_BH.ISO8859-6
@@ -117,12 +123,15 @@ 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_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-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
@@ -171,6 +180,8 @@ 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
@@ -204,11 +215,9 @@ 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
@@ -217,11 +226,12 @@ 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
-ko/Compose			ko_KR.eucKR
+iso8859-10/Compose		lg_UG.ISO8859-10
+# Remove ko/Compose, as requested in https://bugs.debian.org/89703
+# ko/Compose:			ko_KR.eucKR
 ibm-cp1133/Compose		lo_LA.IBM-CP1133
 mulelao-1/Compose		lo_LA.MULELAO-1
 iso8859-4/Compose		lt_LT.ISO8859-4
@@ -249,15 +259,18 @@ 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		pd_DE.ISO8859-1
+iso8859-1/Compose		om_KE.ISO8859-1
-iso8859-15/Compose		pd_DE.ISO8859-15
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-iso8859-1/Compose		pd_US.ISO8859-1
+# This is not an ISO language code defined for it, and the GNU C Library
-iso8859-15/Compose		pd_US.ISO8859-15
+# doesn't support it.
+# 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
 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
@@ -270,6 +283,9 @@ 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_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
@@ -308,12 +324,19 @@ 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.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_TW.big5/Compose		zh_TW.big5
 zh_TW/Compose			zh_TW.eucTW
 iso8859-1/Compose		zu_ZA.ISO8859-1
 #
 #
+en_US.UTF-8/Compose		aa_ER.UTF-8
+en_US.UTF-8/Compose		aa_ET.UTF-8
 en_US.UTF-8/Compose		af_ZA.UTF-8
 am_ET.UTF-8/Compose		am_ET.UTF-8
 en_US.UTF-8/Compose		ar_AA.UTF-8
@@ -344,6 +367,7 @@ en_US.UTF-8/Compose		bn_IN.UTF-8
 en_US.UTF-8/Compose		bo_IN.UTF-8
 en_US.UTF-8/Compose		br_FR.UTF-8
 en_US.UTF-8/Compose		bs_BA.UTF-8
+en_US.UTF-8/Compose		byn_ER.UTF-8
 en_US.UTF-8/Compose		ca_AD.UTF-8
 en_US.UTF-8/Compose		ca_ES.UTF-8
 en_US.UTF-8/Compose		ca_FR.UTF-8
@@ -404,6 +428,7 @@ 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
@@ -414,6 +439,8 @@ 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
@@ -428,6 +455,7 @@ 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
 ja_JP.UTF-8/Compose		ja_JP.UTF-8
 en_US.UTF-8/Compose		ka_GE.UTF-8
 en_US.UTF-8/Compose		kk_KZ.UTF-8
@@ -447,6 +475,7 @@ 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
@@ -458,13 +487,19 @@ en_US.UTF-8/Compose		no_NO.UTF-8
 en_US.UTF-8/Compose		nb_NO.UTF-8
 en_US.UTF-8/Compose		nr_ZA.UTF-8
 en_US.UTF-8/Compose		nso_ZA.UTF-8
-en_US.UTF-8/Compose		ny_NO.UTF-8
+# ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+# See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
+# 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
-en_US.UTF-8/Compose		pd_DE.UTF-8
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-en_US.UTF-8/Compose		pd_US.UTF-8
+# This is not an ISO language code defined for it, and the GNU C Library
+# doesn't support it.
+# 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
@@ -480,9 +515,11 @@ en_US.UTF-8/Compose		sd_IN.UTF-8@devanagari
 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
 sr_CS.UTF-8/Compose		sr_CS.UTF-8
 en_US.UTF-8/Compose		sr_ME.UTF-8
@@ -495,9 +532,12 @@ 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
-th_TH.UTF-8/Compose		th_TH.UTF-8
+# Following entry commented to allow Thai XIM as default for X apps
+# See Debian bug#520509
+# th_TH.UTF-8/Compose:		th_TH.UTF-8
 en_US.UTF-8/Compose		ti_ER.UTF-8
 en_US.UTF-8/Compose		ti_ET.UTF-8
+en_US.UTF-8/Compose		tig_ER.UTF-8
 en_US.UTF-8/Compose		tl_PH.UTF-8
 en_US.UTF-8/Compose		tn_ZA.UTF-8
 en_US.UTF-8/Compose		tr_TR.UTF-8
@@ -562,6 +602,7 @@ en_US.UTF-8/Compose		zu_ZA.UTF-8
 
 
 
+
 
 
 #
@@ -570,8 +611,13 @@ en_US.UTF-8/Compose		zu_ZA.UTF-8
 #	and the second word is the full locale name.
 #
 #
+# Note that no Compose tables exist for ISO 8859-11, Microsoft code
+# pages, Fujitsu's S90 or U90 character sets, or TIS620 yet.
+#
 iso8859-1/Compose:		C
+iso8859-1/Compose:		aa_DJ.ISO8859-1
 iso8859-1/Compose:		af_ZA.ISO8859-1
+iso8859-15/Compose:		an_ES.ISO8859-15
 iso8859-6/Compose:		ar_AA.ISO8859-6
 iso8859-6/Compose:		ar_AE.ISO8859-6
 iso8859-6/Compose:		ar_BH.ISO8859-6
@@ -636,12 +682,15 @@ 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_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-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
@@ -690,6 +739,8 @@ 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
@@ -723,11 +774,9 @@ 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
@@ -736,11 +785,12 @@ 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
-ko/Compose:			ko_KR.eucKR
+iso8859-10/Compose:		lg_UG.ISO8859-10
+# Remove ko/Compose, as requested in https://bugs.debian.org/89703
+# ko/Compose:			ko_KR.eucKR
 ibm-cp1133/Compose:		lo_LA.IBM-CP1133
 mulelao-1/Compose:		lo_LA.MULELAO-1
 iso8859-4/Compose:		lt_LT.ISO8859-4
@@ -768,15 +818,18 @@ 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:		pd_DE.ISO8859-1
+iso8859-1/Compose:		om_KE.ISO8859-1
-iso8859-15/Compose:		pd_DE.ISO8859-15
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-iso8859-1/Compose:		pd_US.ISO8859-1
+# This is not an ISO language code defined for it, and the GNU C Library
-iso8859-15/Compose:		pd_US.ISO8859-15
+# doesn't support it.
+# 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
 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
@@ -789,6 +842,9 @@ 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_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
@@ -827,12 +883,19 @@ 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.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_TW.big5/Compose:		zh_TW.big5
 zh_TW/Compose:			zh_TW.eucTW
 iso8859-1/Compose:		zu_ZA.ISO8859-1
 #
 #
+en_US.UTF-8/Compose:		aa_ER.UTF-8
+en_US.UTF-8/Compose:		aa_ET.UTF-8
 en_US.UTF-8/Compose:		af_ZA.UTF-8
 am_ET.UTF-8/Compose:		am_ET.UTF-8
 en_US.UTF-8/Compose:		ar_AA.UTF-8
@@ -863,6 +926,7 @@ en_US.UTF-8/Compose:		bn_IN.UTF-8
 en_US.UTF-8/Compose:		bo_IN.UTF-8
 en_US.UTF-8/Compose:		br_FR.UTF-8
 en_US.UTF-8/Compose:		bs_BA.UTF-8
+en_US.UTF-8/Compose:		byn_ER.UTF-8
 en_US.UTF-8/Compose:		ca_AD.UTF-8
 en_US.UTF-8/Compose:		ca_ES.UTF-8
 en_US.UTF-8/Compose:		ca_FR.UTF-8
@@ -923,6 +987,7 @@ 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
@@ -933,6 +998,8 @@ 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
@@ -947,6 +1014,7 @@ 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
 ja_JP.UTF-8/Compose:		ja_JP.UTF-8
 en_US.UTF-8/Compose:		ka_GE.UTF-8
 en_US.UTF-8/Compose:		kk_KZ.UTF-8
@@ -966,6 +1034,7 @@ 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
@@ -977,13 +1046,19 @@ en_US.UTF-8/Compose:		no_NO.UTF-8
 en_US.UTF-8/Compose:		nb_NO.UTF-8
 en_US.UTF-8/Compose:		nr_ZA.UTF-8
 en_US.UTF-8/Compose:		nso_ZA.UTF-8
-en_US.UTF-8/Compose:		ny_NO.UTF-8
+# ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+# See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
+# 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
-en_US.UTF-8/Compose:		pd_DE.UTF-8
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-en_US.UTF-8/Compose:		pd_US.UTF-8
+# This is not an ISO language code defined for it, and the GNU C Library
+# doesn't support it.
+# 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
@@ -999,9 +1074,11 @@ en_US.UTF-8/Compose:		sd_IN.UTF-8@devanagari
 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
 sr_CS.UTF-8/Compose:		sr_CS.UTF-8
 en_US.UTF-8/Compose:		sr_ME.UTF-8
@@ -1014,9 +1091,12 @@ 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
-th_TH.UTF-8/Compose:		th_TH.UTF-8
+# Following entry commented to allow Thai XIM as default for X apps
+# See Debian bug#520509
+# th_TH.UTF-8/Compose:		th_TH.UTF-8
 en_US.UTF-8/Compose:		ti_ER.UTF-8
 en_US.UTF-8/Compose:		ti_ET.UTF-8
+en_US.UTF-8/Compose:		tig_ER.UTF-8
 en_US.UTF-8/Compose:		tl_PH.UTF-8
 en_US.UTF-8/Compose:		tn_ZA.UTF-8
 en_US.UTF-8/Compose:		tr_TR.UTF-8

data/usr/share/X11/locale/cs_CZ.UTF-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # UTF-8 (Unicode) compose sequences
@@ -52,7 +53,7 @@
 #	based on bug report by Vladimír Marek <vlmarek@volny.cz>
 
 # Use the sequences from en_US.UTF-8 as the basis:
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 
 #  Overriding U with caron:
 <dead_caron> <u>                        : "ů"   U016F  #  LATIN SMALL LETTER U WITH RING ABOVE

data/usr/share/X11/locale/cs_CZ.UTF-8/XLC_LOCALE

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/el_GR.UTF-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/el_GR.UTF-8/XLC_LOCALE

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/en_US.UTF-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # UTF-8 (Unicode) compose sequence

data/usr/share/X11/locale/en_US.UTF-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for en_US.UTF-8

data/usr/share/X11/locale/fi_FI.UTF-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #
@@ -60,7 +61,7 @@
 #
 
 # Use en_US.UTF-8/Compose as the base compose sequence definition set
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 
 # Define all the sequences of the standard overriding any sequence
 # from en_US.UTF-8/Compose if such a sequence was provided already

data/usr/share/X11/locale/fi_FI.UTF-8/XLC_LOCALE

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/georgian-academy/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/georgian-academy/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for georgian-academy

data/usr/share/X11/locale/georgian-ps/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/georgian-ps/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for georgian-ps

data/usr/share/X11/locale/ibm-cp1133/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/ibm-cp1133/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for ibm-cp1133.

data/usr/share/X11/locale/iscii-dev/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/iscii-dev/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for mulelao-1.

data/usr/share/X11/locale/isiri-3342/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/isiri-3342/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for mulelao-1.

data/usr/share/X11/locale/iso8859-1/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-1/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-1.

data/usr/share/X11/locale/iso8859-10/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-10/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-4.

data/usr/share/X11/locale/iso8859-11/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/iso8859-11/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-11.

data/usr/share/X11/locale/iso8859-13/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-13/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-13.

data/usr/share/X11/locale/iso8859-14/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # ISO 8859-14 (Latin 8) Compose Sequences

data/usr/share/X11/locale/iso8859-14/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-14.

data/usr/share/X11/locale/iso8859-15/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #
@@ -202,8 +203,7 @@
 <Multi_key> <minus> <colon>		: "\367"	division
 <Multi_key> <colon> <minus>		: "\367"	division
 <Multi_key> <x> <x>			: "\327"	multiply
-<Multi_key> <apostrophe> <apostrophe>	: "\264"	acute
+<Multi_key> <apostrophe> <apostrophe>	: "'"		apostrophe
-<Multi_key> <comma> <comma>		: "\270"	cedilla
 <Multi_key> <quotedbl> <quotedbl>	: "\""	quotedbl
 # Accented Alphabet
 <Multi_key> <A> <grave>			: "\300"	Agrave
@@ -222,8 +222,6 @@
 <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
@@ -245,8 +243,6 @@
 <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
@@ -278,8 +274,6 @@
 <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
@@ -292,8 +286,6 @@
 <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
@@ -306,8 +298,6 @@
 <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
@@ -320,8 +310,6 @@
 <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
@@ -346,8 +334,6 @@
 <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
@@ -367,8 +353,6 @@
 <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
@@ -388,8 +372,6 @@
 <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
@@ -402,8 +384,6 @@
 <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
@@ -413,16 +393,12 @@
 <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
@@ -451,8 +427,7 @@
 <dead_cedilla> <minus>			: "\254"	notsign
 <dead_circumflex> <minus>		: "\257"	macron
 <dead_circumflex> <underscore>		: "\257"	macron
-<dead_acute> <apostrophe>		: "\264"	acute
+<dead_acute> <apostrophe>		: "'"		apostrophe
-<dead_cedilla> <comma>			: "\270"	cedilla
 <dead_diaeresis> <quotedbl>		: "\""	quotedbl
 # Accented Alphabet
 <dead_abovering> <A>			: "\305"	Aring

data/usr/share/X11/locale/iso8859-15/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for fcd/dis/iso 8859-15.

data/usr/share/X11/locale/iso8859-2/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-2/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-2.

data/usr/share/X11/locale/iso8859-3/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-3/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-3.

data/usr/share/X11/locale/iso8859-4/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-4/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-4.

data/usr/share/X11/locale/iso8859-5/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-5/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-5.

data/usr/share/X11/locale/iso8859-6/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-6/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-6.

data/usr/share/X11/locale/iso8859-7/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-7/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-7.

data/usr/share/X11/locale/iso8859-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-8.

data/usr/share/X11/locale/iso8859-9/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-9/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-9.

data/usr/share/X11/locale/iso8859-9e/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/iso8859-9e/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for iso8859-9e.

data/usr/share/X11/locale/ja.JIS/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/ja.JIS/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # 

data/usr/share/X11/locale/ja.SJIS/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/ja.SJIS/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # 

data/usr/share/X11/locale/ja/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/ja/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/ja_JP.UTF-8/Compose

@@ -45,4 +45,5 @@
 
 
 
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"

data/usr/share/X11/locale/ja_JP.UTF-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # 

data/usr/share/X11/locale/km_KH.UTF-8/Compose

@@ -45,7 +45,8 @@
 
 
 
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 
 # Khmer digraphs
 <U17ff>	:	"ាំ"

data/usr/share/X11/locale/km_KH.UTF-8/XLC_LOCALE

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/ko/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/ko/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for ko.

data/usr/share/X11/locale/ko_KR.UTF-8/Compose

@@ -45,4 +45,5 @@
 
 
 
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"

data/usr/share/X11/locale/ko_KR.UTF-8/XLC_LOCALE

@@ -44,6 +44,7 @@
 
 
 
+
 
 
 # 

data/usr/share/X11/locale/koi8-c/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/koi8-c/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for koi8-c.

data/usr/share/X11/locale/koi8-r/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/koi8-r/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for koi8-r.

data/usr/share/X11/locale/koi8-u/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/koi8-u/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for koi8-u.

data/usr/share/X11/locale/locale.alias

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #
@@ -358,6 +359,12 @@ 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_DL.utf8					en_DL.UTF-8
 en_GB						en_GB.ISO8859-1
 en_GB.88591					en_GB.ISO8859-1
@@ -411,6 +418,16 @@ 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
@@ -979,7 +996,6 @@ pt_BR.88591.en					pt_BR.ISO8859-1
 pt_BR.iso88591					pt_BR.ISO8859-1
 pt_BR.ISO-8859-1				pt_BR.ISO8859-1
 pt_BR.ISO_8859-1				pt_BR.ISO8859-1
-pt_BR.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
@@ -1040,11 +1056,11 @@ se_NO.utf8					se_NO.UTF-8
 # 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
@@ -1257,7 +1273,7 @@ spanish_spain.8859				es_ES.ISO8859-1
 american.iso88591				en_US.ISO8859-1
 arabic.iso88596				ar_AA.ISO8859-6
 bokmal						nb_NO.ISO8859-1
-bokm<EFBFBD>l						nb_NO.ISO8859-1
+bokm<EFBFBD>						nb_NO.ISO8859-1
 bulgarian					bg_BG.CP1251
 c-french.iso88591				fr_CA.ISO8859-1
 catalan					ca_ES.ISO8859-1
@@ -1272,11 +1288,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_EN.ISO8859-1
+english.iso88591				en_US.ISO8859-1
 estonian					et_EE.ISO8859-1
 finnish					fi_FI.ISO8859-1
 finnish.iso88591				fi_FI.ISO8859-1
-fran<EFBFBD>ais					fr_FR.ISO8859-1
+fran<EFBFBD>is					fr_FR.ISO8859-1
 french						fr_FR.ISO8859-1
 french.iso88591				fr_CH.ISO8859-1
 galego						gl_ES.ISO8859-1
@@ -1306,7 +1322,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.ISO8859-5
+russian					ru_RU.KOI8-R
 serbocroatian					sr_RS.UTF-8@latin
 sinhala					si_LK.UTF-8
 slovak						sk_SK.ISO8859-2
@@ -1376,6 +1392,7 @@ Japanese-EUC					ja_JP.eucJP
 
 
 
+
 
 
 #
@@ -1691,6 +1708,12 @@ 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_DL.utf8:					en_DL.UTF-8
 en_GB:						en_GB.ISO8859-1
 en_GB.88591:					en_GB.ISO8859-1
@@ -1744,6 +1767,16 @@ 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
@@ -2312,7 +2345,6 @@ pt_BR.88591.en:					pt_BR.ISO8859-1
 pt_BR.iso88591:					pt_BR.ISO8859-1
 pt_BR.ISO-8859-1:				pt_BR.ISO8859-1
 pt_BR.ISO_8859-1:				pt_BR.ISO8859-1
-pt_BR.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
@@ -2373,11 +2405,11 @@ se_NO.utf8:					se_NO.UTF-8
 # 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
@@ -2590,7 +2622,7 @@ spanish_spain.8859:				es_ES.ISO8859-1
 american.iso88591:				en_US.ISO8859-1
 arabic.iso88596:				ar_AA.ISO8859-6
 bokmal:						nb_NO.ISO8859-1
-bokm<EFBFBD>l:						nb_NO.ISO8859-1
+bokm<EFBFBD>:						nb_NO.ISO8859-1
 bulgarian:					bg_BG.CP1251
 c-french.iso88591:				fr_CA.ISO8859-1
 catalan:					ca_ES.ISO8859-1
@@ -2605,11 +2637,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_EN.ISO8859-1
+english.iso88591:				en_US.ISO8859-1
 estonian:					et_EE.ISO8859-1
 finnish:					fi_FI.ISO8859-1
 finnish.iso88591:				fi_FI.ISO8859-1
-fran<EFBFBD>ais:					fr_FR.ISO8859-1
+fran<EFBFBD>is:					fr_FR.ISO8859-1
 french:						fr_FR.ISO8859-1
 french.iso88591:				fr_CH.ISO8859-1
 galego:						gl_ES.ISO8859-1
@@ -2639,7 +2671,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.ISO8859-5
+russian:					ru_RU.KOI8-R
 serbocroatian:					sr_RS.UTF-8@latin
 sinhala:					si_LK.UTF-8
 slovak:						sk_SK.ISO8859-2

data/usr/share/X11/locale/locale.dir

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #
@@ -53,8 +54,11 @@
 #
 
 C/XLC_LOCALE				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
@@ -83,6 +87,7 @@ 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
@@ -106,7 +111,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-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
@@ -118,12 +123,15 @@ 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_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
 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
@@ -137,7 +145,8 @@ 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
+# The EO territory doesn't exist in ISO 3166.
+# 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
@@ -172,6 +181,8 @@ 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
@@ -223,6 +234,7 @@ 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
@@ -250,8 +262,12 @@ 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			pd_DE.ISO8859-1
+iso8859-1/XLC_LOCALE			om_KE.ISO8859-1
-iso8859-15/XLC_LOCALE			pd_DE.ISO8859-15
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
+# This is not an ISO language code defined for it, and the GNU C Library
+# doesn't support it.
+# 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
@@ -271,6 +287,9 @@ 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
@@ -285,8 +304,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
-th_TH/XLC_LOCALE			th_TH.TIS620
 iso8859-11/XLC_LOCALE			th_TH.ISO8859-11
+th_TH/XLC_LOCALE			th_TH.TIS620
 iso8859-1/XLC_LOCALE 			tl_PH.ISO8859-1
 iso8859-15/XLC_LOCALE			tn_ZA.ISO8859-15
 iso8859-9/XLC_LOCALE			tr_TR.ISO8859-9
@@ -310,10 +329,14 @@ 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.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
 # Note: The UTF-8 locales don't work correctly yet. Work in progress.
+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
@@ -345,6 +368,7 @@ 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
@@ -381,7 +405,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
+# The EO territory doesn't exist in ISO 3166.
+# 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
@@ -405,6 +430,7 @@ 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
@@ -415,6 +441,8 @@ 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
@@ -429,6 +457,7 @@ 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			kk_KZ.UTF-8
@@ -448,9 +477,11 @@ en_US.UTF-8/XLC_LOCALE                 mai_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE			mi_NZ.UTF-8
 en_US.UTF-8/XLC_LOCALE			mk_MK.UTF-8
 en_US.UTF-8/XLC_LOCALE			ml_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE            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
@@ -458,13 +489,19 @@ en_US.UTF-8/XLC_LOCALE			nn_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE			no_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE			nr_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE			nso_ZA.UTF-8
-en_US.UTF-8/XLC_LOCALE			ny_NO.UTF-8
+# ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+# See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
+# 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
-en_US.UTF-8/XLC_LOCALE			pd_DE.UTF-8
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-en_US.UTF-8/XLC_LOCALE			pd_US.UTF-8
+# This is not an ISO language code defined for it, and the GNU C Library
+# doesn't support it.
+# 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
@@ -478,11 +515,13 @@ en_US.UTF-8/XLC_LOCALE                 sa_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE                 sd_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE                 sd_IN.UTF-8@devanagari
 en_US.UTF-8/XLC_LOCALE			se_NO.UTF-8
+en_US.UTF-8/XLC_LOCALE            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
@@ -499,6 +538,7 @@ 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
@@ -564,6 +604,7 @@ en_US.UTF-8/XLC_LOCALE			zu_ZA.UTF-8
 
 
 
+
 
 
 #
@@ -574,8 +615,11 @@ en_US.UTF-8/XLC_LOCALE			zu_ZA.UTF-8
 #
 
 C/XLC_LOCALE:				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
@@ -604,6 +648,7 @@ 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
@@ -627,7 +672,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-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
@@ -639,12 +684,15 @@ 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_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
 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
@@ -658,7 +706,8 @@ 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
+# The EO territory doesn't exist in ISO 3166.
+# 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
@@ -693,6 +742,8 @@ 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
@@ -744,6 +795,7 @@ 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
@@ -771,8 +823,12 @@ 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:			pd_DE.ISO8859-1
+iso8859-1/XLC_LOCALE:			om_KE.ISO8859-1
-iso8859-15/XLC_LOCALE:			pd_DE.ISO8859-15
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
+# This is not an ISO language code defined for it, and the GNU C Library
+# doesn't support it.
+# 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
@@ -792,6 +848,9 @@ 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
@@ -806,8 +865,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
-th_TH/XLC_LOCALE:			th_TH.TIS620
 iso8859-11/XLC_LOCALE:			th_TH.ISO8859-11
+th_TH/XLC_LOCALE:			th_TH.TIS620
 iso8859-1/XLC_LOCALE: 			tl_PH.ISO8859-1
 iso8859-15/XLC_LOCALE:			tn_ZA.ISO8859-15
 iso8859-9/XLC_LOCALE:			tr_TR.ISO8859-9
@@ -831,10 +890,14 @@ 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.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
 # Note: The UTF-8 locales don't work correctly yet. Work in progress.
+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
@@ -866,6 +929,7 @@ 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
@@ -902,7 +966,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
+# The EO territory doesn't exist in ISO 3166.
+# 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
@@ -926,6 +991,7 @@ 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
@@ -936,6 +1002,8 @@ 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
@@ -950,6 +1018,7 @@ 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:			kk_KZ.UTF-8
@@ -969,9 +1038,11 @@ en_US.UTF-8/XLC_LOCALE:                 mai_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mi_NZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mk_MK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ml_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:            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
@@ -979,13 +1050,19 @@ en_US.UTF-8/XLC_LOCALE:			nn_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			no_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nr_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nso_ZA.UTF-8
-en_US.UTF-8/XLC_LOCALE:			ny_NO.UTF-8
+# ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+# See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
+# 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
-en_US.UTF-8/XLC_LOCALE:			pd_DE.UTF-8
+# Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-en_US.UTF-8/XLC_LOCALE:			pd_US.UTF-8
+# This is not an ISO language code defined for it, and the GNU C Library
+# doesn't support it.
+# 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
@@ -999,11 +1076,13 @@ en_US.UTF-8/XLC_LOCALE:                 sa_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:                 sd_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:                 sd_IN.UTF-8@devanagari
 en_US.UTF-8/XLC_LOCALE:			se_NO.UTF-8
+en_US.UTF-8/XLC_LOCALE:            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
@@ -1020,6 +1099,7 @@ 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

data/usr/share/X11/locale/microsoft-cp1251/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/microsoft-cp1251/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for microsoft-cp1251.

data/usr/share/X11/locale/microsoft-cp1255/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/microsoft-cp1255/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for microsoft-cp1255.

data/usr/share/X11/locale/microsoft-cp1256/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/microsoft-cp1256/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for microsoft-cp1256.

data/usr/share/X11/locale/mulelao-1/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/mulelao-1/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for mulelao-1.

data/usr/share/X11/locale/nokhchi-1/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/nokhchi-1/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for mulelao-1.

data/usr/share/X11/locale/pt_BR.UTF-8/Compose

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 # UTF-8 (Unicode) compose sequences
@@ -53,7 +54,7 @@
 #   by Benno Schulenberg <bensberg@justemail.net>
 
 # Use the sequences from en_US.UTF-8 as the basis:
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 
 # This one should probably be deleted, because in
 # en_US.UTF8 this is lowercase schwa, not uppercase:

data/usr/share/X11/locale/pt_BR.UTF-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for pt_BR.UTF-8

data/usr/share/X11/locale/pt_PT.UTF-8/Compose

@@ -45,6 +45,7 @@
 
 
 
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 <dead_acute> <C>	: "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
 <dead_acute> <c>	: "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA

data/usr/share/X11/locale/pt_PT.UTF-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for pt_PT.UTF-8

data/usr/share/X11/locale/ru_RU.UTF-8/Compose

@@ -45,4 +45,5 @@
 
 
 
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"

data/usr/share/X11/locale/ru_RU.UTF-8/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #

data/usr/share/X11/locale/sr_CS.UTF-8/Compose

@@ -45,7 +45,8 @@
 
 
 
-include "/proc/self/cwd/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 
 # Serbian accented Cyrillic
 # а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A

data/usr/share/X11/locale/sr_CS.UTF-8/XLC_LOCALE

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/tatar-cyr/Compose

@@ -43,5 +43,6 @@
 
 
 
+
 
 

data/usr/share/X11/locale/tatar-cyr/XLC_LOCALE

@@ -43,6 +43,7 @@
 
 
 
+
 
 
 #  XLocale Database Sample for tatar-cyr.