--- libX11-1.0.2/nls/iso8859-16.orig/Compose.pre	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/iso8859-16/Compose.pre	2006-06-29 18:08:22.583200750 +0200
@@ -0,0 +1,353 @@
+XCOMM $TOG: fcd8859-15 /main/2 1998/06/17 15:53:45 kaleb $
+XCOMM
+XCOMM ISO 8859-15 (Latin1) Compose Sequence
+XCOMM
+XCOMM $XFree86: xc/nls/Compose/iso8859-15,v 1.8 2002/10/16 01:44:48 dawes Exp $
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+<Multi_key> <plus> <plus>		: "#"	numbersign
+<Multi_key> <apostrophe> <space>	: "'"	apostrophe
+<Multi_key> <space> <apostrophe>	: "'"	apostrophe
+<Multi_key> <A> <T>			: "@"	at
+<Multi_key> <parenleft> <parenleft>	: "["	bracketleft
+<Multi_key> <slash> <slash>		: "\\"	backslash
+<Multi_key> <slash> <less>		: "\\"	backslash
+<Multi_key> <less> <slash>		: "\\"	backslash
+<Multi_key> <parenright> <parenright>	: "]"	bracketright
+<Multi_key> <asciicircum> <space>	: "^"	asciicircum
+<Multi_key> <space> <asciicircum>	: "^"	asciicircum
+<Multi_key> <greater> <space>		: "^"	asciicircum
+<Multi_key> <space> <greater>		: "^"	asciicircum
+<Multi_key> <grave> <space>		: "`"	grave
+<Multi_key> <space> <grave>		: "`"	grave
+<Multi_key> <parenleft> <minus>		: "{"	braceleft
+<Multi_key> <minus> <parenleft>		: "{"	braceleft
+<Multi_key> <slash> <asciicircum>	: "|"	bar
+<Multi_key> <asciicircum> <slash>	: "|"	bar
+<Multi_key> <V> <L>			: "|"	bar
+<Multi_key> <L> <V>			: "|"	bar
+<Multi_key> <v> <l>			: "|"	bar
+<Multi_key> <l> <v>			: "|"	bar
+<Multi_key> <parenright> <minus>	: "}"	braceright
+<Multi_key> <minus> <parenright>	: "}"	braceright
+<Multi_key> <asciitilde> <space>	: "~"	asciitilde
+<Multi_key> <space> <asciitilde>	: "~"	asciitilde
+<Multi_key> <minus> <space>		: "~"	asciitilde
+<Multi_key> <space> <minus>		: "~"	asciitilde
+<Multi_key> <C> <equal>			: "\244"	EuroSign
+<Multi_key> <equal> <C>			: "\244"	EuroSign
+<Multi_key> <E> <equal>			: "\244"	EuroSign
+<Multi_key> <e> <equal>			: "\244"	EuroSign
+<Multi_key> <greater> <comma>		: "\245"	doublelowquotemark
+<Multi_key> <comma> <greater>		: "\245"	doublelowquotemark
+<Multi_key> <s> <o>			: "\247"	section
+<Multi_key> <o> <s>			: "\247"	section
+<Multi_key> <S> <O>			: "\247"	section
+<Multi_key> <O> <S>			: "\247"	section
+<Multi_key> <S> <exclam>		: "\247"	section
+<Multi_key> <exclam> <S>		: "\247"	section
+<Multi_key> <s> <exclam>		: "\247"	section
+<Multi_key> <exclam> <s>		: "\247"	section
+<Multi_key> <S> <0>			: "\247"	section
+<Multi_key> <0> <S>			: "\247"	section
+<Multi_key> <s> <0>			: "\247"	section
+<Multi_key> <0> <s>			: "\247"	section
+<Multi_key> <c> <o>			: "\251"	copyright
+<Multi_key> <o> <c>			: "\251"	copyright
+<Multi_key> <C> <O>			: "\251"	copyright
+<Multi_key> <O> <C>			: "\251"	copyright
+<Multi_key> <c> <O>			: "\251"	copyright
+<Multi_key> <O> <c>			: "\251"	copyright
+<Multi_key> <C> <o>			: "\251"	copyright
+<Multi_key> <o> <C>			: "\251"	copyright
+<Multi_key> <c> <0>			: "\251"	copyright
+<Multi_key> <0> <c>			: "\251"	copyright
+<Multi_key> <C> <0>			: "\251"	copyright
+<Multi_key> <0> <C>			: "\251"	copyright
+<Multi_key> <parenleft> <c>		: "\251"	copyright
+<Multi_key> <parenleft> <C>		: "\251"	copyright
+<Multi_key> <less> <less>		: "\253"	guillemotleft
+<Multi_key> <greater> <greater>		: "\273"	guillemotright
+<Multi_key> <0> <asciicircum>		: "\260"	degree
+<Multi_key> <asciicircum> <0>		: "\260"	degree
+<Multi_key> <0> <asterisk>		: "\260"	degree
+<Multi_key> <asterisk> <0>		: "\260"	degree
+<Multi_key> <plus> <minus>		: "\261"	plusminus
+<Multi_key> <minus> <plus>		: "\261"	plusminus
+<Multi_key> <greater> <quotedbl>	: "\265"	rightdoublequotemark
+<Multi_key> <quotedbl> <greater>	: "\265"	rightdoublequotemark
+<Multi_key> <p> <exclam>		: "\266"	paragraph
+<Multi_key> <exclam> <p>		: "\266"	paragraph
+<Multi_key> <P> <exclam>		: "\266"	paragraph
+<Multi_key> <exclam> <P>		: "\266"	paragraph
+<Multi_key> <period> <asciicircum>	: "\267"	periodcentered
+<Multi_key> <asciicircum> <period>	: "\267"	periodcentered
+<Multi_key> <period> <period>		: "\267"	periodcentered
+<Multi_key> <space> <space>		: "\240"	nobreakspace
+<Multi_key> <minus> <minus>		: "\255"	hyphen
+<Multi_key> <quotedbl> <quotedbl>	: "\""	quotedbl
+XCOMM Accented Alphabet
+<Multi_key> <A> <grave>			: "\300"	Agrave
+<Multi_key> <grave> <A>			: "\300"	Agrave
+<Multi_key> <A> <apostrophe>		: "\301"	Aacute
+<Multi_key> <apostrophe> <A>		: "\301"	Aacute
+<Multi_key> <A> <asciicircum>		: "\302"	Acircumflex
+<Multi_key> <asciicircum> <A>		: "\302"	Acircumflex
+<Multi_key> <A> <greater>		: "\302"	Acircumflex
+<Multi_key> <greater> <A>		: "\302"	Acircumflex
+<Multi_key> <A> <U>			: "\303"	Abreve
+<Multi_key> <A> <breve>			: "\303"	Abreve
+<Multi_key> <breve> <A>			: "\303"	Abreve
+<Multi_key> <A> <quotedbl>		: "\304"	Adiaeresis
+<Multi_key> <quotedbl> <A>		: "\304"	Adiaeresis
+<Multi_key> <A> <comma>			: "\241"	Aogonek
+<Multi_key> <comma> <A>			: "\241"	Aogonek
+<Multi_key> <a> <grave>			: "\340"	agrave
+<Multi_key> <grave> <a>			: "\340"	agrave
+<Multi_key> <a> <apostrophe>		: "\341"	aacute
+<Multi_key> <apostrophe> <a>		: "\341"	aacute
+<Multi_key> <a> <asciicircum>		: "\342"	acircumflex
+<Multi_key> <asciicircum> <a>		: "\342"	acircumflex
+<Multi_key> <a> <greater>		: "\342"	acircumflex
+<Multi_key> <greater> <a>		: "\342"	acircumflex
+<Multi_key> <a> <U>			: "\343"	abreve
+<Multi_key> <a> <breve>			: "\343"	abreve
+<Multi_key> <breve> <a>			: "\343"	abreve
+<Multi_key> <a> <quotedbl>		: "\344"	adiaeresis
+<Multi_key> <quotedbl> <a>		: "\344"	adiaeresis
+<Multi_key> <a> <comma>			: "\242"	aogonek
+<Multi_key> <comma> <a>			: "\242"	aogonek
+<Multi_key> <A> <E>			: "\306"	AE
+<Multi_key> <a> <e>			: "\346"	ae
+<Multi_key> <C> <apostrophe>		: "\305"	Cacute
+<Multi_key> <apostrophe> <C>		: "\305"	Cacute
+<Multi_key> <C> <comma>			: "\307"	Ccedilla
+<Multi_key> <comma> <C>			: "\307"	Ccedilla
+<Multi_key> <C> <less>			: "\262"	Ccaron
+<Multi_key> <less> <C>			: "\262"	Ccaron
+<Multi_key> <c> <apostrophe>		: "\345"	cacute
+<Multi_key> <apostrophe> <c>		: "\345"	cacute
+<Multi_key> <c> <comma>			: "\347"	ccedilla
+<Multi_key> <comma> <c>			: "\347"	ccedilla
+<Multi_key> <c> <less>			: "\271"	ccaron
+<Multi_key> <less> <c>			: "\271"	ccaron
+<Multi_key> <D> <minus>			: "\320"	Dstroke
+<Multi_key> <minus> <D>			: "\320"	Dstroke
+<Multi_key> <d> <minus>			: "\360"	dstroke
+<Multi_key> <minus> <d>			: "\360"	dstroke
+<Multi_key> <E> <grave>			: "\310"	Egrave
+<Multi_key> <grave> <E>			: "\310"	Egrave
+<Multi_key> <E> <apostrophe>		: "\311"	Eacute
+<Multi_key> <apostrophe> <E>		: "\311"	Eacute
+<Multi_key> <E> <asciicircum>		: "\312"	Ecircumflex
+<Multi_key> <asciicircum> <E>		: "\312"	Ecircumflex
+<Multi_key> <E> <greater>		: "\312"	Ecircumflex
+<Multi_key> <greater> <E>		: "\312"	Ecircumflex
+<Multi_key> <E> <quotedbl>		: "\313"	Ediaeresis
+<Multi_key> <quotedbl> <E>		: "\313"	Ediaeresis
+<Multi_key> <E> <comma>			: "\335"	Eogonek
+<Multi_key> <comma> <E>			: "\335"	Eogonek
+<Multi_key> <e> <grave>			: "\350"	egrave
+<Multi_key> <grave> <e>			: "\350"	egrave
+<Multi_key> <e> <apostrophe>		: "\351"	eacute
+<Multi_key> <apostrophe> <e>		: "\351"	eacute
+<Multi_key> <e> <asciicircum>		: "\352"	ecircumflex
+<Multi_key> <asciicircum> <e>		: "\352"	ecircumflex
+<Multi_key> <e> <greater>		: "\352"	ecircumflex
+<Multi_key> <greater> <e>		: "\352"	ecircumflex
+<Multi_key> <e> <quotedbl>		: "\353"	ediaeresis
+<Multi_key> <quotedbl> <e>		: "\353"	ediaeresis
+<Multi_key> <e> <comma>			: "\375"	eogonek
+<Multi_key> <comma> <e>			: "\375"	eogonek
+<Multi_key> <I> <grave>			: "\314"	Igrave
+<Multi_key> <grave> <I>			: "\314"	Igrave
+<Multi_key> <I> <apostrophe>		: "\315"	Iacute
+<Multi_key> <apostrophe> <I>		: "\315"	Iacute
+<Multi_key> <I> <asciicircum>		: "\316"	Icircumflex
+<Multi_key> <asciicircum> <I>		: "\316"	Icircumflex
+<Multi_key> <I> <greater>		: "\316"	Icircumflex
+<Multi_key> <greater> <I>		: "\316"	Icircumflex
+<Multi_key> <I> <quotedbl>		: "\317"	Idiaeresis
+<Multi_key> <quotedbl> <I>		: "\317"	Idiaeresis
+<Multi_key> <i> <grave>			: "\354"	igrave
+<Multi_key> <grave> <i>			: "\354"	igrave
+<Multi_key> <i> <apostrophe>		: "\355"	iacute
+<Multi_key> <apostrophe> <i>		: "\355"	iacute
+<Multi_key> <i> <asciicircum>		: "\356"	icircumflex
+<Multi_key> <asciicircum> <i>		: "\356"	icircumflex
+<Multi_key> <i> <greater>		: "\356"	icircumflex
+<Multi_key> <greater> <i>		: "\356"	icircumflex
+<Multi_key> <i> <quotedbl>		: "\357"	idiaeresis
+<Multi_key> <quotedbl> <i>		: "\357"	idiaeresis
+<Multi_key> <L> <minus>			: "\243"	Lstroke
+<Multi_key> <l> <minus>			: "\263"	lstroke
+<Multi_key> <N> <apostrophe>		: "\321"	Nacute
+<Multi_key> <apostrophe> <N>		: "\321"	Nacute
+<Multi_key> <n> <apostrophe>		: "\361"	nacute
+<Multi_key> <apostrophe> <n>		: "\361"	nacute
+<Multi_key> <O> <grave>			: "\322"	Ograve
+<Multi_key> <grave> <O>			: "\322"	Ograve
+<Multi_key> <O> <apostrophe>		: "\323"	Oacute
+<Multi_key> <apostrophe> <O>		: "\323"	Oacute
+<Multi_key> <O> <asciicircum>		: "\324"	Ocircumflex
+<Multi_key> <asciicircum> <O>		: "\324"	Ocircumflex
+<Multi_key> <O> <greater>		: "\324"	Ocircumflex
+<Multi_key> <greater> <O>		: "\324"	Ocircumflex
+<Multi_key> <apostrophe> <apostrophe> <O>	: "\325"	Odoubleacute
+<Multi_key> <O> <quotedbl>		: "\326"	Odiaeresis
+<Multi_key> <quotedbl> <O>		: "\326"	Odiaeresis
+<Multi_key> <o> <grave>			: "\362"	ograve
+<Multi_key> <grave> <o>			: "\362"	ograve
+<Multi_key> <o> <apostrophe>		: "\363"	oacute
+<Multi_key> <apostrophe> <o>		: "\363"	oacute
+<Multi_key> <o> <asciicircum>		: "\364"	ocircumflex
+<Multi_key> <asciicircum> <o>		: "\364"	ocircumflex
+<Multi_key> <o> <greater>		: "\364"	ocircumflex
+<Multi_key> <greater> <o>		: "\364"	ocircumflex
+<Multi_key> <apostrophe> <apostrophe> <o>	: "\365"	odoubleacute
+<Multi_key> <o> <quotedbl>		: "\366"	odiaeresis
+<Multi_key> <quotedbl> <o>		: "\366"	odiaeresis
+<Multi_key> <O> <E>			: "\274"	OE
+<Multi_key> <o> <e>			: "\275"	oe
+<Multi_key> <S> <apostrophe>		: "\327"	Sacute
+<Multi_key> <apostrophe> <S>		: "\327"	Sacute
+<Multi_key> <S> <less>			: "\246"	Scaron
+<Multi_key> <less> <S>			: "\246"	Scaron
+<Multi_key> <s> <apostrophe>		: "\367"	sacute
+<Multi_key> <apostrophe> <s>		: "\367"	sacute
+<Multi_key> <s> <less>			: "\250"	scaron
+<Multi_key> <less> <s>			: "\250"	scaron
+<Multi_key> <s> <s>			: "\337"	ssharp
+<Multi_key> <U> <grave>			: "\331"	Ugrave
+<Multi_key> <grave> <U>			: "\331"	Ugrave
+<Multi_key> <U> <apostrophe>		: "\332"	Uacute
+<Multi_key> <apostrophe> <U>		: "\332"	Uacute
+<Multi_key> <apostrophe> <apostrophe> <U>	: "\330"	Udoubleacute
+<Multi_key> <U> <asciicircum>		: "\333"	Ucircumflex
+<Multi_key> <asciicircum> <U>		: "\333"	Ucircumflex
+<Multi_key> <U> <greater>		: "\333"	Ucircumflex
+<Multi_key> <greater> <U>		: "\333"	Ucircumflex
+<Multi_key> <U> <quotedbl>		: "\334"	Udiaeresis
+<Multi_key> <quotedbl> <U>		: "\334"	Udiaeresis
+<Multi_key> <u> <grave>			: "\371"	ugrave
+<Multi_key> <grave> <u>			: "\371"	ugrave
+<Multi_key> <u> <apostrophe>		: "\372"	uacute
+<Multi_key> <apostrophe> <u>		: "\372"	uacute
+<Multi_key> <apostrophe> <apostrophe> <u>	: "\370"	udoubleacute
+<Multi_key> <u> <asciicircum>		: "\373"	ucircumflex
+<Multi_key> <asciicircum> <u>		: "\373"	ucircumflex
+<Multi_key> <u> <greater>		: "\373"	ucircumflex
+<Multi_key> <greater> <u>		: "\373"	ucircumflex
+<Multi_key> <u> <quotedbl>		: "\374"	udiaeresis
+<Multi_key> <quotedbl> <u>		: "\374"	udiaeresis
+<Multi_key> <Y> <quotedbl>		: "\276"	Ydiaeresis
+<Multi_key> <quotedbl> <Y>		: "\276"	Ydiaeresis
+<Multi_key> <y> <quotedbl>		: "\377"	ydiaeresis
+<Multi_key> <quotedbl> <y>		: "\377"	ydiaeresis
+<Multi_key> <Z> <apostrophe>		: "\254"	Zacute
+<Multi_key> <apostrophe> <Z>		: "\254"	Zacute
+<Multi_key> <Z> <less>			: "\264"	Zcaron
+<Multi_key> <less> <Z>			: "\264"	Zcaron
+<Multi_key> <Z> <period>		: "\257"	Zabovedot
+<Multi_key> <z> <apostrophe>		: "\256"	zacute
+<Multi_key> <apostrophe> <z>		: "\256"	zacute
+<Multi_key> <z> <less>			: "\270"	zcaron
+<Multi_key> <less> <z>			: "\270"	zcaron
+<Multi_key> <z> <period>		: "\277"	zabovedot
+XCOMM
+XCOMM dead key accent keysyms
+XCOMM Special Character
+<dead_circumflex> <slash>		: "|"	bar
+<dead_circumflex> <space>		: "^"	asciicircum
+<dead_circumflex> <dead_circumflex>	: "^"	asciicircum
+<dead_tilde> <space>			: "~"	asciitilde
+<dead_tilde> <dead_tilde>		: "~"	asciitilde
+<dead_grave> <space>			: "`"	grave
+<dead_grave> <dead_grave>		: "`"	grave
+XCOMM These are for us_intl, that does not have diaeresis, etc
+<dead_acute> <space>			: "'"	apostrophe
+<dead_diaeresis> <space>		: "\""	quotedbl
+<dead_diaeresis> <dead_diaeresis>	: "\""	quotedbl
+<dead_doubleacute> <space>		: "\""	quotedbl
+<dead_circumflex> <0>			: "\260"	degree
+<dead_circumflex> <period>		: "\267"	periodcentered
+<dead_diaeresis> <quotedbl>		: "\""	quotedbl
+XCOMM Accented Alphabet
+<dead_grave> <A>			: "\300"	Agrave
+<dead_acute> <A>			: "\301"	Aacute
+<dead_circumflex> <A>			: "\302"	Acircumflex
+<dead_breve> <A>			: "\303"	Abreve
+<dead_diaeresis> <A>			: "\304"	Adiaeresis
+<dead_ogonek> <A>			: "\241"	Aogonek
+<dead_grave> <a>			: "\340"	agrave
+<dead_acute> <a>			: "\341"	aacute
+<dead_circumflex> <a>			: "\342"	acircumflex
+<dead_breve> <a>			: "\343"	abreve
+<dead_diaeresis> <a>			: "\344"	adiaeresis
+<dead_ogonek> <a>			: "\242"	aogonek
+<dead_acute> <C>			: "\305"	Cacute
+<dead_cedilla> <C>			: "\307"	Ccedilla
+<dead_caron> <C>			: "\262"	Ccaron
+<dead_acute> <c>			: "\345"	cacute
+<dead_cedilla> <c>			: "\347"	ccedilla
+<dead_caron> <c>			: "\271"	ccaron
+<dead_grave> <E>			: "\310"	Egrave
+<dead_acute> <E>			: "\311"	Eacute
+<dead_circumflex> <E>			: "\312"	Ecircumflex
+<dead_diaeresis> <E>			: "\313"	Ediaeresis
+<dead_ogonek> <E>			: "\335"	Eogonek
+<dead_grave> <e>			: "\350"	egrave
+<dead_acute> <e>			: "\351"	eacute
+<dead_circumflex> <e>			: "\352"	ecircumflex
+<dead_diaeresis> <e>			: "\353"	ediaeresis
+<dead_ogonek> <e>			: "\375"	eogonek
+<dead_grave> <I>			: "\314"	Igrave
+<dead_acute> <I>			: "\315"	Iacute
+<dead_circumflex> <I>			: "\316"	Icircumflex
+<dead_diaeresis> <I>			: "\317"	Idiaeresis
+<dead_grave> <i>			: "\354"	igrave
+<dead_acute> <i>			: "\355"	iacute
+<dead_circumflex> <i>			: "\356"	icircumflex
+<dead_diaeresis> <i>			: "\357"	idiaeresis
+<dead_acute> <N>			: "\321"	Nacute
+<dead_acute> <n>			: "\361"	nacute
+<dead_grave> <O>			: "\322"	Ograve
+<dead_acute> <O>			: "\323"	Oacute
+<dead_circumflex> <O>			: "\324"	Ocircumflex
+<dead_doubleacute> <O>			: "\325"	Odoubleacute
+<dead_diaeresis> <O>			: "\326"	Odiaeresis
+<dead_grave> <o>			: "\362"	ograve
+<dead_acute> <o>			: "\363"	oacute
+<dead_circumflex> <o>			: "\364"	ocircumflex
+<dead_doubleacute> <o>			: "\365"	odoubleacute
+<dead_diaeresis> <o>			: "\366"	odiaeresis
+<dead_acute> <S>			: "\327"	Sacute
+<dead_caron> <S>			: "\246"	Scaron
+<dead_circumflex> <S>			: "\246"	Scaron
+<dead_acute> <s>			: "\367"	sacute
+<dead_circumflex> <s>			: "\250"	scaron
+<dead_caron> <s>			: "\250"	scaron
+<dead_grave> <U>			: "\331"	Ugrave
+<dead_acute> <U>			: "\332"	Uacute
+<dead_doubleacute> <U>			: "\330"	Udoubleacute
+<dead_circumflex> <U>			: "\333"	Ucircumflex
+<dead_diaeresis> <U>			: "\334"	Udiaeresis
+<dead_grave> <u>			: "\371"	ugrave
+<dead_acute> <u>			: "\372"	uacute
+<dead_doubleacute> <u>			: "\370"	udoubleacute
+<dead_circumflex> <u>			: "\373"	ucircumflex
+<dead_diaeresis> <u>			: "\374"	udiaeresis
+<dead_diaeresis> <Y>			: "\276"	Ydiaeresis
+<dead_diaeresis> <y>			: "\377"	ydiaeresis
+<dead_acute> <Z>			: "\254"	Zacute
+<dead_caron> <Z>			: "\264"	Zcaron
+<dead_circumflex> <Z>			: "\264"	Zcaron
+<dead_abovedot> <Z>			: "\257"	Zabovedot
+<dead_acute> <z>			: "\256"	zacute
+<dead_caron> <z>			: "\270"	zcaron
+<dead_circumflex> <z>			: "\270"	zcaron
+<dead_abovedot> <z>			: "\277"	zabovedot
+XCOMM End of Sequence Definition
--- libX11-1.0.2/nls/iso8859-16.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/iso8859-16/Makefile.am	2006-06-29 18:10:54.640703750 +0200
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-16
+
+include $(top_srcdir)/nls/localerules.in
--- libX11-1.0.2/nls/iso8859-16.orig/XI18N_OBJS	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/iso8859-16/XI18N_OBJS	2006-06-29 18:08:53.137110250 +0200
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for iso8859-16 locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
--- libX11-1.0.2/nls/iso8859-16.orig/XLC_LOCALE.pre	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/iso8859-16/XLC_LOCALE.pre	2006-06-29 18:10:07.965786750 +0200
@@ -0,0 +1,80 @@
+XCOMM  $TOG: fcd8859-15 /main/1 1998/05/20 14:49:16 kaleb $
+XCOMM  XLocale Database Sample for fcd/dis/iso 8859-16.
+XCOMM  When Final Committee Draft (FCD) 8859-16 is formalized
+XCOMM  then this file will be renamed iso8859-16.
+XCOMM  This file is provided as preliminary support for the Latin-9
+XCOMM  (a.k.a. Latin-0) character set so that Europeans who want
+XCOMM  the Euro currency character can do so.
+XCOMM 
+XCOMM  $XFree86$
+XCOMM 
+
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+XCOMM 	fs0 class 
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-16:GL
+		substitute	ISO8859-16:GL
+		vertical_rotate	all
+	}
+}
+XCOMM 	fs1 class 
+fs1	{
+	charset	{
+		name		ISO8859-16:GR
+	}
+	font	{
+		primary		ISO8859-16:GR
+	}
+}
+END XLC_FONTSET
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name		ISO8859-16
+mb_cur_max		1
+state_depend_encoding	False
+#if WCHAR32
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+#else
+wc_encoding_mask	\x00008080
+wc_shift_bits		8
+#endif
+
+#ifndef X_LOCALE
+use_stdc_env		True
+force_convert_to_mb	True
+#endif
+
+XCOMM 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-16:GL; ISO8859-1:GL
+}
+
+
+XCOMM 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+#if WCHAR32
+	wc_encoding	\x30000000
+#else
+	wc_encoding	\x00008080
+#endif
+	ct_encoding	ISO8859-16:GR
+}
+
+END XLC_XLOCALE
--- libX11-1.0.2/nls/koi8-t.orig/Compose.pre	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/koi8-t/Compose.pre	2006-06-29 18:12:58.108420000 +0200
@@ -0,0 +1,72 @@
+XCOMM
+XCOMM koi8-t Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+<Multi_key> <plus> <plus>               : "#"   numbersign
+<Multi_key> <apostrophe> <space>        : "'"   apostrophe
+<Multi_key> <space> <apostrophe>        : "'"   apostrophe
+<Multi_key> <A> <T>                     : "@"   at
+<Multi_key> <parenleft> <parenleft>     : "["   bracketleft
+<Multi_key> <slash> <slash>             : "\\"  backslash
+<Multi_key> <slash> <less>              : "\\"  backslash
+<Multi_key> <less> <slash>              : "\\"  backslash
+<Multi_key> <parenright> <parenright>   : "]"   bracketright
+<Multi_key> <asciicircum> <space>       : "^"   asciicircum
+<Multi_key> <space> <asciicircum>       : "^"   asciicircum
+<Multi_key> <greater> <space>           : "^"   asciicircum
+<Multi_key> <space> <greater>           : "^"   asciicircum
+<Multi_key> <grave> <space>             : "`"   grave
+<Multi_key> <space> <grave>             : "`"   grave
+<Multi_key> <parenleft> <minus>         : "{"   braceleft
+<Multi_key> <minus> <parenleft>         : "{"   braceleft
+<Multi_key> <slash> <asciicircum>       : "|"   bar
+<Multi_key> <asciicircum> <slash>       : "|"   bar
+<Multi_key> <V> <L>                     : "|"   bar
+<Multi_key> <L> <V>                     : "|"   bar
+<Multi_key> <v> <l>                     : "|"   bar
+<Multi_key> <l> <v>                     : "|"   bar
+<Multi_key> <parenright> <minus>        : "}"   braceright
+<Multi_key> <minus> <parenright>        : "}"   braceright
+<Multi_key> <asciitilde> <space>        : "~"   asciitilde
+<Multi_key> <space> <asciitilde>        : "~"   asciitilde
+<Multi_key> <minus> <space>             : "~"   asciitilde
+<Multi_key> <space> <minus>             : "~"   asciitilde
+
+<Multi_key> <space> <space>             : "\240"	nobreakspace
+
+<Multi_key> <Cyrillic_ka> <comma>       : "\200"	Cyrillic_ka_descender
+<Multi_key> <Cyrillic_ghe> <minus>      : "\201"	Cyrillic_ghe_bar
+<Multi_key> <Cyrillic_GHE> <minus>      : "\203"	Cyrillic_GHE_bar
+<Multi_key> <Cyrillic_ha> <comma>	: "\212"	Cyrillic_ha_descender
+<Multi_key> <Cyrillic_HA> <comma>	: "\214"	Cyrillic_HA_descender
+<Multi_key> <Cyrillic_che> <comma>	: "\215"	Cyrillic_che_descender
+<Multi_key> <Cyrillic_CHE> <comma>	: "\216"	Cyrillic_CHE_descender
+<Multi_key> <Cyrillic_KA> <comma>       : "\220"	Cyrillic_KA_descender
+<Multi_key> <Cyrillic_u> <minus>	: "\241"	Cyrillic_u_macron
+<Multi_key> <Cyrillic_U> <minus>	: "\242"	Cyrillic_U_macron
+<Multi_key> <Cyrillic_shorti> <Cyrillic_o> : "\243"	Cyrillic_io
+<Multi_key> <Cyrillic_je> <Cyrillic_o>	: "\243"	Cyrillic_io
+<Multi_key> <Cyrillic_ie> <colon>	: "\243"	Cyrillic_io
+<Multi_key> <Cyrillic_i> <minus> 	: "\245"	Cyrillic_i_macron
+<Multi_key> <Cyrillic_SHORTI> <Cyrillic_O> : "\263"	Cyrillic_IO
+<Multi_key> <Cyrillic_JE> <Cyrillic_O>	: "\263"	Cyrillic_IO
+<Multi_key> <Cyrillic_IE> <colon>	: "\263"	Cyrillic_IO
+<Multi_key> <Cyrillic_I> <minus>      	: "\265"	Cyrillic_I_macron
+<Multi_key> <Cyrillic_shorti> <Cyrillic_u> : "\300"	Cyrillic_yu
+<Multi_key> <Cyrillic_je> <Cyrillic_u>	: "\300"	Cyrillic_yu
+<Multi_key> <Cyrillic_te> <Cyrillic_es>	: "\303"	Cyrillic_tse
+<Multi_key> <Cyrillic_shorti> <Cyrillic_a> : "\321"	Cyrillic_ya
+<Multi_key> <Cyrillic_je> <Cyrillic_a>	: "\321"	Cyrillic_ya
+<Multi_key> <Cyrillic_sha> <comma>	: "\335"	Cyrillic_shcha
+<Multi_key> <Cyrillic_SHORTI> <Cyrillic_U> : "\340"	Cyrillic_YU
+<Multi_key> <Cyrillic_JE> <Cyrillic_U>	: "\340"	Cyrillic_YU
+<Multi_key> <Cyrillic_TE> <Cyrillic_ES>	: "\343"	Cyrillic_TSE
+<Multi_key> <Cyrillic_SHORTI> <Cyrillic_A> : "\361"	Cyrillic_YA
+<Multi_key> <Cyrillic_JE> <Cyrillic_A>	: "\361"	Cyrillic_YA
+<Multi_key> <Cyrillic_SHA> <comma>	: "\375"	Cyrillic_SHCHA
+
+XCOMM End of Sequence Definition
--- libX11-1.0.2/nls/koi8-t.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/koi8-t/Makefile.am	2006-06-29 18:14:06.356685250 +0200
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-t
+
+include $(top_srcdir)/nls/localerules.in
--- libX11-1.0.2/nls/koi8-t.orig/XI18N_OBJS	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/koi8-t/XI18N_OBJS	2006-06-29 18:13:12.605326000 +0200
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for koi8-t locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
--- libX11-1.0.2/nls/koi8-t.orig/XLC_LOCALE.pre	1970-01-01 01:00:00.000000000 +0100
+++ libX11-1.0.2/nls/koi8-t/XLC_LOCALE.pre	2006-06-29 18:14:01.496381500 +0200
@@ -0,0 +1,79 @@
+XCOMM  XLocale Database Sample for koi8-t.
+XCOMM 
+
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+XCOMM 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		KOI8-T:GL
+		substitute	ISO8859-1:GL
+	}
+}
+XCOMM 	fs1 class 
+fs1	{
+	charset         KOI8-T:GR
+	font            KOI8-T:GR
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM	XLC_CHARSET_DEFINE category
+XCOMM
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	KOI8-T
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name           KOI8-T
+mb_cur_max		1
+state_depend_encoding	False
+#if WCHAR32
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+#else
+wc_encoding_mask	\x00008080
+wc_shift_bits		8
+#endif
+
+#ifndef X_LOCALE
+use_stdc_env		True
+#endif
+
+XCOMM 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     KOI8-T:GL; ISO8859-1:GL
+}
+
+
+XCOMM 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+#if WCHAR32
+	wc_encoding	\x30000000
+#else
+	wc_encoding	\x00008080
+#endif
+	ct_encoding     KOI8-T:GR
+}
+
+END XLC_XLOCALE
--- libX11-1.6.4/configure.ac.orig	2016-10-05 05:41:51.461791657 +0200
+++ libX11-1.6.4/configure.ac	2016-10-05 16:19:07.591355076 +0200
@@ -359,10 +359,10 @@
  am_ET.UTF-8  armscii-8   C           cs_CZ.UTF-8  el_GR.UTF-8  en_US.UTF-8 \
  fi_FI.UTF-8  georgian-academy        georgian-ps  ibm-cp1133   iscii-dev \
  isiri-3342   iso8859-1   iso8859-10  iso8859-11   iso8859-13   iso8859-14 \
- iso8859-15   iso8859-2   iso8859-3   iso8859-4    iso8859-5    iso8859-6 \
+ iso8859-15   iso8859-16  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.SJIS     km_KH.UTF-8 ko           koi8-c       koi8-r \
- koi8-u       ko_KR.UTF-8 microsoft-cp1251         microsoft-cp1255 \
+ koi8-t       koi8-u      ko_KR.UTF-8 microsoft-cp1251          microsoft-cp1255 \
  microsoft-cp1256         mulelao-1   nokhchi-1    pt_BR.UTF-8  pt_PT.UTF-8 \
  ru_RU.UTF-8  sr_RS.UTF-8 tatar-cyr   th_TH        th_TH.UTF-8  tscii-0 \
  vi_VN.tcvn   vi_VN.viscii            zh_CN        zh_CN.gb18030 \
--- libX11-1.7.4/nls/compose.dir.pre.orig	2022-03-30 22:55:23.000000000 +0200
+++ libX11-1.7.4/nls/compose.dir.pre	2022-03-31 19:41:05.259859016 +0200
@@ -5,7 +5,9 @@ XCOMM	and the second word is the full lo
 XCOMM
 XCOMM
 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
@@ -25,7 +27,7 @@ iso8859-6/Compose:		ar_SY.ISO8859-6
 iso8859-6/Compose:		ar_TN.ISO8859-6
 iso8859-6/Compose:		ar_YE.ISO8859-6
 iso8859-9e/Compose:		az_AZ.ISO8859-9E
-koi8-c/Compose:			az_AZ.KOI8-C
+koi8-c/Compose:			az_AZ.KOI8-K
 microsoft-cp1251/Compose:	be_BY.CP1251
 iso8859-5/Compose:		be_BY.ISO8859-5
 iso8859-5/Compose:		bg_BG.ISO8859-5
@@ -62,6 +64,7 @@ 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_CY.ISO8859-7
 iso8859-7/Compose:		el_GR.ISO8859-7
 iso8859-15/Compose:		el_GR.ISO8859-15
 iso8859-1/Compose:		en_AU.ISO8859-1
@@ -70,7 +73,7 @@ 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_DK.ISO8859-1
 iso8859-1/Compose:		en_GB.ISO8859-1
 iso8859-15/Compose:		en_GB.ISO8859-15
 iso8859-1/Compose:		en_HK.ISO8859-1
@@ -83,8 +86,6 @@ 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
 iso8859-1/Compose:		en_US.ISO8859-1
 iso8859-15/Compose:		en_US.ISO8859-15
 iso8859-1/Compose:		en_ZA.ISO8859-1
@@ -128,6 +129,7 @@ iso8859-15/Compose:		eu_ES.ISO8859-15
 isiri-3342/Compose:		fa_IR.ISIRI-3342
 iso8859-1/Compose:		fi_FI.ISO8859-1
 iso8859-15/Compose:		fi_FI.ISO8859-15
+iso8859-1/Compose:		fil_PH.ISO8859-1
 iso8859-1/Compose:		fo_FO.ISO8859-1
 iso8859-15/Compose:		fo_FO.ISO8859-15
 iso8859-1/Compose:		fr_BE.ISO8859-1
@@ -152,9 +154,10 @@ iso8859-1/Compose:		gv_GB.ISO8859-1
 iso8859-14/Compose:		gv_GB.ISO8859-14
 iso8859-15/Compose:		gv_GB.ISO8859-15
 iso8859-8/Compose:		he_IL.ISO8859-8
-microsoft-cp1255/Compose:	he_IL.CP1255
+XCOMM microsoft-cp1255/Compose:	he_IL.CP1255
 iscii-dev/Compose:		hi_IN.ISCII-DEV
 iso8859-2/Compose:		hr_HR.ISO8859-2
+iso8859-2/Compose:		hsb_DE.ISO8859-2
 iso8859-2/Compose:		hu_HU.ISO8859-2
 armscii-8/Compose:		hy_AM.ARMSCII-8
 iso8859-1/Compose:		id_ID.ISO8859-1
@@ -170,12 +173,18 @@ ja.SJIS/Compose:		ja_JP.SJIS
 ja.JIS/Compose:			ja_JP.JIS7
 georgian-academy/Compose:	ka_GE.GEORGIAN-ACADEMY
 georgian-ps/Compose:		ka_GE.GEORGIAN-PS
+XCOMM pt-154/Compose:		kk_KZ.PT154
 iso8859-1/Compose:		kl_GL.ISO8859-1
 iso8859-15/Compose:		kl_GL.ISO8859-15
 ko/Compose:			ko_KR.eucKR
 iso8859-1/Compose:		kw_GB.ISO8859-1
 iso8859-14/Compose:		kw_GB.ISO8859-14
 iso8859-15/Compose:		kw_GB.ISO8859-15
+iso8859-10/Compose:		lg_UG.ISO8859-10
+iso8859-1/Compose:		li_BE.ISO8859-1
+iso8859-15/Compose:		li_BE.ISO8859-15
+iso8859-1/Compose:		li_NL.ISO8859-1
+iso8859-15/Compose:		li_NL.ISO8859-15
 ibm-cp1133/Compose:		lo_LA.IBM-CP1133
 mulelao-1/Compose:		lo_LA.MULELAO-1
 iso8859-4/Compose:		lt_LT.ISO8859-4
@@ -184,11 +193,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
-microsoft-cp1251/Compose:	mk_MK.CP1251
+XCOMM microsoft-cp1251/Compose:	mk_MK.CP1251
 iso8859-1/Compose:		ms_MY.ISO8859-1
 iso8859-3/Compose:		mt_MT.ISO8859-3
 iso8859-1/Compose:		nb_NO.ISO8859-1
 iso8859-15/Compose:		nb_NO.ISO8859-15
+iso8859-1/Compose:		nds_DE.ISO8859-1
+iso8859-15/Compose:		nds_DE.ISO8859-15
 iso8859-1/Compose:		nl_BE.ISO8859-1
 iso8859-15/Compose:		nl_BE.ISO8859-15
 iso8859-1/Compose:		nl_NL.ISO8859-1
@@ -196,30 +207,41 @@ iso8859-15/Compose:		nl_NL.ISO8859-15
 iso8859-1/Compose:		nn_NO.ISO8859-1
 iso8859-15/Compose:		nn_NO.ISO8859-15
 iso8859-1/Compose:		nr_ZA.ISO8859-1
-iso8859-15/Compose:		nso_ZA.ISO8859-15
+iso8859-10/Compose:		nso_ZA.ISO8859-10
 iso8859-1/Compose:		oc_FR.ISO8859-1
 iso8859-15/Compose:		oc_FR.ISO8859-15
+iso8859-1/Compose:		om_KE.ISO8859-1
+iso8859-1/Compose:		pap_AN.ISO8859-1
+iso8859-15/Compose:		pap_AN.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
+iso8859-16/Compose:		pl_PL.ISO8859-16
 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
+iso8859-16/Compose:		ro_RO.ISO8859-16
 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
+XCOMM microsoft-cp1251/Compose:	ru_RU.CP1251
+XCOMM microsoft-cp1251/Compose:	ru_UA.CP1251
 koi8-u/Compose:			ru_UA.KOI8-U
 iso8859-1/Compose:		rw_RW.ISO8859-1
 iso8859-2/Compose:		sk_SK.ISO8859-2
 iso8859-2/Compose:		sl_SI.ISO8859-2
+iso8859-16/Compose:		sl_SI.ISO8859-16
+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-5/Compose:		sr_ME.ISO8859-5
+iso8859-16/Compose:		sr_ME.ISO8859-16
+iso8859-2/Compose:		sr_RS.ISO8859-2
+iso8859-5/Compose:		sr_RS.ISO8859-5
 iso8859-1/Compose:		ss_ZA.ISO8859-1
 iso8859-1/Compose:		st_ZA.ISO8859-1
 iso8859-1/Compose:		sv_FI.ISO8859-1
@@ -227,16 +249,18 @@ iso8859-15/Compose:		sv_FI.ISO8859-15
 iso8859-1/Compose:		sv_SE.ISO8859-1
 iso8859-15/Compose:		sv_SE.ISO8859-15
 tscii-0/Compose:		ta_IN.TSCII-0
-koi8-c/Compose:			tg_TJ.KOI8-C
+koi8-c/Compose:			tg_TJ.KOI8-K
+koi8-t/Compose:			tg_TJ.KOI8-T
 iso8859-11/Compose:		th_TH.ISO8859-11
 th_TH/Compose:			th_TH.TIS620
 iso8859-1/Compose:		tl_PH.ISO8859-1
-iso8859-15/Compose:		tn_ZA.ISO8859-15
+iso8859-10/Compose:		tn_ZA.ISO8859-10
+iso8859-9/Compose:		tr_CY.ISO8859-9
 iso8859-9/Compose:		tr_TR.ISO8859-9
 iso8859-1/Compose:		ts_ZA.ISO8859-1
-koi8-c/Compose:			tt_RU.KOI8-C
+koi8-c/Compose:			tt_RU.KOI8-K
 tatar-cyr/Compose:		tt_RU.TATAR-CYR
-microsoft-cp1251/Compose:	uk_UA.CP1251
+XCOMM microsoft-cp1251/Compose:	uk_UA.CP1251
 koi8-u/Compose:			uk_UA.KOI8-U
 iso8859-5/Compose:		uk_UA.ISO8859-5
 microsoft-cp1256/Compose:	ur_PK.CP1256
@@ -259,8 +283,12 @@ iso8859-1/Compose:		zu_ZA.ISO8859-1
 XCOMM
 XCOMM
 en_US.UTF-8/Compose:		C.UTF-8
+en_US.UTF-8/Compose:		aa_DJ.UTF-8
+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:		an_ES.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
@@ -290,11 +318,13 @@ 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
 en_US.UTF-8/Compose:		ca_IT.UTF-8
 cs_CZ.UTF-8/Compose:		cs_CZ.UTF-8
+en_US.UTF-8/Compose:		csb_PL.UTF-8
 en_US.UTF-8/Compose:		cy_GB.UTF-8
 en_US.UTF-8/Compose:		da_DK.UTF-8
 en_US.UTF-8/Compose:		de_AT.UTF-8
@@ -312,7 +342,6 @@ en_US.UTF-8/Compose:		en_BW.UTF-8
 en_US.UTF-8/Compose:		en_BZ.UTF-8
 en_US.UTF-8/Compose:		en_CA.UTF-8
 en_US.UTF-8/Compose:		en_DK.UTF-8
-en_US.UTF-8/Compose:		en_EN.UTF-8
 en_US.UTF-8/Compose:		en_GB.UTF-8
 en_US.UTF-8/Compose:		en_HK.UTF-8
 en_US.UTF-8/Compose:		en_IE.UTF-8
@@ -324,7 +353,6 @@ 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
@@ -363,6 +391,7 @@ 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:		gl_ES.UTF-8
 en_US.UTF-8/Compose:		gu_IN.UTF-8
 en_US.UTF-8/Compose:		gv_GB.UTF-8
@@ -370,6 +399,7 @@ en_US.UTF-8/Compose:		he_IL.UTF-8
 en_US.UTF-8/Compose:		hi_IN.UTF-8
 en_US.UTF-8/Compose:		hne_IN.UTF-8
 en_US.UTF-8/Compose:		hr_HR.UTF-8
+en_US.UTF-8/Compose:		hsb_DE.UTF-8
 en_US.UTF-8/Compose:		hu_HU.UTF-8
 en_US.UTF-8/Compose:		hy_AM.UTF-8
 en_US.UTF-8/Compose:		id_ID.UTF-8
@@ -389,6 +419,9 @@ en_US.UTF-8/Compose:		ks_IN.UTF-8@devana
 en_US.UTF-8/Compose:		ku_TR.UTF-8
 en_US.UTF-8/Compose:		kw_GB.UTF-8
 en_US.UTF-8/Compose:		ky_KG.UTF-8
+en_US.UTF-8/Compose:		lg_UG.UTF-8
+en_US.UTF-8/Compose:		li_BE.UTF-8
+en_US.UTF-8/Compose:		li_NL.UTF-8
 en_US.UTF-8/Compose:		lo_LA.UTF-8
 en_US.UTF-8/Compose:		lt_LT.UTF-8
 en_US.UTF-8/Compose:		lv_LV.UTF-8
@@ -396,10 +429,12 @@ en_US.UTF-8/Compose:		mai_IN.UTF-8
 en_US.UTF-8/Compose:		mi_NZ.UTF-8
 en_US.UTF-8/Compose:		mk_MK.UTF-8
 en_US.UTF-8/Compose:		ml_IN.UTF-8
+en_US.UTF-8/Compose:		mn_MN.UTF-8
 en_US.UTF-8/Compose:		mr_IN.UTF-8
 en_US.UTF-8/Compose:		ms_MY.UTF-8
 en_US.UTF-8/Compose:		mt_MT.UTF-8
 en_US.UTF-8/Compose:		nb_NO.UTF-8
+en_US.UTF-8/Compose:		nds_DE.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
@@ -407,14 +442,15 @@ en_US.UTF-8/Compose:		nn_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:		oc_FR.UTF-8
+en_US.UTF-8/Compose:		om_ET.UTF-8
+en_US.UTF-8/Compose:		om_KE.UTF-8
 en_US.UTF-8/Compose:		or_IN.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:		pap_AN.UTF-8
 en_US.UTF-8/Compose:		pd_DE.UTF-8
 en_US.UTF-8/Compose:		pd_US.UTF-8
-en_US.UTF-8/Compose:		ph_PH.UTF-8
 en_US.UTF-8/Compose:		pl_PL.UTF-8
-en_US.UTF-8/Compose:		pp_AN.UTF-8
 pt_BR.UTF-8/Compose:		pt_BR.UTF-8
 pt_PT.UTF-8/Compose:		pt_PT.UTF-8
 en_US.UTF-8/Compose:		ro_RO.UTF-8
@@ -427,8 +463,13 @@ en_US.UTF-8/Compose:		sd_IN.UTF-8@devana
 en_US.UTF-8/Compose:		se_NO.UTF-8
 en_US.UTF-8/Compose:		sh_BA.UTF-8
 en_US.UTF-8/Compose:		si_LK.UTF-8
+en_US.UTF-8/Compose:		sid_ET.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_DJ.UTF-8
+en_US.UTF-8/Compose:		so_ET.UTF-8
+en_US.UTF-8/Compose:		so_KE.UTF-8
+en_US.UTF-8/Compose:		so_SO.UTF-8
 en_US.UTF-8/Compose:		sq_AL.UTF-8
 sr_RS.UTF-8/Compose:		sr_ME.UTF-8
 sr_RS.UTF-8/Compose:		sr_RS.UTF-8
@@ -442,8 +483,11 @@ en_US.UTF-8/Compose:		tg_TJ.UTF-8
 th_TH.UTF-8/Compose:		th_TH.UTF-8
 en_US.UTF-8/Compose:		ti_ER.UTF-8
 en_US.UTF-8/Compose:		ti_ET.UTF-8
+en_US.UTF-8/Compose:		tig_ER.UTF-8
+en_US.UTF-8/Compose:		tk_TM.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_CY.UTF-8
 en_US.UTF-8/Compose:		tr_TR.UTF-8
 en_US.UTF-8/Compose:		ts_ZA.UTF-8
 en_US.UTF-8/Compose:		tt_RU.UTF-8
--- libX11-1.7.4/nls/locale.alias.pre.orig	2022-03-30 22:55:23.000000000 +0200
+++ libX11-1.7.4/nls/locale.alias.pre	2022-03-31 20:08:30.464279512 +0200
@@ -18,11 +18,21 @@ English_United-States.437:			C
 C.UTF-8:					en_US.UTF-8
 C.utf8:						en_US.UTF-8
 XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-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_AZ.KOI8-K
+a3_AZ:						az_AZ.KOI8-K
+a3_AZ.koi8c:					az_AZ.KOI8-K
+a3_AZ.KOI-C:					az_AZ.KOI8-K
 a3_AZ.UTF-8:					az_AZ.UTF-8
+aa_DJ:						aa_DJ.ISO8859-1
+aa_DJ.iso88591:					aa_DJ.ISO8859-1
+aa_DJ.ISO-8859-1:				aa_DJ.ISO8859-1
+aa_DJ.utf8:					aa_DJ.UTF-8
+aa_ER:						aa_ER.UTF-8
+aa_ER.utf8:					aa_ER.UTF-8
+aa_ER@saaho:					aa_ER.UTF-8
+aa_ER.utf8@saaho:				aa_ER.UTF-8
+aa_ET:						aa_ET.UTF-8
+aa_ET.utf8:					aa_ET.UTF-8
 af:						af_ZA.ISO8859-1
 af_ZA:						af_ZA.ISO8859-1
 af_ZA.iso88591:					af_ZA.ISO8859-1
@@ -30,6 +40,11 @@ af_ZA.ISO-8859-1:				af_ZA.ISO8859-1
 af_ZA.utf8:					af_ZA.UTF-8
 am:						am_ET.UTF-8
 am_ET:						am_ET.UTF-8
+am_ET.utf8:					am_ET.UTF-8
+an_ES:						an_ES.ISO8859-15
+an_ES.iso885915:				an_ES.ISO8859-15
+an_ES.ISO-8859-15:				an_ES.ISO8859-15
+an_ES.utf8:					an_ES.UTF-8
 ar:						ar_AA.ISO8859-6
 ar_AA:						ar_AA.ISO8859-6
 ar_AA.iso88596:					ar_AA.ISO8859-6
@@ -107,9 +122,14 @@ ar_YE.utf8:					ar_YE.UTF-8
 as:						as_IN.UTF-8
 as_IN:						as_IN.UTF-8
 as_IN.utf8:					as_IN.UTF-8
-az:						az_AZ.ISO8859-9E
-az_AZ:						az_AZ.ISO8859-9E
+az:						az_AZ.UTF-8
+az_AZ:						az_AZ.UTF-8
 az_AZ.iso88599e:				az_AZ.ISO8859-9E
+az_AZ.utf8:					az_AZ.UTF-8
+az_AZ.utf8@cyrillic:				az_AZ.UTF-8
+az_AZ.koi8k:					az_AZ.KOI8-K
+az_AZ@cyrillic:					az_AZ.KOI8-K
+az_AZ.koi8k@cyrillic:				az_AZ.KOI8-K
 be:						be_BY.CP1251
 be@latin:					be_BY.UTF-8@latin
 be_BY:						be_BY.CP1251
@@ -126,10 +146,11 @@ bg_BG.cp1251:					bg_BG.CP1251
 bg_BG.microsoftcp1251:				bg_BG.CP1251
 bg_BG.microsoft-cp1251:				bg_BG.CP1251
 bg_BG.MICROSOFT-CP1251:				bg_BG.CP1251
-bg_BG.iso88595:					bg_BG.ISO8859-5
-bg_BG.ISO-8859-5:				bg_BG.ISO8859-5
 bg_BG.koi8r:					bg_BG.KOI8-R
 bg_BG.utf8:					bg_BG.UTF-8
+bn:						bn_BD.UTF-8
+bn_BD:						bn_BD.UTF-8
+bn_BD.utf8:					bn_BD.UTF-8
 bn_IN:						bn_IN.UTF-8
 bn_IN.utf8:					bn_IN.UTF-8
 bo_IN:						bo_IN.UTF-8
@@ -141,9 +162,12 @@ br_FR.ISO-8859-1:				br_FR.ISO8859-1
 br_FR.iso885914:				br_FR.ISO8859-14
 br_FR.ISO-8859-14:				br_FR.ISO8859-14
 br_FR.iso885915:				br_FR.ISO8859-15
+br_FR.iso885915@euro:				br_FR.ISO8859-15
 br_FR.ISO-8859-15:				br_FR.ISO8859-15
 br_FR.ISO-8859-15@euro:				br_FR.ISO8859-15
 br_FR@euro:					br_FR.ISO8859-15
+br_FR.utf8:					br_FR.UTF-8
+br_FR.utf8@euro:				br_FR.UTF-8
 br_FR.UTF-8@euro:				br_FR.UTF-8
 bs:						bs_BA.ISO8859-2
 bs_BA:						bs_BA.ISO8859-2
@@ -165,10 +189,11 @@ ca_ES@euro:					ca_ES.ISO8859-15
 ca_ES.iso88591:					ca_ES.ISO8859-1
 ca_ES.ISO-8859-1:				ca_ES.ISO8859-1
 ca_ES.iso885915:				ca_ES.ISO8859-15
-ca_ES.utf8:					ca_ES.UTF-8
+ca_ES.iso885915@euro:				ca_ES.ISO8859-15
 ca_ES.ISO-8859-15:				ca_ES.ISO8859-15
 ca_ES.ISO-8859-15@euro:				ca_ES.ISO8859-15
 ca_ES.UTF-8@euro:				ca_ES.UTF-8
+ca_ES.utf8:					ca_ES.UTF-8
 ca_FR:						ca_FR.ISO8859-1
 ca_FR@euro:					ca_FR.ISO8859-15
 ca_FR.iso88591:					ca_FR.ISO8859-1
@@ -196,14 +221,18 @@ 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
-cy:						cy_GB.ISO8859-1
-cy_GB:						cy_GB.ISO8859-1
+csb:						csb_PL.UTF-8
+csb_PL:						csb_PL.UTF-8
+csb_PL.utf8:					csb_PL.UTF-8
+cy:						cy_GB.ISO8859-14
+cy_GB:						cy_GB.ISO8859-14
 cy_GB.iso88591:					cy_GB.ISO8859-1
 cy_GB.ISO-8859-1:				cy_GB.ISO8859-1
 cy_GB.iso885914:				cy_GB.ISO8859-14
 cy_GB.ISO-8859-14:				cy_GB.ISO8859-14
 cy_GB.iso885915:				cy_GB.ISO8859-15
 cy_GB.ISO-8859-15:				cy_GB.ISO8859-15
+cy_GB.utf8:					cy_GB.UTF-8
 da:						da_DK.ISO8859-1
 da.ISO8859-15:					da_DK.ISO8859-15
 da_DK:						da_DK.ISO8859-1
@@ -225,18 +254,22 @@ de_AT.ISO-8859-1:				de_AT.ISO8859-1
 de_AT.ISO_8859-1:				de_AT.ISO8859-1
 de_AT.iso885915:				de_AT.ISO8859-15
 de_AT.ISO-8859-15:				de_AT.ISO8859-15
+de_AT.iso885915@euro:				de_AT.ISO8859-15
 de_AT.ISO-8859-15@euro:				de_AT.ISO8859-15
+de_AT.ISO_8859-15@euro:				de_AT.ISO8859-15
 de_AT.UTF-8@euro:				de_AT.UTF-8
 de_AT.utf8:					de_AT.UTF-8
 de_BE:						de_BE.ISO8859-1
+de_BE.iso885915@euro:				de_BE.ISO8859-15
+de_BE.ISO-8859-15@euro:				de_BE.ISO8859-15
 de_BE@euro:					de_BE.ISO8859-15
+de_BE.utf8:					de_BE.UTF-8
 de_BE.iso88591:					de_BE.ISO8859-1
 de_BE.ISO_8859-1:				de_BE.ISO8859-1
 de_BE.ISO-8859-1:				de_BE.ISO8859-1
 de_BE.iso885915:				de_BE.ISO8859-15
 de_BE.ISO_8859-15:				de_BE.ISO8859-15
 de_BE.ISO-8859-15:				de_BE.ISO8859-15
-de_BE.ISO-8859-15@euro:				de_BE.ISO8859-15
 de_BE.UTF-8@euro:				de_BE.UTF-8
 de_CH:						de_CH.ISO8859-1
 de_CH.iso88591:					de_CH.ISO8859-1
@@ -258,6 +291,7 @@ de_DE.ISO-8859-15:				de_DE.ISO8859-15
 de_DE.ISO_8859-15:				de_DE.ISO8859-15
 de_DE.8859-15:					de_DE.ISO8859-15
 de_DE.8859-15@euro:				de_DE.ISO8859-15
+de_DE.iso885915@euro:				de_DE.ISO8859-15
 de_DE.ISO-8859-15@euro:				de_DE.ISO8859-15
 de_DE.UTF-8@euro:				de_DE.UTF-8
 de_DE.utf8:					de_DE.UTF-8
@@ -279,17 +313,24 @@ de_LU.ISO-8859-1:				de_LU.ISO8859-1
 de_LU.iso885915:				de_LU.ISO8859-15
 de_LU.ISO_8859-15:				de_LU.ISO8859-15
 de_LU.ISO-8859-15:				de_LU.ISO8859-15
+de_LU.iso885915@euro:				de_LU.ISO8859-15
 de_LU.ISO-8859-15@euro:				de_LU.ISO8859-15
 de_LU.UTF-8@euro:				de_LU.UTF-8
 de_LU.utf8:					de_LU.UTF-8
-ee:						ee_EE.ISO8859-4
-ee_EE:						ee_EE.ISO8859-4
-ee_EE.iso88594:					ee_EE.ISO8859-4
+XCOMM ee* are bogus
+ee:						et_EE.ISO8859-4
+ee_EE:						et_EE.ISO8859-4
+ee_EE.iso88594:					et_EE.ISO8859-4
 el:						el_GR.ISO8859-7
+el_CY:						el_CY.ISO8859-7
+el_CY.iso88597:					el_CY.ISO8859-7
+el_CY.ISO-8859-7:				el_CY.ISO8859-7
+el_CY.ISO_8859-7:				el_CY.ISO8859-7
+el_CY.utf8:					el_CY.UTF-8
 el_GR:						el_GR.ISO8859-7
 el_GR.iso88597:					el_GR.ISO8859-7
 el_GR.ISO-8859-7:				el_GR.ISO8859-7
-el_GR@euro:					el_GR.ISO8859-15
+el_GR@euro:					el_GR.UTF-8
 el_GR.utf8:					el_GR.UTF-8
 en:						en_US.ISO8859-1
 en.ISO-8859-1:					en_US.ISO8859-1
@@ -310,7 +351,10 @@ 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_DK:						en_DK.ISO8859-1
+en_DK.iso88591:					en_DK.ISO8859-1
+en_DK.ISO-8859-1:				en_DK.ISO8859-1
+en_DK.utf8:					en_DK.UTF-8
 en_GB:						en_GB.ISO8859-1
 en_GB.88591:					en_GB.ISO8859-1
 en_GB.88591.en:					en_GB.ISO8859-1
@@ -321,6 +365,8 @@ en_GB.iso885915:				en_GB.ISO8859-15
 en_GB.ISO-8859-15:				en_GB.ISO8859-15
 en_GB.utf8:					en_GB.UTF-8
 en_UK:						en_GB.ISO8859-1
+en_UK.ISO8859-1:				en_GB.ISO8859-1
+en_UK.UTF-8:					en_GB.UTF-8
 en_HK:						en_HK.ISO8859-1
 en_HK.iso88591:					en_HK.ISO8859-1
 en_HK.ISO-8859-1:				en_HK.ISO8859-1
@@ -330,6 +376,7 @@ en_IE.iso88591:					en_IE.ISO8859-1
 en_IE.ISO-8859-1:				en_IE.ISO8859-1
 en_IE.iso885915:				en_IE.ISO8859-15
 en_IE.ISO-8859-15:				en_IE.ISO8859-15
+en_IE.iso885915@euro:				en_IE.ISO8859-15
 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
@@ -376,6 +423,8 @@ en_ZW.iso88591:					en_ZW.ISO8859-1
 en_ZW.ISO-8859-1:				en_ZW.ISO8859-1
 eo:						eo_XX.ISO8859-3
 eo_XX:						eo_XX.ISO8859-3
+eo_XX.iso88593:					eo_XX.ISO8859-3
+eo_XX.ISO-8859-3:				eo_XX.ISO8859-3
 es:						es_ES.ISO8859-1
 es.UTF-8:					es_ES.UTF-8
 es_AR:						es_AR.ISO8859-1
@@ -417,6 +466,7 @@ es_ES.iso88591:					es_ES.ISO8859-1
 es_ES.ISO-8859-1:				es_ES.ISO8859-1
 es_ES.ISO_8859-1:				es_ES.ISO8859-1
 es_ES.iso885915:				es_ES.ISO8859-15
+es_ES.iso885915@euro:				es_ES.ISO8859-15
 es_ES.ISO-8859-15:				es_ES.ISO8859-15
 es_ES.ISO-8859-15@euro:				es_ES.ISO8859-15
 es_ES@euro:					es_ES.ISO8859-15
@@ -441,12 +491,10 @@ es_NI.utf8:					es_NI.UTF-8
 es_PA:						es_PA.ISO8859-1
 es_PA.iso88591:					es_PA.ISO8859-1
 es_PA.ISO-8859-1:				es_PA.ISO8859-1
-es_PA.iso885915:				es_PA.ISO8859-15
 es_PA.utf8:					es_PA.UTF-8
 es_PE:						es_PE.ISO8859-1
 es_PE.iso88591:					es_PE.ISO8859-1
 es_PE.ISO-8859-1:				es_PE.ISO8859-1
-es_PE.iso885915:				es_PE.ISO8859-15
 es_PE.utf8:					es_PE.UTF-8
 es_PR:						es_PR.ISO8859-1
 es_PR.iso88591:					es_PR.ISO8859-1
@@ -455,25 +503,26 @@ es_PR.utf8:					es_PR.UTF-8
 es_PY:						es_PY.ISO8859-1
 es_PY.iso88591:					es_PY.ISO8859-1
 es_PY.ISO-8859-1:				es_PY.ISO8859-1
-es_PY.iso885915:				es_PY.ISO8859-15
 es_PY.utf8:					es_PY.UTF-8
 es_SV:						es_SV.ISO8859-1
 es_SV.iso88591:					es_SV.ISO8859-1
 es_SV.ISO-8859-1:				es_SV.ISO8859-1
 es_SV.iso885915:				es_SV.ISO8859-15
+es_SV.ISO-8859-15:				es_SV.ISO8859-15
 es_SV.utf8:					es_SV.UTF-8
 es_US:						es_US.ISO8859-1
 es_US.iso88591:					es_US.ISO8859-1
 es_US.ISO-8859-1:				es_US.ISO8859-1
+es_US.utf8:					es_US.UTF-8
 es_UY:						es_UY.ISO8859-1
 es_UY.iso88591:					es_UY.ISO8859-1
 es_UY.ISO-8859-1:				es_UY.ISO8859-1
 es_UY.iso885915:				es_UY.ISO8859-15
+es_UY.ISO-8859-15:				es_UY.ISO8859-15
 es_UY.utf8:					es_UY.UTF-8
 es_VE:						es_VE.ISO8859-1
 es_VE.iso88591:					es_VE.ISO8859-1
 es_VE.ISO-8859-1:				es_VE.ISO8859-1
-es_VE.iso885915:				es_VE.ISO8859-15
 es_VE.utf8:					es_VE.UTF-8
 #if defined(SVR4) && defined(sun)
 XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
@@ -481,8 +530,9 @@ XCOMM language; however this is clearly
 #endif
 XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
 XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
-et:						et_EE.ISO8859-15
-et_EE:						et_EE.ISO8859-15
+XCOMM However we use ISO8859-1 for backward compatibility.
+et:						et_EE.ISO8859-1
+et_EE:						et_EE.ISO8859-1
 et_EE.iso88591:					et_EE.ISO8859-1
 et_EE.ISO-8859-1:				et_EE.ISO8859-1
 et_EE.iso88594:					et_EE.ISO8859-4
@@ -501,24 +551,31 @@ eu_ES.ISO-8859-15:				eu_ES.ISO8859-15
 eu_ES.ISO-8859-15@euro:				eu_ES.ISO8859-15
 eu_ES@euro:					eu_ES.ISO8859-15
 eu_ES.UTF-8@euro:				eu_ES.UTF-8
+eu_ES.utf8:					eu_ES.UTF-8
 fa:						fa_IR.UTF-8
 fa_IR:						fa_IR.UTF-8
 fa_IR.isiri3342:				fa_IR.ISIRI-3342
 fa_IR.utf8:					fa_IR.UTF-8
-fi:						fi_FI.ISO8859-15
+fi:						fi_FI.ISO8859-1
 fi.ISO8859-15:					fi_FI.ISO8859-15
-fi_FI:						fi_FI.ISO8859-15
+fi_FI:						fi_FI.ISO8859-1
 fi_FI.88591:					fi_FI.ISO8859-1
 fi_FI.88591.en:					fi_FI.ISO8859-1
 fi_FI.iso88591:					fi_FI.ISO8859-1
 fi_FI.ISO-8859-1:				fi_FI.ISO8859-1
 fi_FI.ISO_8859-1:				fi_FI.ISO8859-1
 fi_FI.iso885915:				fi_FI.ISO8859-15
+fi_FI.iso885915@euro:				fi_FI.ISO8859-15
 fi_FI.ISO-8859-15:				fi_FI.ISO8859-15
 fi_FI.ISO-8859-15@euro:				fi_FI.ISO8859-15
 fi_FI@euro:					fi_FI.ISO8859-15
 fi_FI.utf8:					fi_FI.UTF-8
 fi_FI.UTF-8@euro:				fi_FI.UTF-8
+fil:						fil_PH.ISO8859-1
+fil_PH:						fil_PH.ISO8859-1
+fil_PH.iso88591:				fil_PH.ISO8859-1
+fil_PH.ISO-8859-1:				fil_PH.ISO8859-1
+fil_PH.utf8:					fil_PH.UTF-8
 fo:						fo_FO.ISO8859-1
 fo_FO:						fo_FO.ISO8859-1
 fo_FO.iso88591:					fo_FO.ISO8859-1
@@ -532,10 +589,12 @@ fr.UTF-8:					fr_FR.UTF-8
 fr_BE:						fr_BE.ISO8859-1
 fr_BE.88591:					fr_BE.ISO8859-1
 fr_BE.88591.en:					fr_BE.ISO8859-1
+fr_BE.iso88591:					fr_BE.ISO8859-1
 fr_BE.ISO-8859-1:				fr_BE.ISO8859-1
 fr_BE.ISO_8859-1:				fr_BE.ISO8859-1
 fr_BE.iso885915:				fr_BE.ISO8859-15
 fr_BE.ISO-8859-15:				fr_BE.ISO8859-15
+fr_BE.iso885915@euro:				fr_BE.ISO8859-15
 fr_BE.ISO-8859-15@euro:				fr_BE.ISO8859-15
 fr_BE@euro:					fr_BE.ISO8859-15
 fr_BE.utf8:					fr_BE.UTF-8
@@ -552,11 +611,14 @@ fr_CA.utf8:					fr_CA.UTF-8
 fr_CH:						fr_CH.ISO8859-1
 fr_CH.88591:					fr_CH.ISO8859-1
 fr_CH.88591.en:					fr_CH.ISO8859-1
+fr_CH.iso88591:					fr_CH.ISO8859-1
 fr_CH.ISO-8859-1:				fr_CH.ISO8859-1
 fr_CH.ISO_8859-1:				fr_CH.ISO8859-1
 fr_CH.iso885915:				fr_CH.ISO8859-15
 fr_CH.ISO-8859-15:				fr_CH.ISO8859-15
 fr_CH.utf8:					fr_CH.UTF-8
+fr_FR.iso885915@euro:				fr_FR.ISO8859-15
+fr_FR.ISO-8859-15@euro:				fr_FR.ISO8859-15
 fr_FR:						fr_FR.ISO8859-1
 fr_FR.88591:					fr_FR.ISO8859-1
 fr_FR.88591.en:					fr_FR.ISO8859-1
@@ -565,7 +627,6 @@ fr_FR.ISO-8859-1:				fr_FR.ISO8859-1
 fr_FR.ISO_8859-1:				fr_FR.ISO8859-1
 fr_FR.iso885915:				fr_FR.ISO8859-15
 fr_FR.ISO-8859-15:				fr_FR.ISO8859-15
-fr_FR.ISO-8859-15@euro:				fr_FR.ISO8859-15
 fr_FR@euro:					fr_FR.ISO8859-15
 fr_FR.UTF-8@euro:				fr_FR.UTF-8
 fr_FR.utf8:					fr_FR.UTF-8
@@ -576,6 +637,7 @@ fr_LU.iso88591:					fr_LU.ISO8859-1
 fr_LU.ISO-8859-1:				fr_LU.ISO8859-1
 fr_LU.ISO_8859-1:				fr_LU.ISO8859-1
 fr_LU.iso885915:				fr_LU.ISO8859-15
+fr_LU.iso885915@euro:				fr_LU.ISO8859-15
 fr_LU.ISO-8859-15:				fr_LU.ISO8859-15
 fr_LU.ISO-8859-15@euro:				fr_LU.ISO8859-15
 fr_LU@euro:					fr_LU.ISO8859-15
@@ -589,6 +651,7 @@ ga_IE.iso885914:				ga_IE.ISO8859-14
 ga_IE.ISO-8859-14:				ga_IE.ISO8859-14
 ga_IE.iso885915:				ga_IE.ISO8859-15
 ga_IE.ISO-8859-15:				ga_IE.ISO8859-15
+ga_IE.iso885915@euro:				ga_IE.ISO8859-15
 ga_IE.ISO-8859-15@euro:				ga_IE.ISO8859-15
 ga_IE@euro:					ga_IE.ISO8859-15
 ga_IE.UTF-8@euro:				ga_IE.UTF-8
@@ -601,16 +664,22 @@ gd_GB.iso885914:				gd_GB.ISO8859-14
 gd_GB.ISO-8859-14:				gd_GB.ISO8859-14
 gd_GB.iso885915:				gd_GB.ISO8859-15
 gd_GB.ISO-8859-15:				gd_GB.ISO8859-15
+gez_ER:						gez_ER.UTF-8
+gez_ER@abegede:					gez_ER.UTF-8
+gez_ER.utf8:					gez_ER.UTF-8
+gez_ER.utf8@abegede:				gez_ER.UTF-8
 gl:						gl_ES.ISO8859-1
 gl_ES:						gl_ES.ISO8859-1
 gl_ES.iso88591:					gl_ES.ISO8859-1
 gl_ES.ISO-8859-1:				gl_ES.ISO8859-1
 gl_ES.iso885915:				gl_ES.ISO8859-15
 gl_ES.ISO-8859-15:				gl_ES.ISO8859-15
+gl_ES.iso885915@euro:				gl_ES.ISO8859-15
 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:						gu_IN.UTF-8
 gu_IN:						gu_IN.UTF-8
 gu_IN.utf8:					gu_IN.UTF-8
 gv:						gv_GB.ISO8859-1
@@ -621,6 +690,7 @@ gv_GB.iso885914:				gv_GB.ISO8859-14
 gv_GB.ISO-8859-14:				gv_GB.ISO8859-14
 gv_GB.iso885915:				gv_GB.ISO8859-15
 gv_GB.ISO-8859-15:				gv_GB.ISO8859-15
+gv_GB.utf8:					gv_GB.UTF-8
 he:						he_IL.ISO8859-8
 he_IL:						he_IL.ISO8859-8
 he_IL.iso88598:					he_IL.ISO8859-8
@@ -630,8 +700,8 @@ he_IL.microsoftcp1255:				he_IL.CP1255
 he_IL.microsoft-cp1255:				he_IL.CP1255
 he_IL.MICROSOFT-CP1255:				he_IL.CP1255
 he_IL.utf8:					he_IL.UTF-8
-hi:						hi_IN.ISCII-DEV
-hi_IN:						hi_IN.ISCII-DEV
+hi:						hi_IN.UTF-8
+hi_IN:						hi_IN.UTF-8
 hi_IN.isciidev:					hi_IN.ISCII-DEV
 hi_IN.utf8:					hi_IN.UTF-8
 hne:						hne_IN.UTF-8
@@ -643,13 +713,29 @@ hr_HR.iso88592:					hr_HR.ISO8859-2
 hr_HR.ISO-8859-2:				hr_HR.ISO8859-2
 hr_HR.ISO_8859-2:				hr_HR.ISO8859-2
 hr_HR.utf8:					hr_HR.UTF-8
+hsb:						hsb_DE.ISO8859-2
+hsb_DE:						hsb_DE.ISO8859-2
+hsb_DE.iso88592:				hsb_DE.ISO8859-2
+hsb_DE.ISO-8859-2:				hsb_DE.ISO8859-2
+hsb_DE.utf8:					hsb_DE.UTF-8
 hu:						hu_HU.ISO8859-2
 hu_HU:						hu_HU.ISO8859-2
 hu_HU.iso88592:					hu_HU.ISO8859-2
 hu_HU.ISO-8859-2:				hu_HU.ISO8859-2
+hu_HU.iso885916:				hu_HU.ISO8859-16
+hu_HU.ISO-8859-16:				hu_HU.ISO8859-16
 hu_HU.utf8:					hu_HU.UTF-8
+hy:						hy_AM.UTF-8
+hy_AM:						hy_AM.UTF-8
+hy_AM.armscii8:					hy_AM.ARMSCII-8
+hy_AM.utf8:					hy_AM.UTF-8
 ia:						ia.UTF-8
 ia.utf8:					ia.UTF-8
+id:						id_ID.ISO8859-1
+id_ID:						id_ID.ISO8859-1
+id_ID.iso88591:					id_ID.ISO8859-1
+id_ID.ISO-8859-1:				id_ID.ISO8859-1
+id_ID.utf8:					id_ID.UTF-8
 ie:						ie.UTF-8
 ie.utf8:					ie.UTF-8
 is:						is_IS.ISO8859-1
@@ -676,6 +762,7 @@ it_IT.iso88591:					it_IT.ISO8859-1
 it_IT.ISO-8859-1:				it_IT.ISO8859-1
 it_IT.ISO_8859-1:				it_IT.ISO8859-1
 it_IT.iso885915:				it_IT.ISO8859-15
+it_IT.iso885915@euro:				it_IT.ISO8859-15
 it_IT.ISO-8859-15:				it_IT.ISO8859-15
 it_IT.ISO-8859-15@euro:				it_IT.ISO8859-15
 it_IT@euro:					it_IT.ISO8859-15
@@ -683,9 +770,9 @@ 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
+iu:						iu_CA.UTF-8
+iu_CA:						iu_CA.UTF-8
+iu_CA.utf8:					iu_CA.UTF-8
 ja_JP:						ja_JP.eucJP
 ja:						ja_JP.eucJP
 ja.JIS:						ja_JP.JIS7
@@ -703,16 +790,20 @@ ja_JP.mscode:					ja_JP.SJIS
 ja_JP.PCK:					ja_JP.SJIS
 ja_JP.sjis:					ja_JP.SJIS
 ja_JP.utf8:					ja_JP.UTF-8
-ka:						ka_GE.GEORGIAN-ACADEMY
-ka_GE:						ka_GE.GEORGIAN-ACADEMY
+ka:						ka_GE.GEORGIAN-PS
+ka_GE:						ka_GE.GEORGIAN-PS
 ka_GE.georgianacademy:				ka_GE.GEORGIAN-ACADEMY
 ka_GE.georgianrs:				ka_GE.GEORGIAN-ACADEMY
 ka_GE.georgianps:				ka_GE.GEORGIAN-PS
+ka_GE.utf8:					ka_GE.UTF-8
+kk:						kk_KZ.PT154
+kk_KZ:						kk_KZ.PT154
+kk_KZ.pt154:					kk_KZ.PT154
+kk_KZ.utf8:					kk_KZ.UTF-8
 kl:						kl_GL.ISO8859-1
 kl_GL:						kl_GL.ISO8859-1
 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:						km_KH.UTF-8
 km_KH.utf8:					km_KH.UTF-8
@@ -732,6 +823,9 @@ ks_IN:						ks_IN.UTF-8
 ks_IN.utf8:					ks_IN.UTF-8
 ks_IN@devanagari:				ks_IN.UTF-8@devanagari
 ks_IN.utf8@devanagari:				ks_IN.UTF-8@devanagari
+ku:						ku_TR.UTF-8
+ku_TR:						ku_TR.UTF-8
+ku_TR.utf8:					ku_TR.UTF-8
 kw:						kw_GB.ISO8859-1
 kw_GB:						kw_GB.ISO8859-1
 kw_GB.iso88591:					kw_GB.ISO8859-1
@@ -740,14 +834,36 @@ kw_GB.iso885914:				kw_GB.ISO8859-14
 kw_GB.ISO-8859-14:				kw_GB.ISO8859-14
 kw_GB.iso885915:				kw_GB.ISO8859-15
 kw_GB.ISO-8859-15:				kw_GB.ISO8859-15
+kw_GB.utf8:					kw_GB.UTF-8
 ky:						ky_KG.UTF-8
 ky_KG:							ky_KG.UTF-8
 ky_KG.utf8:					ky_KG.UTF-8
-lo:						lo_LA.MULELAO-1
-lo_LA:						lo_LA.MULELAO-1
+lg:						lg_UG.ISO8859-10
+lg_UG:						lg_UG.ISO8859-10
+lg_UG.iso885910:				lg_UG.ISO8859-10
+lg_UG.ISO-8859-10:				lg_UG.ISO8859-10
+lg_UG.utf8:					lg_UG.UTF-8
+li:						li_BE.ISO8859-1
+li_BE:						li_BE.ISO8859-1
+li_BE.iso88591:					li_BE.ISO8859-1
+li_BE.ISO-8859-1:				li_BE.ISO8859-1
+li_BE.iso885915@euro:				li_BE.ISO8859-15
+li_BE.ISO-8859-15@euro:				li_BE.ISO8859-15
+li_BE@euro:					li_BE.ISO8859-15
+li_BE.utf8:					li_BE.UTF-8
+li_NL:						li_NL.ISO8859-1
+li_NL.iso88591:					li_NL.ISO8859-1
+li_NL.ISO-8859-1:				li_NL.ISO8859-1
+li_NL.iso885915@euro:				li_NL.ISO8859-15
+li_NL.ISO-8859-15@euro:				li_NL.ISO8859-15
+li_NL@euro:					li_NL.ISO8859-15
+li_NL.utf8:					li_NL.UTF-8
+lo:						lo_LA.UTF-8
+lo_LA:						lo_LA.UTF-8
 lo_LA.cp1133:					lo_LA.IBM-CP1133
 lo_LA.ibmcp1133:				lo_LA.IBM-CP1133
 lo_LA.mulelao1:					lo_LA.MULELAO-1
+lo_LA.utf8:					lo_LA.UTF-8
 #if defined(VeryOldFreeBSD)
 XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
 XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
@@ -764,6 +880,8 @@ lt_LT.iso885913:				lt_LT.ISO8859-13
 lt_LT.ISO-8859-13:				lt_LT.ISO8859-13
 lt_LT.ISO_8859-13:				lt_LT.ISO8859-13
 lt_LT.utf8:					lt_LT.UTF-8
+lug:						lg_UG.ISO8859-10
+lug_UG:						lg_UG.ISO8859-10
 lv:						lv_LV.ISO8859-13
 lv_LV:						lv_LV.ISO8859-13
 lv_LV.iso88594:					lv_LV.ISO8859-4
@@ -778,6 +896,8 @@ mai_IN.utf8:					mai_IN.UTF-8
 mi:						mi_NZ.ISO8859-1
 mi_NZ:						mi_NZ.ISO8859-1
 mi_NZ.iso88591:					mi_NZ.ISO8859-1
+mi_NZ.ISO-8859-1:				mi_NZ.ISO8859-1
+mi_NZ.utf8:					mi_NZ.UTF-8
 mk:						mk_MK.ISO8859-5
 mk_MK:						mk_MK.ISO8859-5
 mk_MK.iso88595:					mk_MK.ISO8859-5
@@ -790,6 +910,9 @@ 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
+mn:						mn_MN.UTF-8
+mn_MN:						mn_MN.UTF-8
+mn_MN.utf8:					mn_MN.UTF-8
 mr:						mr_IN.UTF-8
 mr_IN:						mr_IN.UTF-8
 mr_IN.utf8:					mr_IN.UTF-8
@@ -797,9 +920,12 @@ ms:						ms_MY.ISO8859-1
 ms_MY:						ms_MY.ISO8859-1
 ms_MY.iso88591:					ms_MY.ISO8859-1
 ms_MY.ISO-8859-1:				ms_MY.ISO8859-1
+ms_MY.utf8:					ms_MY.UTF-8
 mt:						mt_MT.ISO8859-3
 mt_MT:						mt_MT.ISO8859-3
+mt_MT.iso88593:					mt_MT.ISO8859-3
 mt_MT.ISO-8859-3:				mt_MT.ISO8859-3
+mt_MT.utf8:					mt_MT.UTF-8
 nb:						nb_NO.ISO8859-1
 nb_NO:						nb_NO.ISO8859-1
 nb_NO.88591:					nb_NO.ISO8859-1
@@ -808,6 +934,19 @@ 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
+nds:						nds_DE.ISO8859-1
+nds_DE:						nds_DE.ISO8859-1
+nds_DE.iso88591:				nds_DE.ISO8859-1
+nds_DE.ISO-8859-1:				nds_DE.ISO8859-1
+nds_DE.iso88591@traditional:			nds_DE.ISO8859-1
+nds_DE.ISO-8859-1@traditional:			nds_DE.ISO8859-1
+nds_DE@traditional:				nds_DE.ISO8859-1
+nds_DE.iso885915:				nds_DE.ISO8859-15
+nds_DE.iso885915@euro:				nds_DE.ISO8859-15
+nds_DE.ISO-8859-15@euro:			nds_DE.ISO8859-15
+nds_DE@euro:					nds_DE.ISO8859-15
+nds_DE.utf8:					nds_DE.UTF-8
+ne:						ne_NP.UTF-8
 ne_NP:						ne_NP.UTF-8
 ne_NP.utf8:					ne_NP.UTF-8
 nl:						nl_NL.ISO8859-1
@@ -819,8 +958,9 @@ nl_BE.iso88591:					nl_BE.ISO8859-1
 nl_BE.ISO-8859-1:				nl_BE.ISO8859-1
 nl_BE.ISO_8859-1:				nl_BE.ISO8859-1
 nl_BE.iso885915:				nl_BE.ISO8859-15
-nl_BE.ISO-8859-15:				nl_BE.ISO8859-15
+nl_BE.iso885915@euro:				nl_BE.ISO8859-15
 nl_BE.ISO-8859-15@euro:				nl_BE.ISO8859-15
+nl_BE.ISO-8859-15:				nl_BE.ISO8859-15
 nl_BE@euro:					nl_BE.ISO8859-15
 nl_BE.utf8:					nl_BE.UTF-8
 nl_BE.UTF-8@euro:				nl_BE.UTF-8
@@ -828,11 +968,12 @@ nl_NL:						nl_NL.ISO8859-1
 nl_NL.88591:					nl_NL.ISO8859-1
 nl_NL.88591.en:					nl_NL.ISO8859-1
 nl_NL.iso88591:					nl_NL.ISO8859-1
+nl_NL.iso885915@euro:				nl_NL.ISO8859-15
+nl_NL.ISO-8859-15@euro:				nl_NL.ISO8859-15
 nl_NL.ISO-8859-1:				nl_NL.ISO8859-1
 nl_NL.ISO_8859-1:				nl_NL.ISO8859-1
 nl_NL.iso885915:				nl_NL.ISO8859-15
 nl_NL.ISO-8859-15:				nl_NL.ISO8859-15
-nl_NL.ISO-8859-15@euro:				nl_NL.ISO8859-15
 nl_NL@euro:					nl_NL.ISO8859-15
 nl_NL.utf8:					nl_NL.UTF-8
 nl_NL.UTF-8@euro:				nl_NL.UTF-8
@@ -847,10 +988,14 @@ nn_NO.utf8:					nn_NO.UTF-8
 nr:						nr_ZA.ISO8859-1
 nr_ZA:						nr_ZA.ISO8859-1
 nr_ZA.iso88591:					nr_ZA.ISO8859-1
+nr_ZA.ISO-8859-1:				nr_ZA.ISO8859-1
 nr_ZA.utf8:					nr_ZA.UTF-8
-nso:						nso_ZA.ISO8859-15
-nso_ZA:						nso_ZA.ISO8859-15
+nso:						nso_ZA.ISO8859-10
+nso_ZA:						nso_ZA.ISO8859-10
+nso_ZA.iso885910:				nso_ZA.ISO8859-10
+nso_ZA.ISO-8859-10:				nso_ZA.ISO8859-10
 nso_ZA.iso885915:				nso_ZA.ISO8859-15
+nso_ZA.ISO-8859-15:				nso_ZA.ISO8859-15
 nso_ZA.utf8:					nso_ZA.UTF-8
 nynorsk:					nn_NO.ISO8859-1
 oc:						oc_FR.ISO8859-1
@@ -859,14 +1004,31 @@ oc_FR.iso88591:					oc_FR.ISO8859-1
 oc_FR.ISO-8859-1:				oc_FR.ISO8859-1
 oc_FR.iso885915:				oc_FR.ISO8859-15
 oc_FR.ISO-8859-15:				oc_FR.ISO8859-15
+oc_FR.iso885915@euro:				oc_FR.ISO8859-15
+oc_FR.ISO-8859-15@euro:				oc_FR.ISO8859-15
 oc_FR@euro:					oc_FR.ISO8859-15
+om:						om_ET.UTF-8
+om_ET:						om_ET.UTF-8
+om_ET.utf8:					om_ET.UTF-8
+om_KE:						om_KE.ISO8859-1
+om_KE.iso88591:					om_KE.ISO8859-1
+om_KE.ISO-8859-1:				om_KE.ISO8859-1
+om_KE.utf8:					om_KE.UTF-8
 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:						pa_PK.UTF-8
 pa_PK.utf8:					pa_PK.UTF-8
+pap:						pap_AN.ISO8859-1
+pap_AN:						pap_AN.ISO8859-1
+pap_AN.iso88591:				pap_AN.ISO8859-1
+pap_AN.ISO-8859-1:				pap_AN.ISO8859-1
+pap_AN.iso885915@euro:				pap_AN.ISO8859-15
+pap_AN.ISO-8859-15@euro:			pap_AN.ISO8859-15
+pap_AN.utf8:					pap_AN.UTF-8
 pd:						pd_US.ISO8859-1
 pd_DE:						pd_DE.ISO8859-1
 pd_US:						pd_US.ISO8859-1
@@ -874,18 +1036,22 @@ pd_DE.iso88591:					pd_DE.ISO8859-1
 pd_US.iso88591:					pd_US.ISO8859-1
 pd_DE.iso885915:				pd_DE.ISO8859-15
 pd_US.iso885915:				pd_US.ISO8859-15
-ph:						ph_PH.ISO8859-1
-ph_PH:						ph_PH.ISO8859-1
-ph_PH.iso88591:					ph_PH.ISO8859-1
+ph:						fil_PH.ISO8859-1
+ph_PH:						fil_PH.ISO8859-1
+ph_PH.iso88591:					fil_PH.ISO8859-1
+ph_PH.ISO8859-1					fil_PH.ISO8859-1
 pl:						pl_PL.ISO8859-2
 pl.UTF-8:					pl_PL.UTF-8
 pl_PL:						pl_PL.ISO8859-2
 pl_PL.iso88592:					pl_PL.ISO8859-2
 pl_PL.ISO-8859-2:				pl_PL.ISO8859-2
+pl_PL.iso885916:				pl_PL.ISO8859-16
+pl_PL.ISO-8859-16:				pl_PL.ISO8859-16
 pl_PL.utf8:					pl_PL.UTF-8
-pp:						pp_AN.ISO8859-1
-pp_AN:						pp_AN.ISO8859-1
-pp_AN.iso88591:					pp_AN.ISO8859-1
+pp:						pap_AN.ISO8859-1
+pp_AN:						pap_AN.ISO8859-1
+pp_AN.iso88591:					pap_AN.ISO8859-1
+pp_AN.ISO-8859-1:				pap_AN.ISO8859-1
 pt:						pt_PT.ISO8859-1
 pt.ISO8859-15:					pt_PT.ISO8859-15
 pt_BR:						pt_BR.ISO8859-1
@@ -894,7 +1060,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
@@ -903,8 +1068,9 @@ pt_PT.iso88591:					pt_PT.ISO8859-1
 pt_PT.ISO-8859-1:				pt_PT.ISO8859-1
 pt_PT.ISO_8859-1:				pt_PT.ISO8859-1
 pt_PT.iso885915:				pt_PT.ISO8859-15
-pt_PT.ISO-8859-15:				pt_PT.ISO8859-15
+pt_PT.iso885915@euro:				pt_PT.ISO8859-15
 pt_PT.ISO-8859-15@euro:				pt_PT.ISO8859-15
+pt_PT.ISO-8859-15:				pt_PT.ISO8859-15
 pt_PT@euro:					pt_PT.ISO8859-15
 pt_PT.utf8:					pt_PT.UTF-8
 pt_PT.UTF-8@euro:				pt_PT.UTF-8
@@ -912,6 +1078,8 @@ ro:						ro_RO.ISO8859-2
 ro_RO:						ro_RO.ISO8859-2
 ro_RO.iso88592:					ro_RO.ISO8859-2
 ro_RO.ISO-8859-2:				ro_RO.ISO8859-2
+ro_RO.iso885916:				ro_RO.ISO8859-16
+ro_RO.ISO-8859-16:				ro_RO.ISO8859-16
 ro_RO.utf8:					ro_RO.UTF-8
 ru:						ru_RU.UTF-8
 ru.koi8-r:					ru_RU.KOI8-R
@@ -942,6 +1110,7 @@ rw:						rw_RW.ISO8859-1
 rw_RW:						rw_RW.ISO8859-1
 rw_RW.iso8859-1:				rw_RW.ISO8859-1
 rw_RW.ISO-8859-1:				rw_RW.ISO8859-1
+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
@@ -952,6 +1121,10 @@ se_NO:						se_NO.UTF-8
 se_NO.utf8:					se_NO.UTF-8
 si:						si_LK.UTF-8
 si_LK:						si_LK.UTF-8
+si_LK.utf8:					si_LK.UTF-8
+sid:						sid_ET.UTF-8
+sid_ET:						sid_ET.UTF-8
+sid_ET.utf8:					sid_ET.UTF-8
 sk:						sk_SK.ISO8859-2
 sk_SK:						sk_SK.ISO8859-2
 sk_SK.iso88592:					sk_SK.ISO8859-2
@@ -961,11 +1134,27 @@ sl:						sl_SI.ISO8859-2
 sl_SI:						sl_SI.ISO8859-2
 sl_SI.iso88592:					sl_SI.ISO8859-2
 sl_SI.ISO-8859-2:				sl_SI.ISO8859-2
+sl_SI.iso885916:				sl_SI.ISO8859-16
+sl_SI.ISO-8859-16:				sl_SI.ISO8859-16
 sl_SI.utf8:					sl_SI.UTF-8
-sq:						sq_AL.ISO8859-2
-sq_AL:						sq_AL.ISO8859-2
-sq_AL.iso88592:					sq_AL.ISO8859-2
-sq_AL.ISO-8859-2:				sq_AL.ISO8859-2
+so_DJ:						so_DJ.ISO8859-1
+so_DJ.iso88591:					so_DJ.ISO8859-1
+so_DJ.ISO-8859-1:				so_DJ.ISO8859-1
+so_DJ.utf8:					so_DJ.UTF-8
+so_ET:						so_ET.UTF-8
+so_ET.utf8:					so_ET.UTF-8
+so_KE:						so_KE.ISO8859-1
+so_KE.iso88591:					so_KE.ISO8859-1
+so_KE.ISO-8859-1:				so_KE.ISO8859-1
+so_KE.utf8:					so_KE.UTF-8
+so_SO:						so_SO.ISO8859-1
+so_SO.iso88591:					so_SO.ISO8859-1
+so_SO.ISO-8859-1:				so_SO.ISO8859-1
+so_SO.utf8:					so_SO.UTF-8
+sq:						sq_AL.ISO8859-1
+sq_AL:						sq_AL.ISO8859-1
+sq_AL.iso88591:					sq_AL.ISO8859-1
+sq_AL.ISO-8859-1:				sq_AL.ISO8859-1
 sq_AL.utf8:					sq_AL.UTF-8
 sr:						sr_RS.UTF-8
 sr@cyrillic:					sr_RS.UTF-8
@@ -978,13 +1167,17 @@ sr_RS.UTF-8@Latn:				sr_RS.UTF-8@latin
 sr_RS.utf8:					sr_RS.UTF-8
 sr_ME:						sr_ME.UTF-8
 sr_ME.utf8:					sr_ME.UTF-8
+sr@ije:						sr_ME.UTF-8
+sr_CS@ije:					sr_ME.UTF-8
 ss:						ss_ZA.ISO8859-1
 ss_ZA:						ss_ZA.ISO8859-1
 ss_ZA.iso88591:					ss_ZA.ISO8859-1
+ss_ZA.ISO-8859-1:				ss_ZA.ISO8859-1
 ss_ZA.utf8:					ss_ZA.UTF-8
 st:						st_ZA.ISO8859-1
 st_ZA:						st_ZA.ISO8859-1
 st_ZA.iso88591:					st_ZA.ISO8859-1
+st_ZA.ISO-8859-1:				st_ZA.ISO8859-1
 st_ZA.utf8:					st_ZA.UTF-8
 sv:						sv_SE.ISO8859-1
 sv.ISO8859-15:					sv_SE.ISO8859-15
@@ -994,6 +1187,7 @@ sv_FI.iso88591:					sv_FI.ISO8859-1
 sv_FI.ISO-8859-1:				sv_FI.ISO8859-1
 sv_FI.iso885915:				sv_FI.ISO8859-15
 sv_FI.ISO-8859-15:				sv_FI.ISO8859-15
+sv_FI.iso885915@euro:				sv_FI.ISO8859-15
 sv_FI.ISO-8859-15@euro:				sv_FI.ISO8859-15
 sv_FI@euro:					sv_FI.ISO8859-15
 sv_FI.UTF-8@euro:				sv_FI.UTF-8
@@ -1008,32 +1202,57 @@ sv_SE.iso885915:				sv_SE.ISO8859-15
 sv_SE.ISO-8859-15:				sv_SE.ISO8859-15
 sv_SE@euro:					sv_SE.ISO8859-15
 sv_SE.utf8:					sv_SE.UTF-8
-ta:						ta_IN.TSCII-0
-ta_IN:						ta_IN.TSCII-0
+ta:						ta_IN.UTF-8
+ta_IN:						ta_IN.UTF-8
 ta_IN.tscii:					ta_IN.TSCII-0
 ta_IN.tscii0:					ta_IN.TSCII-0
+ta_IN.utf8:					ta_IN.UTF-8
 te:						te_IN.UTF-8
 te.UTF-8:					te_IN.UTF-8
+te_IN:						te_IN.UTF-8
 te_IN.utf8:					te_IN.UTF-8
 tg:						tg_TJ.KOI8-C
 tg_TJ:						tg_TJ.KOI8-C
 tg_TJ.koi8c:					tg_TJ.KOI8-C
+tg_TJ.koi8k:					tg_TJ.KOI8-K
+tg_TJ.koi8t:					tg_TJ.KOI8-T
+tg_TJ.utf8:					tg_TJ.UTF-8
 th:						th_TH.ISO8859-11
 th_TH:						th_TH.ISO8859-11
+th_TH.iso885911:				th_TH.ISO8859-11
 th_TH.ISO-8859-11:				th_TH.ISO8859-11
 th_TH.tis620:					th_TH.TIS620
 th_TH.TIS-620:					th_TH.TIS620
 th_TH.TACTIS:					th_TH.TIS620
 th_TH.utf8:					th_TH.UTF-8
+ti:						ti_ER.UTF-8
+ti_ER:						ti_ER.UTF-8
+ti_ER.utf8:					ti_ER.UTF-8
+ti_ET:						ti_ET.UTF-8
+ti_ET.utf8:					ti_ET.UTF-8
+tig:						tig_ER.UTF-8
+tig_ER:						tig_ER.UTF-8
+tig_ER.utf8:					tig_ER.UTF-8
+tk:						tk_TM.UTF-8
+tk_TM:						tk_TM.UTF-8
+tk_TM.utf8:					tk_TM.UTF-8
 tl:						tl_PH.ISO8859-1
 tl_PH:						tl_PH.ISO8859-1
 tl_PH.iso88591:					tl_PH.ISO8859-1
 tl_PH.ISO-8859-1:				tl_PH.ISO8859-1
-tn:						tn_ZA.ISO8859-15
-tn_ZA:						tn_ZA.ISO8859-15
-tn_ZA.iso8859-15:				tn_ZA.ISO8859-15
+tl_PH.utf8:					tl_PH.UTF-8
+tn:						tn_ZA.ISO8859-10
+tn_ZA:						tn_ZA.ISO8859-10
+tn_ZA.iso885910:				tn_ZA.ISO8859-10
+tn_ZA.ISO-8859-10:				tn_ZA.ISO8859-10
+tn_ZA.iso885915:				tn_ZA.ISO8859-15
+tn_ZA.ISO-8859-15:				tn_ZA.ISO8859-15
 tn_ZA.utf8:					tn_ZA.UTF-8
 tr:						tr_TR.ISO8859-9
+tr_CY:						tr_CY.ISO8859-9
+tr_CY.iso88599:					tr_CY.ISO8859-9
+tr_CY.ISO-8859-9:				tr_CY.ISO8859-9
+tr_CY.utf8:					tr_CY.UTF-8
 tr_TR:						tr_TR.ISO8859-9
 tr_TR.iso88599:					tr_TR.ISO8859-9
 tr_TR.ISO-8859-9:				tr_TR.ISO8859-9
@@ -1041,14 +1260,18 @@ tr_TR.utf8:					tr_TR.UTF-8
 ts:						ts_ZA.ISO8859-1
 ts_ZA:						ts_ZA.ISO8859-1
 ts_ZA.iso88591:					ts_ZA.ISO8859-1
+ts_ZA.ISO-8859-1:				ts_ZA.ISO8859-1
 ts_ZA.utf8:					ts_ZA.UTF-8
 tt:						tt_RU.TATAR-CYR
 tt_RU:						tt_RU.TATAR-CYR
 tt_RU.tatarcyr:					tt_RU.TATAR-CYR
-tt_RU.koi8c:					tt_RU.KOI8-C
+tt_RU.koi8c:					tt_RU.KOI8-K
+tt_RU.koi8k:					tt_RU.KOI8-K
+tt_RU.utf8:					tt_RU.UTF-8
 uk:						uk_UA.KOI8-U
 uk_UA:						uk_UA.KOI8-U
 uk_UA.iso88595:					uk_UA.ISO8859-5
+uk_UA.ISO-8859-5:				uk_UA.ISO8859-5
 uk_UA.koi8u:					uk_UA.KOI8-U
 uk_UA.cp1251:					uk_UA.CP1251
 uk_UA.microsoftcp1251:				uk_UA.CP1251
@@ -1064,14 +1287,22 @@ ur_PK.cp1256:					ur_PK.CP1256
 ur_PK.microsoftcp1256:				ur_PK.CP1256
 ur_PK.microsoft-cp1256:				ur_PK.CP1256
 ur_PK.MICROSOFT-CP1256:				ur_PK.CP1256
+ur_PK.utf8:					ur_PK.UTF-8
 uz:						uz_UZ.UTF-8
 uz_UZ:						uz_UZ.UTF-8
+uz_UZ.iso88591:					uz_UZ.ISO8859-1
 uz_UZ.ISO-8859-1:				uz_UZ.ISO8859-1
+uz_UZ.utf8:					uz_UZ.UTF-8
 uz_UZ@cyrillic:					uz_UZ.UTF-8
 uz_UZ.UTF-8@cyrillic:				uz_UZ.UTF-8
+uz@latin:					uz_UZ.ISO8859-1
+uz_UZ@latin:					uz_UZ.ISO8859-1
 ve:						ve_ZA.UTF-8
 ve_ZA:						ve_ZA.UTF-8
 ve_ZA.utf8:					ve_ZA.UTF-8
+ven:						ve_ZA.UTF-8
+ven_ZA:						ve_ZA.UTF-8
+ven_ZA.utf8:					ve_ZA.UTF-8
 vi:						vi_VN.TCVN
 vi_VN:						vi_VN.TCVN
 vi_VN.tcvn:					vi_VN.TCVN
@@ -1085,11 +1316,14 @@ wa_BE.iso88591:					wa_BE.ISO8859-1
 wa_BE.ISO-8859-1:				wa_BE.ISO8859-1
 wa_BE.iso885915:				wa_BE.ISO8859-15
 wa_BE.ISO-8859-15:				wa_BE.ISO8859-15
+wa_BE.iso885915@euro:				wa_BE.ISO8859-15
 wa_BE.ISO-8859-15@euro:				wa_BE.ISO8859-15
 wa_BE@euro:					wa_BE.ISO8859-15
+wa_BE.utf8:					wa_BE.UTF-8
 xh:						xh_ZA.ISO8859-1
 xh_ZA:						xh_ZA.ISO8859-1
 xh_ZA.iso88591:					xh_ZA.ISO8859-1
+xh_ZA.ISO-8859-1:				xh_ZA.ISO8859-1
 xh_ZA.utf8:					xh_ZA.UTF-8
 yi:						yi_US.CP1255
 yi_US:						yi_US.CP1255
@@ -1097,6 +1331,7 @@ yi_US.cp1255:					yi_US.CP1255
 yi_US.microsoftcp1255:				yi_US.CP1255
 yi_US.microsoft-cp1255:				yi_US.CP1255
 yi_US.MICROSOFT-CP1255:				yi_US.CP1255
+yi_US.utf8:					yi_US.UTF-8
 zh_CN:						zh_CN.gb2312
 zh_CN.Big5:					zh_TW.big5
 zh_CN.EUC:					zh_CN.eucCN
@@ -1108,8 +1343,10 @@ zh_CN.euc:					zh_CN.eucCN
 zh_CN.utf8:					zh_CN.UTF-8
 zh_HK:						zh_HK.big5hkscs
 zh_HK.BIG5HK:					zh_HK.big5hkscs
+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.Big5HKSCS:				zh_HK.big5hkscs
 zh_HK.BIG5-HKSCS:				zh_HK.big5hkscs
@@ -1120,6 +1357,10 @@ 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_SG:						zh_SG.gb2312
+zh_SG.GB2312:					zh_SG.gb2312
+zh_SG.GBK:					zh_SG.gbk
+zh_SG.utf8:					zh_SG.UTF-8
 zh_TW:						zh_TW.big5
 zh_TW.Big5:					zh_TW.big5
 zh_TW.BIG5:					zh_TW.big5
@@ -1129,6 +1370,8 @@ zh_TW.utf8:					zh_TW.UTF-8
 zu:						zu_ZA.ISO8859-1
 zu_ZA:						zu_ZA.ISO8859-1
 zu_ZA.iso88591:					zu_ZA.ISO8859-1
+zu_ZA.ISO-8859-1:				zu_ZA.ISO8859-1
+zu_ZA.ISO_8859-1:				zu_ZA.ISO8859-1
 zu_ZA.utf8:					zu_ZA.UTF-8
 
 XCOMM The following locale names are used in SCO 3.0
--- libX11-1.7.4/nls/locale.dir.pre.orig	2022-03-30 22:55:23.000000000 +0200
+++ libX11-1.7.4/nls/locale.dir.pre	2022-03-31 20:35:13.962259284 +0200
@@ -6,7 +6,9 @@ XCOMM
 XCOMM
 
 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
@@ -26,7 +28,7 @@ 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-9e/XLC_LOCALE:			az_AZ.ISO8859-9E
-koi8-c/XLC_LOCALE:			az_AZ.KOI8-C
+koi8-c/XLC_LOCALE:			az_AZ.KOI8-K
 iso8859-5/XLC_LOCALE:			be_BY.ISO8859-5
 microsoft-cp1251/XLC_LOCALE:		be_BY.CP1251
 iso8859-5/XLC_LOCALE:			bg_BG.ISO8859-5
@@ -63,6 +65,7 @@ iso8859-15/XLC_LOCALE:			de_LI.ISO8859-1
 iso8859-1/XLC_LOCALE:			de_LU.ISO8859-1
 iso8859-15/XLC_LOCALE:			de_LU.ISO8859-15
 iso8859-4/XLC_LOCALE:			ee_EE.ISO8859-4
+iso8859-7/XLC_LOCALE:			el_CY.ISO8859-7
 iso8859-7/XLC_LOCALE:			el_GR.ISO8859-7
 iso8859-15/XLC_LOCALE:			el_GR.ISO8859-15
 iso8859-1/XLC_LOCALE:			en_AU.ISO8859-1
@@ -71,6 +74,7 @@ iso8859-15/XLC_LOCALE:			en_BE.ISO8859-1
 iso8859-1/XLC_LOCALE:			en_BW.ISO8859-1
 iso8859-1/XLC_LOCALE:			en_BZ.ISO8859-1
 iso8859-1/XLC_LOCALE:			en_CA.ISO8859-1
+iso8859-1/XLC_LOCALE:			en_DK.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
@@ -84,8 +88,6 @@ iso8859-1/XLC_LOCALE:			en_NZ.ISO8859-1
 iso8859-1/XLC_LOCALE:			en_PH.ISO8859-1
 iso8859-1/XLC_LOCALE:			en_SG.ISO8859-1
 iso8859-1/XLC_LOCALE:			en_TT.ISO8859-1
-iso8859-1/XLC_LOCALE:			en_UK.ISO8859-1
-iso8859-15/XLC_LOCALE:			en_UK.ISO8859-15
 iso8859-1/XLC_LOCALE:			en_US.ISO8859-1
 iso8859-15/XLC_LOCALE:			en_US.ISO8859-15
 iso8859-1/XLC_LOCALE:			en_ZA.ISO8859-1
@@ -129,6 +131,7 @@ iso8859-15/XLC_LOCALE:			eu_ES.ISO8859-1
 isiri-3342/XLC_LOCALE:			fa_IR.ISIRI-3342
 iso8859-1/XLC_LOCALE:			fi_FI.ISO8859-1
 iso8859-15/XLC_LOCALE:			fi_FI.ISO8859-15
+iso8859-1/XLC_LOCALE:			fil_PH.ISO8859-1
 iso8859-1/XLC_LOCALE:			fo_FO.ISO8859-1
 iso8859-15/XLC_LOCALE:			fo_FO.ISO8859-15
 iso8859-1/XLC_LOCALE:			fr_BE.ISO8859-1
@@ -156,7 +159,9 @@ iso8859-8/XLC_LOCALE:			he_IL.ISO8859-8
 microsoft-cp1255/XLC_LOCALE:		he_IL.CP1255
 iscii-dev/XLC_LOCALE:			hi_IN.ISCII-DEV
 iso8859-2/XLC_LOCALE:			hr_HR.ISO8859-2
+iso8859-2/XLC_LOCALE:			hsb_DE.ISO8859-2
 iso8859-2/XLC_LOCALE:			hu_HU.ISO8859-2
+iso8859-16/XLC_LOCALE:			hu_HU.ISO8859-16
 armscii-8/XLC_LOCALE:			hy_AM.ARMSCII-8
 iso8859-1/XLC_LOCALE:			id_ID.ISO8859-1
 iso8859-1/XLC_LOCALE:			id_ID.ISO8859-15
@@ -171,12 +176,18 @@ ja.SJIS/XLC_LOCALE:			ja_JP.SJIS
 ja.JIS/XLC_LOCALE:			ja_JP.JIS7
 georgian-academy/XLC_LOCALE:		ka_GE.GEORGIAN-ACADEMY
 georgian-ps/XLC_LOCALE:			ka_GE.GEORGIAN-PS
+XCOMM pt-154/XLC_LOCALE:			kk_KZ.PT154
 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
 iso8859-15/XLC_LOCALE:			kw_GB.ISO8859-15
+iso8859-10/XLC_LOCALE:			lg_UG.ISO8859-10
+iso8859-1/XLC_LOCALE:			li_BE.ISO8859-1
+iso8859-15/XLC_LOCALE:			li_BE.ISO8859-15
+iso8859-1/XLC_LOCALE:			li_NL.ISO8859-1
+iso8859-15/XLC_LOCALE:			li_NL.ISO8859-15
 ibm-cp1133/XLC_LOCALE:			lo_LA.IBM-CP1133
 mulelao-1/XLC_LOCALE:			lo_LA.MULELAO-1
 iso8859-4/XLC_LOCALE:			lt_LT.ISO8859-4
@@ -189,7 +200,9 @@ microsoft-cp1251/XLC_LOCALE:		mk_MK.CP12
 iso8859-1/XLC_LOCALE:			ms_MY.ISO8859-1
 iso8859-3/XLC_LOCALE:			mt_MT.ISO8859-3
 iso8859-1/XLC_LOCALE:			nb_NO.ISO8859-1
-iso8859-1/XLC_LOCALE:			nb_NO.ISO8859-15
+iso8859-15/XLC_LOCALE:			nb_NO.ISO8859-15
+iso8859-1/XLC_LOCALE:			nds_DE.ISO8859-1
+iso8859-15/XLC_LOCALE:			nds_DE.ISO8859-15
 iso8859-1/XLC_LOCALE:			nl_BE.ISO8859-1
 iso8859-15/XLC_LOCALE:			nl_BE.ISO8859-15
 iso8859-1/XLC_LOCALE:			nl_NL.ISO8859-1
@@ -197,21 +210,24 @@ iso8859-15/XLC_LOCALE:			nl_NL.ISO8859-1
 iso8859-1/XLC_LOCALE:			nn_NO.ISO8859-1
 iso8859-1/XLC_LOCALE:			nn_NO.ISO8859-15
 iso8859-1/XLC_LOCALE:			nr_ZA.ISO8859-1
-iso8859-15/XLC_LOCALE:			nso_ZA.ISO8859-15
+iso8859-10/XLC_LOCALE:			nso_ZA.ISO8859-10
 iso8859-1/XLC_LOCALE:			oc_FR.ISO8859-1
 iso8859-15/XLC_LOCALE:			oc_FR.ISO8859-15
+iso8859-1/XLC_LOCALE:			om_KE.ISO8859-1
+iso8859-1/XLC_LOCALE:			pap_AN.ISO8859-1
+iso8859-15/XLC_LOCALE:			pap_AN.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-16/XLC_LOCALE:			pl_PL.ISO8859-16
 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-16/XLC_LOCALE:			ro_RO.ISO8859-16
 iso8859-5/XLC_LOCALE:			ru_RU.ISO8859-5
 microsoft-cp1251/XLC_LOCALE:		ru_RU.CP1251
 koi8-r/XLC_LOCALE:			ru_RU.KOI8-R
@@ -220,7 +236,15 @@ koi8-u/XLC_LOCALE:			ru_UA.KOI8-U
 iso8859-1/XLC_LOCALE:			rw_RW.ISO8859-1
 iso8859-2/XLC_LOCALE:			sk_SK.ISO8859-2
 iso8859-2/XLC_LOCALE:			sl_SI.ISO8859-2
-iso8859-2/XLC_LOCALE:			sq_AL.ISO8859-2
+iso8859-16/XLC_LOCALE: 			sl_SI.ISO8859-16
+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-1/XLC_LOCALE:			sq_AL.ISO8859-1
+iso8859-2/XLC_LOCALE:			sr_ME.ISO8859-2
+iso8859-5/XLC_LOCALE:			sr_ME.ISO8859-5
+iso8859-2/XLC_LOCALE:			sr_RS.ISO8859-2
+iso8859-5/XLC_LOCALE:			sr_RS.ISO8859-5
 iso8859-1/XLC_LOCALE:			ss_ZA.ISO8859-1
 iso8859-1/XLC_LOCALE:			st_ZA.ISO8859-1
 iso8859-1/XLC_LOCALE:			sv_FI.ISO8859-1
@@ -228,15 +252,17 @@ iso8859-15/XLC_LOCALE:			sv_FI.ISO8859-1
 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
+koi8-c/XLC_LOCALE:			tg_TJ.KOI8-K
+koi8-t/XLC_LOCALE:			tg_TJ.KOI8-T
 th_TH/XLC_LOCALE:			th_TH.TIS620
 iso8859-11/XLC_LOCALE:			th_TH.ISO8859-11
 iso8859-1/XLC_LOCALE:			tl_PH.ISO8859-1
-iso8859-15/XLC_LOCALE:			tn_ZA.ISO8859-15
+iso8859-10/XLC_LOCALE:			tn_ZA.ISO8859-10
+iso8859-9/XLC_LOCALE:			tr_CY.ISO8859-9
 iso8859-9/XLC_LOCALE:			tr_TR.ISO8859-9
 iso8859-1/XLC_LOCALE:			ts_ZA.ISO8859-1
 tatar-cyr/XLC_LOCALE:			tt_RU.TATAR-CYR
-koi8-c/XLC_LOCALE:			tt_RU.KOI8-C
+koi8-c/XLC_LOCALE:			tt_RU.KOI8-K
 iso8859-5/XLC_LOCALE:			uk_UA.ISO8859-5
 microsoft-cp1251/XLC_LOCALE:		uk_UA.CP1251
 koi8-u/XLC_LOCALE:			uk_UA.KOI8-U
@@ -253,13 +279,16 @@ 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.big5hkscs
 zh_TW.big5/XLC_LOCALE:			zh_TW.big5
 zh_TW/XLC_LOCALE:			zh_TW.eucTW
 iso8859-1/XLC_LOCALE:			zu_ZA.ISO8859-1
 
+en_US.UTF-8/XLC_LOCALE:			aa_DJ.UTF-8
+en_US.UTF-8/XLC_LOCALE:			aa_ER.UTF-8
+en_US.UTF-8/XLC_LOCALE:			aa_ET.UTF-8
 en_US.UTF-8/XLC_LOCALE:			af_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			am_ET.UTF-8
+en_US.UTF-8/XLC_LOCALE:			an_ES.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_AA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_AE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_BH.UTF-8
@@ -290,11 +319,13 @@ 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:			bs_BA.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
 en_US.UTF-8/XLC_LOCALE:			ca_IT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			cs_CZ.UTF-8
+en_US.UTF-8/XLC_LOCALE:			csb_PL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			cy_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			da_DK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			de_AT.UTF-8
@@ -324,7 +355,6 @@ 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
@@ -355,6 +385,7 @@ 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:			fa_IR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			fi_FI.UTF-8
+en_US.UTF-8/XLC_LOCALE:			fil_PH.UTF-8
 en_US.UTF-8/XLC_LOCALE:			fo_FO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			fr_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			fr_CA.UTF-8
@@ -363,6 +394,7 @@ 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:			gl_ES.UTF-8
 en_US.UTF-8/XLC_LOCALE:			gu_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			gv_GB.UTF-8
@@ -370,6 +402,7 @@ en_US.UTF-8/XLC_LOCALE:			he_IL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hi_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hne_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hr_HR.UTF-8
+en_US.UTF-8/XLC_LOCALE:			hsb_DE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hu_HU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hy_AM.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ia.UTF-8
@@ -391,6 +424,9 @@ en_US.UTF-8/XLC_LOCALE:			ks_IN.UTF-8@de
 en_US.UTF-8/XLC_LOCALE:			ku_TR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ky_KG.UTF-8
+en_US.UTF-8/XLC_LOCALE:			lg_UG.UTF-8
+en_US.UTF-8/XLC_LOCALE:			li_BE.UTF-8
+en_US.UTF-8/XLC_LOCALE:			li_NL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lo_LA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lt_LT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lv_LV.UTF-8
@@ -398,9 +434,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:			nds_DE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nb_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ne_NP.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nl_BE.UTF-8
@@ -409,14 +447,15 @@ en_US.UTF-8/XLC_LOCALE:			nn_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:			oc_FR.UTF-8
+en_US.UTF-8/XLC_LOCALE:			om_ET.UTF-8
+en_US.UTF-8/XLC_LOCALE:			om_KE.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:			pap_AN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pd_DE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pd_US.UTF-8
-en_US.UTF-8/XLC_LOCALE:			ph_PH.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pl_PL.UTF-8
-en_US.UTF-8/XLC_LOCALE:			pp_AN.UTF-8
 pt_BR.UTF-8/XLC_LOCALE:			pt_BR.UTF-8
 pt_PT.UTF-8/XLC_LOCALE:			pt_PT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ro_RO.UTF-8
@@ -427,11 +466,16 @@ en_US.UTF-8/XLC_LOCALE:			sa_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sd_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sd_IN.UTF-8@devanagari
 en_US.UTF-8/XLC_LOCALE:			se_NO.UTF-8
-en_US.UTF-8/XLC_LOCALE:			sh_BA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			si_LK.UTF-8
+en_US.UTF-8/XLC_LOCALE:			sid_ET.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_DJ.UTF-8
+en_US.UTF-8/XLC_LOCALE:			so_ET.UTF-8
+en_US.UTF-8/XLC_LOCALE:			so_KE.UTF-8
+en_US.UTF-8/XLC_LOCALE:			so_SO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sq_AL.UTF-8
+en_US.UTF-8/XLC_LOCALE:			sr_BA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_ME.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_RS.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_RS.UTF-8@latin
@@ -445,8 +489,11 @@ 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:			tk_TM.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_CY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tr_TR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ts_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tt_RU.UTF-8