]> git.pld-linux.org Git - packages/xorg-lib-libX11.git/blob - xorg-lib-libX11-glibc-locale_sync.patch
- updated for 1.1.4
[packages/xorg-lib-libX11.git] / xorg-lib-libX11-glibc-locale_sync.patch
1 --- libX11-1.0.2/nls/iso8859-16.orig/Compose.pre        1970-01-01 01:00:00.000000000 +0100
2 +++ libX11-1.0.2/nls/iso8859-16/Compose.pre     2006-06-29 18:08:22.583200750 +0200
3 @@ -0,0 +1,353 @@
4 +XCOMM $TOG: fcd8859-15 /main/2 1998/06/17 15:53:45 kaleb $
5 +XCOMM
6 +XCOMM ISO 8859-15 (Latin1) Compose Sequence
7 +XCOMM
8 +XCOMM $XFree86: xc/nls/Compose/iso8859-15,v 1.8 2002/10/16 01:44:48 dawes Exp $
9 +XCOMM
10 +XCOMM Sequence Definition
11 +XCOMM
12 +XCOMM <Multi_key> Means <Compose>
13 +XCOMM Special Character
14 +<Multi_key> <plus> <plus>              : "#"   numbersign
15 +<Multi_key> <apostrophe> <space>       : "'"   apostrophe
16 +<Multi_key> <space> <apostrophe>       : "'"   apostrophe
17 +<Multi_key> <A> <T>                    : "@"   at
18 +<Multi_key> <parenleft> <parenleft>    : "["   bracketleft
19 +<Multi_key> <slash> <slash>            : "\\"  backslash
20 +<Multi_key> <slash> <less>             : "\\"  backslash
21 +<Multi_key> <less> <slash>             : "\\"  backslash
22 +<Multi_key> <parenright> <parenright>  : "]"   bracketright
23 +<Multi_key> <asciicircum> <space>      : "^"   asciicircum
24 +<Multi_key> <space> <asciicircum>      : "^"   asciicircum
25 +<Multi_key> <greater> <space>          : "^"   asciicircum
26 +<Multi_key> <space> <greater>          : "^"   asciicircum
27 +<Multi_key> <grave> <space>            : "`"   grave
28 +<Multi_key> <space> <grave>            : "`"   grave
29 +<Multi_key> <parenleft> <minus>                : "{"   braceleft
30 +<Multi_key> <minus> <parenleft>                : "{"   braceleft
31 +<Multi_key> <slash> <asciicircum>      : "|"   bar
32 +<Multi_key> <asciicircum> <slash>      : "|"   bar
33 +<Multi_key> <V> <L>                    : "|"   bar
34 +<Multi_key> <L> <V>                    : "|"   bar
35 +<Multi_key> <v> <l>                    : "|"   bar
36 +<Multi_key> <l> <v>                    : "|"   bar
37 +<Multi_key> <parenright> <minus>       : "}"   braceright
38 +<Multi_key> <minus> <parenright>       : "}"   braceright
39 +<Multi_key> <asciitilde> <space>       : "~"   asciitilde
40 +<Multi_key> <space> <asciitilde>       : "~"   asciitilde
41 +<Multi_key> <minus> <space>            : "~"   asciitilde
42 +<Multi_key> <space> <minus>            : "~"   asciitilde
43 +<Multi_key> <C> <equal>                        : "\244"        EuroSign
44 +<Multi_key> <equal> <C>                        : "\244"        EuroSign
45 +<Multi_key> <E> <equal>                        : "\244"        EuroSign
46 +<Multi_key> <e> <equal>                        : "\244"        EuroSign
47 +<Multi_key> <greater> <comma>          : "\245"        doublelowquotemark
48 +<Multi_key> <comma> <greater>          : "\245"        doublelowquotemark
49 +<Multi_key> <s> <o>                    : "\247"        section
50 +<Multi_key> <o> <s>                    : "\247"        section
51 +<Multi_key> <S> <O>                    : "\247"        section
52 +<Multi_key> <O> <S>                    : "\247"        section
53 +<Multi_key> <S> <exclam>               : "\247"        section
54 +<Multi_key> <exclam> <S>               : "\247"        section
55 +<Multi_key> <s> <exclam>               : "\247"        section
56 +<Multi_key> <exclam> <s>               : "\247"        section
57 +<Multi_key> <S> <0>                    : "\247"        section
58 +<Multi_key> <0> <S>                    : "\247"        section
59 +<Multi_key> <s> <0>                    : "\247"        section
60 +<Multi_key> <0> <s>                    : "\247"        section
61 +<Multi_key> <c> <o>                    : "\251"        copyright
62 +<Multi_key> <o> <c>                    : "\251"        copyright
63 +<Multi_key> <C> <O>                    : "\251"        copyright
64 +<Multi_key> <O> <C>                    : "\251"        copyright
65 +<Multi_key> <c> <O>                    : "\251"        copyright
66 +<Multi_key> <O> <c>                    : "\251"        copyright
67 +<Multi_key> <C> <o>                    : "\251"        copyright
68 +<Multi_key> <o> <C>                    : "\251"        copyright
69 +<Multi_key> <c> <0>                    : "\251"        copyright
70 +<Multi_key> <0> <c>                    : "\251"        copyright
71 +<Multi_key> <C> <0>                    : "\251"        copyright
72 +<Multi_key> <0> <C>                    : "\251"        copyright
73 +<Multi_key> <parenleft> <c>            : "\251"        copyright
74 +<Multi_key> <parenleft> <C>            : "\251"        copyright
75 +<Multi_key> <less> <less>              : "\253"        guillemotleft
76 +<Multi_key> <greater> <greater>                : "\273"        guillemotright
77 +<Multi_key> <0> <asciicircum>          : "\260"        degree
78 +<Multi_key> <asciicircum> <0>          : "\260"        degree
79 +<Multi_key> <0> <asterisk>             : "\260"        degree
80 +<Multi_key> <asterisk> <0>             : "\260"        degree
81 +<Multi_key> <plus> <minus>             : "\261"        plusminus
82 +<Multi_key> <minus> <plus>             : "\261"        plusminus
83 +<Multi_key> <greater> <quotedbl>       : "\265"        rightdoublequotemark
84 +<Multi_key> <quotedbl> <greater>       : "\265"        rightdoublequotemark
85 +<Multi_key> <p> <exclam>               : "\266"        paragraph
86 +<Multi_key> <exclam> <p>               : "\266"        paragraph
87 +<Multi_key> <P> <exclam>               : "\266"        paragraph
88 +<Multi_key> <exclam> <P>               : "\266"        paragraph
89 +<Multi_key> <period> <asciicircum>     : "\267"        periodcentered
90 +<Multi_key> <asciicircum> <period>     : "\267"        periodcentered
91 +<Multi_key> <period> <period>          : "\267"        periodcentered
92 +<Multi_key> <space> <space>            : "\240"        nobreakspace
93 +<Multi_key> <minus> <minus>            : "\255"        hyphen
94 +<Multi_key> <quotedbl> <quotedbl>      : "\""  quotedbl
95 +XCOMM Accented Alphabet
96 +<Multi_key> <A> <grave>                        : "\300"        Agrave
97 +<Multi_key> <grave> <A>                        : "\300"        Agrave
98 +<Multi_key> <A> <apostrophe>           : "\301"        Aacute
99 +<Multi_key> <apostrophe> <A>           : "\301"        Aacute
100 +<Multi_key> <A> <asciicircum>          : "\302"        Acircumflex
101 +<Multi_key> <asciicircum> <A>          : "\302"        Acircumflex
102 +<Multi_key> <A> <greater>              : "\302"        Acircumflex
103 +<Multi_key> <greater> <A>              : "\302"        Acircumflex
104 +<Multi_key> <A> <U>                    : "\303"        Abreve
105 +<Multi_key> <A> <breve>                        : "\303"        Abreve
106 +<Multi_key> <breve> <A>                        : "\303"        Abreve
107 +<Multi_key> <A> <quotedbl>             : "\304"        Adiaeresis
108 +<Multi_key> <quotedbl> <A>             : "\304"        Adiaeresis
109 +<Multi_key> <A> <comma>                        : "\241"        Aogonek
110 +<Multi_key> <comma> <A>                        : "\241"        Aogonek
111 +<Multi_key> <a> <grave>                        : "\340"        agrave
112 +<Multi_key> <grave> <a>                        : "\340"        agrave
113 +<Multi_key> <a> <apostrophe>           : "\341"        aacute
114 +<Multi_key> <apostrophe> <a>           : "\341"        aacute
115 +<Multi_key> <a> <asciicircum>          : "\342"        acircumflex
116 +<Multi_key> <asciicircum> <a>          : "\342"        acircumflex
117 +<Multi_key> <a> <greater>              : "\342"        acircumflex
118 +<Multi_key> <greater> <a>              : "\342"        acircumflex
119 +<Multi_key> <a> <U>                    : "\343"        abreve
120 +<Multi_key> <a> <breve>                        : "\343"        abreve
121 +<Multi_key> <breve> <a>                        : "\343"        abreve
122 +<Multi_key> <a> <quotedbl>             : "\344"        adiaeresis
123 +<Multi_key> <quotedbl> <a>             : "\344"        adiaeresis
124 +<Multi_key> <a> <comma>                        : "\242"        aogonek
125 +<Multi_key> <comma> <a>                        : "\242"        aogonek
126 +<Multi_key> <A> <E>                    : "\306"        AE
127 +<Multi_key> <a> <e>                    : "\346"        ae
128 +<Multi_key> <C> <apostrophe>           : "\305"        Cacute
129 +<Multi_key> <apostrophe> <C>           : "\305"        Cacute
130 +<Multi_key> <C> <comma>                        : "\307"        Ccedilla
131 +<Multi_key> <comma> <C>                        : "\307"        Ccedilla
132 +<Multi_key> <C> <less>                 : "\262"        Ccaron
133 +<Multi_key> <less> <C>                 : "\262"        Ccaron
134 +<Multi_key> <c> <apostrophe>           : "\345"        cacute
135 +<Multi_key> <apostrophe> <c>           : "\345"        cacute
136 +<Multi_key> <c> <comma>                        : "\347"        ccedilla
137 +<Multi_key> <comma> <c>                        : "\347"        ccedilla
138 +<Multi_key> <c> <less>                 : "\271"        ccaron
139 +<Multi_key> <less> <c>                 : "\271"        ccaron
140 +<Multi_key> <D> <minus>                        : "\320"        Dstroke
141 +<Multi_key> <minus> <D>                        : "\320"        Dstroke
142 +<Multi_key> <d> <minus>                        : "\360"        dstroke
143 +<Multi_key> <minus> <d>                        : "\360"        dstroke
144 +<Multi_key> <E> <grave>                        : "\310"        Egrave
145 +<Multi_key> <grave> <E>                        : "\310"        Egrave
146 +<Multi_key> <E> <apostrophe>           : "\311"        Eacute
147 +<Multi_key> <apostrophe> <E>           : "\311"        Eacute
148 +<Multi_key> <E> <asciicircum>          : "\312"        Ecircumflex
149 +<Multi_key> <asciicircum> <E>          : "\312"        Ecircumflex
150 +<Multi_key> <E> <greater>              : "\312"        Ecircumflex
151 +<Multi_key> <greater> <E>              : "\312"        Ecircumflex
152 +<Multi_key> <E> <quotedbl>             : "\313"        Ediaeresis
153 +<Multi_key> <quotedbl> <E>             : "\313"        Ediaeresis
154 +<Multi_key> <E> <comma>                        : "\335"        Eogonek
155 +<Multi_key> <comma> <E>                        : "\335"        Eogonek
156 +<Multi_key> <e> <grave>                        : "\350"        egrave
157 +<Multi_key> <grave> <e>                        : "\350"        egrave
158 +<Multi_key> <e> <apostrophe>           : "\351"        eacute
159 +<Multi_key> <apostrophe> <e>           : "\351"        eacute
160 +<Multi_key> <e> <asciicircum>          : "\352"        ecircumflex
161 +<Multi_key> <asciicircum> <e>          : "\352"        ecircumflex
162 +<Multi_key> <e> <greater>              : "\352"        ecircumflex
163 +<Multi_key> <greater> <e>              : "\352"        ecircumflex
164 +<Multi_key> <e> <quotedbl>             : "\353"        ediaeresis
165 +<Multi_key> <quotedbl> <e>             : "\353"        ediaeresis
166 +<Multi_key> <e> <comma>                        : "\375"        eogonek
167 +<Multi_key> <comma> <e>                        : "\375"        eogonek
168 +<Multi_key> <I> <grave>                        : "\314"        Igrave
169 +<Multi_key> <grave> <I>                        : "\314"        Igrave
170 +<Multi_key> <I> <apostrophe>           : "\315"        Iacute
171 +<Multi_key> <apostrophe> <I>           : "\315"        Iacute
172 +<Multi_key> <I> <asciicircum>          : "\316"        Icircumflex
173 +<Multi_key> <asciicircum> <I>          : "\316"        Icircumflex
174 +<Multi_key> <I> <greater>              : "\316"        Icircumflex
175 +<Multi_key> <greater> <I>              : "\316"        Icircumflex
176 +<Multi_key> <I> <quotedbl>             : "\317"        Idiaeresis
177 +<Multi_key> <quotedbl> <I>             : "\317"        Idiaeresis
178 +<Multi_key> <i> <grave>                        : "\354"        igrave
179 +<Multi_key> <grave> <i>                        : "\354"        igrave
180 +<Multi_key> <i> <apostrophe>           : "\355"        iacute
181 +<Multi_key> <apostrophe> <i>           : "\355"        iacute
182 +<Multi_key> <i> <asciicircum>          : "\356"        icircumflex
183 +<Multi_key> <asciicircum> <i>          : "\356"        icircumflex
184 +<Multi_key> <i> <greater>              : "\356"        icircumflex
185 +<Multi_key> <greater> <i>              : "\356"        icircumflex
186 +<Multi_key> <i> <quotedbl>             : "\357"        idiaeresis
187 +<Multi_key> <quotedbl> <i>             : "\357"        idiaeresis
188 +<Multi_key> <L> <minus>                        : "\243"        Lstroke
189 +<Multi_key> <l> <minus>                        : "\263"        lstroke
190 +<Multi_key> <N> <apostrophe>           : "\321"        Nacute
191 +<Multi_key> <apostrophe> <N>           : "\321"        Nacute
192 +<Multi_key> <n> <apostrophe>           : "\361"        nacute
193 +<Multi_key> <apostrophe> <n>           : "\361"        nacute
194 +<Multi_key> <O> <grave>                        : "\322"        Ograve
195 +<Multi_key> <grave> <O>                        : "\322"        Ograve
196 +<Multi_key> <O> <apostrophe>           : "\323"        Oacute
197 +<Multi_key> <apostrophe> <O>           : "\323"        Oacute
198 +<Multi_key> <O> <asciicircum>          : "\324"        Ocircumflex
199 +<Multi_key> <asciicircum> <O>          : "\324"        Ocircumflex
200 +<Multi_key> <O> <greater>              : "\324"        Ocircumflex
201 +<Multi_key> <greater> <O>              : "\324"        Ocircumflex
202 +<Multi_key> <apostrophe> <apostrophe> <O>      : "\325"        Odoubleacute
203 +<Multi_key> <O> <quotedbl>             : "\326"        Odiaeresis
204 +<Multi_key> <quotedbl> <O>             : "\326"        Odiaeresis
205 +<Multi_key> <o> <grave>                        : "\362"        ograve
206 +<Multi_key> <grave> <o>                        : "\362"        ograve
207 +<Multi_key> <o> <apostrophe>           : "\363"        oacute
208 +<Multi_key> <apostrophe> <o>           : "\363"        oacute
209 +<Multi_key> <o> <asciicircum>          : "\364"        ocircumflex
210 +<Multi_key> <asciicircum> <o>          : "\364"        ocircumflex
211 +<Multi_key> <o> <greater>              : "\364"        ocircumflex
212 +<Multi_key> <greater> <o>              : "\364"        ocircumflex
213 +<Multi_key> <apostrophe> <apostrophe> <o>      : "\365"        odoubleacute
214 +<Multi_key> <o> <quotedbl>             : "\366"        odiaeresis
215 +<Multi_key> <quotedbl> <o>             : "\366"        odiaeresis
216 +<Multi_key> <O> <E>                    : "\274"        OE
217 +<Multi_key> <o> <e>                    : "\275"        oe
218 +<Multi_key> <S> <apostrophe>           : "\327"        Sacute
219 +<Multi_key> <apostrophe> <S>           : "\327"        Sacute
220 +<Multi_key> <S> <less>                 : "\246"        Scaron
221 +<Multi_key> <less> <S>                 : "\246"        Scaron
222 +<Multi_key> <s> <apostrophe>           : "\367"        sacute
223 +<Multi_key> <apostrophe> <s>           : "\367"        sacute
224 +<Multi_key> <s> <less>                 : "\250"        scaron
225 +<Multi_key> <less> <s>                 : "\250"        scaron
226 +<Multi_key> <s> <s>                    : "\337"        ssharp
227 +<Multi_key> <U> <grave>                        : "\331"        Ugrave
228 +<Multi_key> <grave> <U>                        : "\331"        Ugrave
229 +<Multi_key> <U> <apostrophe>           : "\332"        Uacute
230 +<Multi_key> <apostrophe> <U>           : "\332"        Uacute
231 +<Multi_key> <apostrophe> <apostrophe> <U>      : "\330"        Udoubleacute
232 +<Multi_key> <U> <asciicircum>          : "\333"        Ucircumflex
233 +<Multi_key> <asciicircum> <U>          : "\333"        Ucircumflex
234 +<Multi_key> <U> <greater>              : "\333"        Ucircumflex
235 +<Multi_key> <greater> <U>              : "\333"        Ucircumflex
236 +<Multi_key> <U> <quotedbl>             : "\334"        Udiaeresis
237 +<Multi_key> <quotedbl> <U>             : "\334"        Udiaeresis
238 +<Multi_key> <u> <grave>                        : "\371"        ugrave
239 +<Multi_key> <grave> <u>                        : "\371"        ugrave
240 +<Multi_key> <u> <apostrophe>           : "\372"        uacute
241 +<Multi_key> <apostrophe> <u>           : "\372"        uacute
242 +<Multi_key> <apostrophe> <apostrophe> <u>      : "\370"        udoubleacute
243 +<Multi_key> <u> <asciicircum>          : "\373"        ucircumflex
244 +<Multi_key> <asciicircum> <u>          : "\373"        ucircumflex
245 +<Multi_key> <u> <greater>              : "\373"        ucircumflex
246 +<Multi_key> <greater> <u>              : "\373"        ucircumflex
247 +<Multi_key> <u> <quotedbl>             : "\374"        udiaeresis
248 +<Multi_key> <quotedbl> <u>             : "\374"        udiaeresis
249 +<Multi_key> <Y> <quotedbl>             : "\276"        Ydiaeresis
250 +<Multi_key> <quotedbl> <Y>             : "\276"        Ydiaeresis
251 +<Multi_key> <y> <quotedbl>             : "\377"        ydiaeresis
252 +<Multi_key> <quotedbl> <y>             : "\377"        ydiaeresis
253 +<Multi_key> <Z> <apostrophe>           : "\254"        Zacute
254 +<Multi_key> <apostrophe> <Z>           : "\254"        Zacute
255 +<Multi_key> <Z> <less>                 : "\264"        Zcaron
256 +<Multi_key> <less> <Z>                 : "\264"        Zcaron
257 +<Multi_key> <Z> <period>               : "\257"        Zabovedot
258 +<Multi_key> <z> <apostrophe>           : "\256"        zacute
259 +<Multi_key> <apostrophe> <z>           : "\256"        zacute
260 +<Multi_key> <z> <less>                 : "\270"        zcaron
261 +<Multi_key> <less> <z>                 : "\270"        zcaron
262 +<Multi_key> <z> <period>               : "\277"        zabovedot
263 +XCOMM
264 +XCOMM dead key accent keysyms
265 +XCOMM Special Character
266 +<dead_circumflex> <slash>              : "|"   bar
267 +<dead_circumflex> <space>              : "^"   asciicircum
268 +<dead_circumflex> <dead_circumflex>    : "^"   asciicircum
269 +<dead_tilde> <space>                   : "~"   asciitilde
270 +<dead_tilde> <dead_tilde>              : "~"   asciitilde
271 +<dead_grave> <space>                   : "`"   grave
272 +<dead_grave> <dead_grave>              : "`"   grave
273 +XCOMM These are for us_intl, that does not have diaeresis, etc
274 +<dead_acute> <space>                   : "'"   apostrophe
275 +<dead_diaeresis> <space>               : "\""  quotedbl
276 +<dead_diaeresis> <dead_diaeresis>      : "\""  quotedbl
277 +<dead_doubleacute> <space>             : "\""  quotedbl
278 +<dead_circumflex> <0>                  : "\260"        degree
279 +<dead_circumflex> <period>             : "\267"        periodcentered
280 +<dead_diaeresis> <quotedbl>            : "\""  quotedbl
281 +XCOMM Accented Alphabet
282 +<dead_grave> <A>                       : "\300"        Agrave
283 +<dead_acute> <A>                       : "\301"        Aacute
284 +<dead_circumflex> <A>                  : "\302"        Acircumflex
285 +<dead_breve> <A>                       : "\303"        Abreve
286 +<dead_diaeresis> <A>                   : "\304"        Adiaeresis
287 +<dead_ogonek> <A>                      : "\241"        Aogonek
288 +<dead_grave> <a>                       : "\340"        agrave
289 +<dead_acute> <a>                       : "\341"        aacute
290 +<dead_circumflex> <a>                  : "\342"        acircumflex
291 +<dead_breve> <a>                       : "\343"        abreve
292 +<dead_diaeresis> <a>                   : "\344"        adiaeresis
293 +<dead_ogonek> <a>                      : "\242"        aogonek
294 +<dead_acute> <C>                       : "\305"        Cacute
295 +<dead_cedilla> <C>                     : "\307"        Ccedilla
296 +<dead_caron> <C>                       : "\262"        Ccaron
297 +<dead_acute> <c>                       : "\345"        cacute
298 +<dead_cedilla> <c>                     : "\347"        ccedilla
299 +<dead_caron> <c>                       : "\271"        ccaron
300 +<dead_grave> <E>                       : "\310"        Egrave
301 +<dead_acute> <E>                       : "\311"        Eacute
302 +<dead_circumflex> <E>                  : "\312"        Ecircumflex
303 +<dead_diaeresis> <E>                   : "\313"        Ediaeresis
304 +<dead_ogonek> <E>                      : "\335"        Eogonek
305 +<dead_grave> <e>                       : "\350"        egrave
306 +<dead_acute> <e>                       : "\351"        eacute
307 +<dead_circumflex> <e>                  : "\352"        ecircumflex
308 +<dead_diaeresis> <e>                   : "\353"        ediaeresis
309 +<dead_ogonek> <e>                      : "\375"        eogonek
310 +<dead_grave> <I>                       : "\314"        Igrave
311 +<dead_acute> <I>                       : "\315"        Iacute
312 +<dead_circumflex> <I>                  : "\316"        Icircumflex
313 +<dead_diaeresis> <I>                   : "\317"        Idiaeresis
314 +<dead_grave> <i>                       : "\354"        igrave
315 +<dead_acute> <i>                       : "\355"        iacute
316 +<dead_circumflex> <i>                  : "\356"        icircumflex
317 +<dead_diaeresis> <i>                   : "\357"        idiaeresis
318 +<dead_acute> <N>                       : "\321"        Nacute
319 +<dead_acute> <n>                       : "\361"        nacute
320 +<dead_grave> <O>                       : "\322"        Ograve
321 +<dead_acute> <O>                       : "\323"        Oacute
322 +<dead_circumflex> <O>                  : "\324"        Ocircumflex
323 +<dead_doubleacute> <O>                 : "\325"        Odoubleacute
324 +<dead_diaeresis> <O>                   : "\326"        Odiaeresis
325 +<dead_grave> <o>                       : "\362"        ograve
326 +<dead_acute> <o>                       : "\363"        oacute
327 +<dead_circumflex> <o>                  : "\364"        ocircumflex
328 +<dead_doubleacute> <o>                 : "\365"        odoubleacute
329 +<dead_diaeresis> <o>                   : "\366"        odiaeresis
330 +<dead_acute> <S>                       : "\327"        Sacute
331 +<dead_caron> <S>                       : "\246"        Scaron
332 +<dead_circumflex> <S>                  : "\246"        Scaron
333 +<dead_acute> <s>                       : "\367"        sacute
334 +<dead_circumflex> <s>                  : "\250"        scaron
335 +<dead_caron> <s>                       : "\250"        scaron
336 +<dead_grave> <U>                       : "\331"        Ugrave
337 +<dead_acute> <U>                       : "\332"        Uacute
338 +<dead_doubleacute> <U>                 : "\330"        Udoubleacute
339 +<dead_circumflex> <U>                  : "\333"        Ucircumflex
340 +<dead_diaeresis> <U>                   : "\334"        Udiaeresis
341 +<dead_grave> <u>                       : "\371"        ugrave
342 +<dead_acute> <u>                       : "\372"        uacute
343 +<dead_doubleacute> <u>                 : "\370"        udoubleacute
344 +<dead_circumflex> <u>                  : "\373"        ucircumflex
345 +<dead_diaeresis> <u>                   : "\374"        udiaeresis
346 +<dead_diaeresis> <Y>                   : "\276"        Ydiaeresis
347 +<dead_diaeresis> <y>                   : "\377"        ydiaeresis
348 +<dead_acute> <Z>                       : "\254"        Zacute
349 +<dead_caron> <Z>                       : "\264"        Zcaron
350 +<dead_circumflex> <Z>                  : "\264"        Zcaron
351 +<dead_abovedot> <Z>                    : "\257"        Zabovedot
352 +<dead_acute> <z>                       : "\256"        zacute
353 +<dead_caron> <z>                       : "\270"        zcaron
354 +<dead_circumflex> <z>                  : "\270"        zcaron
355 +<dead_abovedot> <z>                    : "\277"        zabovedot
356 +XCOMM End of Sequence Definition
357 --- libX11-1.0.2/nls/iso8859-16.orig/Makefile.am        1970-01-01 01:00:00.000000000 +0100
358 +++ libX11-1.0.2/nls/iso8859-16/Makefile.am     2006-06-29 18:10:54.640703750 +0200
359 @@ -0,0 +1,3 @@
360 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-16
361 +
362 +include $(top_srcdir)/nls/localerules.in
363 --- libX11-1.0.2/nls/iso8859-16.orig/XI18N_OBJS 1970-01-01 01:00:00.000000000 +0100
364 +++ libX11-1.0.2/nls/iso8859-16/XI18N_OBJS      2006-06-29 18:08:53.137110250 +0200
365 @@ -0,0 +1,7 @@
366 +# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME     FUNCTION_NAME
367 +#
368 +#      XI18N objects table for iso8859-16 locale
369 +#
370 +XLC    common/xlcDef   _XlcDefaultLoader       # XLC_open
371 +XIM    common/ximcp    _XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open    XIM_register XIM_unregister
372 +XOM    common/xomGeneric       _XomGenericOpenOM       # XOM_open
373 --- libX11-1.0.2/nls/iso8859-16.orig/XLC_LOCALE.pre     1970-01-01 01:00:00.000000000 +0100
374 +++ libX11-1.0.2/nls/iso8859-16/XLC_LOCALE.pre  2006-06-29 18:10:07.965786750 +0200
375 @@ -0,0 +1,80 @@
376 +XCOMM  $TOG: fcd8859-15 /main/1 1998/05/20 14:49:16 kaleb $
377 +XCOMM  XLocale Database Sample for fcd/dis/iso 8859-16.
378 +XCOMM  When Final Committee Draft (FCD) 8859-16 is formalized
379 +XCOMM  then this file will be renamed iso8859-16.
380 +XCOMM  This file is provided as preliminary support for the Latin-9
381 +XCOMM  (a.k.a. Latin-0) character set so that Europeans who want
382 +XCOMM  the Euro currency character can do so.
383 +XCOMM 
384 +XCOMM  $XFree86$
385 +XCOMM 
386 +
387 +XCOMM 
388 +XCOMM  XLC_FONTSET category
389 +XCOMM 
390 +XLC_FONTSET
391 +XCOMM  fs0 class 
392 +fs0    {
393 +       charset {
394 +               name            ISO8859-1:GL
395 +       }
396 +       font    {
397 +               primary         ISO8859-16:GL
398 +               substitute      ISO8859-16:GL
399 +               vertical_rotate all
400 +       }
401 +}
402 +XCOMM  fs1 class 
403 +fs1    {
404 +       charset {
405 +               name            ISO8859-16:GR
406 +       }
407 +       font    {
408 +               primary         ISO8859-16:GR
409 +       }
410 +}
411 +END XLC_FONTSET
412 +
413 +XCOMM 
414 +XCOMM  XLC_XLOCALE category
415 +XCOMM 
416 +XLC_XLOCALE
417 +
418 +encoding_name          ISO8859-16
419 +mb_cur_max             1
420 +state_depend_encoding  False
421 +#if WCHAR32
422 +wc_encoding_mask       \x30000000
423 +wc_shift_bits          7
424 +#else
425 +wc_encoding_mask       \x00008080
426 +wc_shift_bits          8
427 +#endif
428 +
429 +#ifndef X_LOCALE
430 +use_stdc_env           True
431 +force_convert_to_mb    True
432 +#endif
433 +
434 +XCOMM  cs0 class
435 +cs0    {
436 +       side            GL:Default
437 +       length          1
438 +       wc_encoding     \x00000000
439 +       ct_encoding     ISO8859-16:GL; ISO8859-1:GL
440 +}
441 +
442 +
443 +XCOMM  cs1 class
444 +cs1    {
445 +       side            GR:Default
446 +       length          1
447 +#if WCHAR32
448 +       wc_encoding     \x30000000
449 +#else
450 +       wc_encoding     \x00008080
451 +#endif
452 +       ct_encoding     ISO8859-16:GR
453 +}
454 +
455 +END XLC_XLOCALE
456 --- libX11-1.0.2/nls/koi8-t.orig/Compose.pre    1970-01-01 01:00:00.000000000 +0100
457 +++ libX11-1.0.2/nls/koi8-t/Compose.pre 2006-06-29 18:12:58.108420000 +0200
458 @@ -0,0 +1,72 @@
459 +XCOMM
460 +XCOMM koi8-t Compose Sequence
461 +XCOMM
462 +XCOMM Sequence Definition
463 +XCOMM
464 +
465 +XCOMM <Multi_key> Means <Compose>
466 +XCOMM Special Character
467 +<Multi_key> <plus> <plus>               : "#"   numbersign
468 +<Multi_key> <apostrophe> <space>        : "'"   apostrophe
469 +<Multi_key> <space> <apostrophe>        : "'"   apostrophe
470 +<Multi_key> <A> <T>                     : "@"   at
471 +<Multi_key> <parenleft> <parenleft>     : "["   bracketleft
472 +<Multi_key> <slash> <slash>             : "\\"  backslash
473 +<Multi_key> <slash> <less>              : "\\"  backslash
474 +<Multi_key> <less> <slash>              : "\\"  backslash
475 +<Multi_key> <parenright> <parenright>   : "]"   bracketright
476 +<Multi_key> <asciicircum> <space>       : "^"   asciicircum
477 +<Multi_key> <space> <asciicircum>       : "^"   asciicircum
478 +<Multi_key> <greater> <space>           : "^"   asciicircum
479 +<Multi_key> <space> <greater>           : "^"   asciicircum
480 +<Multi_key> <grave> <space>             : "`"   grave
481 +<Multi_key> <space> <grave>             : "`"   grave
482 +<Multi_key> <parenleft> <minus>         : "{"   braceleft
483 +<Multi_key> <minus> <parenleft>         : "{"   braceleft
484 +<Multi_key> <slash> <asciicircum>       : "|"   bar
485 +<Multi_key> <asciicircum> <slash>       : "|"   bar
486 +<Multi_key> <V> <L>                     : "|"   bar
487 +<Multi_key> <L> <V>                     : "|"   bar
488 +<Multi_key> <v> <l>                     : "|"   bar
489 +<Multi_key> <l> <v>                     : "|"   bar
490 +<Multi_key> <parenright> <minus>        : "}"   braceright
491 +<Multi_key> <minus> <parenright>        : "}"   braceright
492 +<Multi_key> <asciitilde> <space>        : "~"   asciitilde
493 +<Multi_key> <space> <asciitilde>        : "~"   asciitilde
494 +<Multi_key> <minus> <space>             : "~"   asciitilde
495 +<Multi_key> <space> <minus>             : "~"   asciitilde
496 +
497 +<Multi_key> <space> <space>             : "\240"       nobreakspace
498 +
499 +<Multi_key> <Cyrillic_ka> <comma>       : "\200"       Cyrillic_ka_descender
500 +<Multi_key> <Cyrillic_ghe> <minus>      : "\201"       Cyrillic_ghe_bar
501 +<Multi_key> <Cyrillic_GHE> <minus>      : "\203"       Cyrillic_GHE_bar
502 +<Multi_key> <Cyrillic_ha> <comma>      : "\212"        Cyrillic_ha_descender
503 +<Multi_key> <Cyrillic_HA> <comma>      : "\214"        Cyrillic_HA_descender
504 +<Multi_key> <Cyrillic_che> <comma>     : "\215"        Cyrillic_che_descender
505 +<Multi_key> <Cyrillic_CHE> <comma>     : "\216"        Cyrillic_CHE_descender
506 +<Multi_key> <Cyrillic_KA> <comma>       : "\220"       Cyrillic_KA_descender
507 +<Multi_key> <Cyrillic_u> <minus>       : "\241"        Cyrillic_u_macron
508 +<Multi_key> <Cyrillic_U> <minus>       : "\242"        Cyrillic_U_macron
509 +<Multi_key> <Cyrillic_shorti> <Cyrillic_o> : "\243"    Cyrillic_io
510 +<Multi_key> <Cyrillic_je> <Cyrillic_o> : "\243"        Cyrillic_io
511 +<Multi_key> <Cyrillic_ie> <colon>      : "\243"        Cyrillic_io
512 +<Multi_key> <Cyrillic_i> <minus>       : "\245"        Cyrillic_i_macron
513 +<Multi_key> <Cyrillic_SHORTI> <Cyrillic_O> : "\263"    Cyrillic_IO
514 +<Multi_key> <Cyrillic_JE> <Cyrillic_O> : "\263"        Cyrillic_IO
515 +<Multi_key> <Cyrillic_IE> <colon>      : "\263"        Cyrillic_IO
516 +<Multi_key> <Cyrillic_I> <minus>       : "\265"        Cyrillic_I_macron
517 +<Multi_key> <Cyrillic_shorti> <Cyrillic_u> : "\300"    Cyrillic_yu
518 +<Multi_key> <Cyrillic_je> <Cyrillic_u> : "\300"        Cyrillic_yu
519 +<Multi_key> <Cyrillic_te> <Cyrillic_es>        : "\303"        Cyrillic_tse
520 +<Multi_key> <Cyrillic_shorti> <Cyrillic_a> : "\321"    Cyrillic_ya
521 +<Multi_key> <Cyrillic_je> <Cyrillic_a> : "\321"        Cyrillic_ya
522 +<Multi_key> <Cyrillic_sha> <comma>     : "\335"        Cyrillic_shcha
523 +<Multi_key> <Cyrillic_SHORTI> <Cyrillic_U> : "\340"    Cyrillic_YU
524 +<Multi_key> <Cyrillic_JE> <Cyrillic_U> : "\340"        Cyrillic_YU
525 +<Multi_key> <Cyrillic_TE> <Cyrillic_ES>        : "\343"        Cyrillic_TSE
526 +<Multi_key> <Cyrillic_SHORTI> <Cyrillic_A> : "\361"    Cyrillic_YA
527 +<Multi_key> <Cyrillic_JE> <Cyrillic_A> : "\361"        Cyrillic_YA
528 +<Multi_key> <Cyrillic_SHA> <comma>     : "\375"        Cyrillic_SHCHA
529 +
530 +XCOMM End of Sequence Definition
531 --- libX11-1.0.2/nls/koi8-t.orig/Makefile.am    1970-01-01 01:00:00.000000000 +0100
532 +++ libX11-1.0.2/nls/koi8-t/Makefile.am 2006-06-29 18:14:06.356685250 +0200
533 @@ -0,0 +1,3 @@
534 +x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-t
535 +
536 +include $(top_srcdir)/nls/localerules.in
537 --- libX11-1.0.2/nls/koi8-t.orig/XI18N_OBJS     1970-01-01 01:00:00.000000000 +0100
538 +++ libX11-1.0.2/nls/koi8-t/XI18N_OBJS  2006-06-29 18:13:12.605326000 +0200
539 @@ -0,0 +1,7 @@
540 +# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME     FUNCTION_NAME
541 +#
542 +#      XI18N objects table for koi8-t locale
543 +#
544 +XLC    common/xlcDef   _XlcDefaultLoader       # XLC_open
545 +XIM    common/ximcp    _XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open    XIM_register XIM_unregister
546 +XOM    common/xomGeneric       _XomGenericOpenOM       # XOM_open
547 --- libX11-1.0.2/nls/koi8-t.orig/XLC_LOCALE.pre 1970-01-01 01:00:00.000000000 +0100
548 +++ libX11-1.0.2/nls/koi8-t/XLC_LOCALE.pre      2006-06-29 18:14:01.496381500 +0200
549 @@ -0,0 +1,79 @@
550 +XCOMM  XLocale Database Sample for koi8-t.
551 +XCOMM 
552 +
553 +XCOMM 
554 +XCOMM  XLC_FONTSET category
555 +XCOMM 
556 +XLC_FONTSET
557 +XCOMM  fs0 class (7 bit ASCII)
558 +fs0    {
559 +       charset {
560 +               name            ISO8859-1:GL
561 +       }
562 +       font    {
563 +               primary         KOI8-T:GL
564 +               substitute      ISO8859-1:GL
565 +       }
566 +}
567 +XCOMM  fs1 class 
568 +fs1    {
569 +       charset         KOI8-T:GR
570 +       font            KOI8-T:GR
571 +}
572 +END XLC_FONTSET
573 +
574 +XCOMM
575 +XCOMM  XLC_CHARSET_DEFINE category
576 +XCOMM
577 +XLC_CHARSET_DEFINE
578 +csd0   {
579 +       charset_name    KOI8-T
580 +       side            GR
581 +       length          1
582 +       string_encoding False
583 +       sequence        \x1b%/1
584 +}
585 +END XLC_CHARSET_DEFINE
586 +
587 +XCOMM 
588 +XCOMM  XLC_XLOCALE category
589 +XCOMM 
590 +XLC_XLOCALE
591 +
592 +encoding_name           KOI8-T
593 +mb_cur_max             1
594 +state_depend_encoding  False
595 +#if WCHAR32
596 +wc_encoding_mask       \x30000000
597 +wc_shift_bits          7
598 +#else
599 +wc_encoding_mask       \x00008080
600 +wc_shift_bits          8
601 +#endif
602 +
603 +#ifndef X_LOCALE
604 +use_stdc_env           True
605 +#endif
606 +
607 +XCOMM  cs0 class
608 +cs0    {
609 +       side            GL:Default
610 +       length          1
611 +       wc_encoding     \x00000000
612 +       ct_encoding     KOI8-T:GL; ISO8859-1:GL
613 +}
614 +
615 +
616 +XCOMM  cs1 class
617 +cs1    {
618 +       side            GR:Default
619 +       length          1
620 +#if WCHAR32
621 +       wc_encoding     \x30000000
622 +#else
623 +       wc_encoding     \x00008080
624 +#endif
625 +       ct_encoding     KOI8-T:GR
626 +}
627 +
628 +END XLC_XLOCALE
629 --- libX11-1.0.2/nls/Makefile.am.orig   2006-06-22 23:22:22.000000000 +0200
630 +++ libX11-1.0.2/nls/Makefile.am        2006-06-29 18:15:09.024601750 +0200
631 @@ -26,6 +26,7 @@
632         iso8859-13              \
633         iso8859-14              \
634         iso8859-15              \
635 +       iso8859-16              \
636         iso8859-2               \
637         iso8859-3               \
638         iso8859-4               \
639 @@ -44,6 +45,7 @@
640         ko                      \
641         koi8-c                  \
642         koi8-r                  \
643 +       koi8-t                  \
644         koi8-u                  \
645         ko_KR.UTF-8             \
646         microsoft-cp1251        \
647 --- libX11-1.1.4/nls/compose.dir.pre.orig       2008-03-06 21:45:06.000000000 +0100
648 +++ libX11-1.1.4/nls/compose.dir.pre    2008-03-07 23:21:34.487595975 +0100
649 @@ -7,8 +7,11 @@
650  XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
651  XCOMM
652  iso8859-1/Compose:             C
653 +iso8859-1/Compose:             aa_DJ.ISO8859-1
654  iso8859-1/Compose:             af_ZA.ISO8859-1
655 +iso8859-15/Compose:            an_ES.ISO8859-15
656  iso8859-6/Compose:             ar_AA.ISO8859-6
657 +iso8859-6/Compose:             ar_AE.ISO8859-6
658  iso8859-6/Compose:             ar_BH.ISO8859-6
659  iso8859-6/Compose:             ar_DZ.ISO8859-6
660  iso8859-6/Compose:             ar_EG.ISO8859-6
661 @@ -21,13 +24,15 @@
662  iso8859-6/Compose:             ar_OM.ISO8859-6
663  iso8859-6/Compose:             ar_QA.ISO8859-6
664  iso8859-6/Compose:             ar_SA.ISO8859-6
665 +iso8859-6/Compose:             ar_SD.ISO8859-6
666 +iso8859-6/Compose:             ar_SY.ISO8859-6
667  iso8859-6/Compose:             ar_TN.ISO8859-6
668  iso8859-6/Compose:             ar_YE.ISO8859-6
669  iso8859-9e/Compose:            az_AZ.ISO8859-9E
670 -koi8-c/Compose:                        a3_AZ.KOI8-C
671 -microsoft-cp1251/Compose:      be_BY.CP1251
672 +koi8-c/Compose:                        az_AZ.KOI8-K
673 +XCOMM microsoft-cp1251/Compose:        be_BY.CP1251
674  iso8859-5/Compose:             bg_BG.ISO8859-5
675 -microsoft-cp1251/Compose:      bg_BG.CP1251
676 +XCOMM microsoft-cp1251/Compose:        bg_BG.CP1251
677  iso8859-1/Compose:             br_FR.ISO8859-1
678  iso8859-14/Compose:            br_FR.ISO8859-14
679  iso8859-15/Compose:            br_FR.ISO8859-15
680 @@ -48,6 +53,8 @@
681  iso8859-15/Compose:            da_DK.ISO8859-15
682  iso8859-1/Compose:             de_AT.ISO8859-1
683  iso8859-15/Compose:            de_AT.ISO8859-15
684 +iso8859-1/Compose:             de_BE.ISO8859-1
685 +iso8859-15/Compose:            de_BE.ISO8859-15
686  iso8859-1/Compose:             de_CH.ISO8859-1
687  iso8859-15/Compose:            de_CH.ISO8859-15
688  iso8859-1/Compose:             de_DE.ISO8859-1
689 @@ -56,23 +63,30 @@
690  iso8859-15/Compose:            de_LI.ISO8859-15
691  iso8859-1/Compose:             de_LU.ISO8859-1
692  iso8859-15/Compose:            de_LU.ISO8859-15
693 +iso8859-7/Compose:             el_CY.ISO8859-7
694  iso8859-7/Compose:             el_GR.ISO8859-7
695  iso8859-1/Compose:             en_AU.ISO8859-1
696 +iso8859-1/Compose:             en_BE.ISO8859-1
697 +iso8859-15/Compose:            en_BE.ISO8859-15
698 +iso8859-1/Compose:             en_BW.ISO8859-1
699  iso8859-1/Compose:             en_BZ.ISO8859-1
700  iso8859-1/Compose:             en_CA.ISO8859-1
701 +iso8859-1/Compose:             en_DK.ISO8859-1
702  iso8859-1/Compose:             en_GB.ISO8859-1
703  iso8859-15/Compose:            en_GB.ISO8859-15
704 +iso8859-1/Compose:             en_HK.ISO8859-1
705  iso8859-1/Compose:             en_IE.ISO8859-1
706  iso8859-15/Compose:            en_IE.ISO8859-15
707  iso8859-1/Compose:             en_JM.ISO8859-1
708  iso8859-1/Compose:             en_NZ.ISO8859-1
709 +iso8859-1/Compose:             en_PH.ISO8859-1
710 +iso8859-1/Compose:             en_SG.ISO8859-1
711  iso8859-1/Compose:             en_TT.ISO8859-1
712 -iso8859-1/Compose:             en_UK.ISO8859-1
713 -iso8859-15/Compose:            en_UK.ISO8859-15
714  iso8859-1/Compose:             en_US.ISO8859-1
715  iso8859-15/Compose:            en_US.ISO8859-15
716  iso8859-1/Compose:             en_ZA.ISO8859-1
717  iso8859-15/Compose:            en_ZA.ISO8859-15
718 +iso8859-1/Compose:             en_ZW.ISO8859-1
719  iso8859-3/Compose:             eo_XX.ISO8859-3
720  iso8859-1/Compose:             es_AR.ISO8859-1
721  iso8859-1/Compose:             es_BO.ISO8859-1
722 @@ -92,6 +106,7 @@
723  iso8859-1/Compose:             es_PR.ISO8859-1
724  iso8859-1/Compose:             es_PY.ISO8859-1
725  iso8859-1/Compose:             es_SV.ISO8859-1
726 +iso8859-1/Compose:             es_US.ISO8859-1
727  iso8859-1/Compose:             es_UY.ISO8859-1
728  iso8859-1/Compose:             es_VE.ISO8859-1
729  iso8859-1/Compose:             et_EE.ISO8859-1
730 @@ -103,6 +118,7 @@
731  isiri-3342/Compose:            fa_IR.ISIRI-3342
732  iso8859-1/Compose:             fi_FI.ISO8859-1
733  iso8859-15/Compose:            fi_FI.ISO8859-15
734 +iso8859-1/Compose:             fil_PH.ISO8859-1
735  iso8859-1/Compose:             fo_FO.ISO8859-1
736  iso8859-15/Compose:            fo_FO.ISO8859-15
737  iso8859-1/Compose:             fr_BE.ISO8859-1
738 @@ -127,9 +143,10 @@
739  iso8859-14/Compose:            gv_GB.ISO8859-14
740  iso8859-15/Compose:            gv_GB.ISO8859-15
741  iso8859-8/Compose:             he_IL.ISO8859-8
742 -microsoft-cp1255/Compose:      he_IL.CP1255
743 +XCOMM microsoft-cp1255/Compose:        he_IL.CP1255
744  iscii-dev/Compose:             hi_IN.ISCII-DEV
745  iso8859-2/Compose:             hr_HR.ISO8859-2
746 +iso8859-2/Compose:             hsb_DE.ISO8859-2
747  iso8859-2/Compose:             hu_HU.ISO8859-2
748  armscii-8/Compose:             hy_AM.ARMSCII-8
749  iso8859-1/Compose:             id_ID.ISO8859-1
750 @@ -145,12 +162,18 @@
751  ja.JIS/Compose:                        ja_JP.JIS7
752  georgian-academy/Compose:      ka_GE.GEORGIAN-ACADEMY
753  georgian-ps/Compose:           ka_GE.GEORGIAN-PS
754 +XCOMM pt-154/Compose:          kk_KZ.PT154
755  iso8859-1/Compose:             kl_GL.ISO8859-1
756  iso8859-15/Compose:            kl_GL.ISO8859-15
757 +ko/Compose:                    ko_KR.eucKR
758  iso8859-1/Compose:             kw_GB.ISO8859-1
759  iso8859-14/Compose:            kw_GB.ISO8859-14
760  iso8859-15/Compose:            kw_GB.ISO8859-15
761 -ko/Compose:                    ko_KR.eucKR
762 +iso8859-10/Compose:            lg_UG.ISO8859-10
763 +iso8859-1/Compose:             li_BE.ISO8859-1
764 +iso8859-15/Compose:            li_BE.ISO8859-15
765 +iso8859-1/Compose:             li_NL.ISO8859-1
766 +iso8859-15/Compose:            li_NL.ISO8859-15
767  ibm-cp1133/Compose:            lo_LA.IBM-CP1133
768  mulelao-1/Compose:             lo_LA.MULELAO-1
769  iso8859-1/Compose:             lt_LN.ISO8859-1
770 @@ -158,54 +181,57 @@
771  iso8859-13/Compose:            lt_LT.ISO8859-13
772  iso8859-4/Compose:             lv_LV.ISO8859-4
773  iso8859-13/Compose:            lv_LV.ISO8859-13
774 -iso8859-13/Compose:            mi_NZ.ISO8859-13
775 +iso8859-1/Compose:             mi_NZ.ISO8859-1
776  iso8859-5/Compose:             mk_MK.ISO8859-5
777  XCOMM mk_MK.UTF-8/Compose:             mk_MK.UTF-8
778 -microsoft-cp1251/Compose:      mk_MK.CP1251
779 +XCOMM microsoft-cp1251/Compose:        mk_MK.CP1251
780  iso8859-1/Compose:             ms_MY.ISO8859-1
781  iso8859-3/Compose:             mt_MT.ISO8859-3
782 +iso8859-1/Compose:             nb_NO.ISO8859-1
783 +iso8859-15/Compose:            nb_NO.ISO8859-15
784 +iso8859-1/Compose:             nds_DE.ISO8859-1
785 +iso8859-15/Compose:            nds_DE.ISO8859-15
786  iso8859-1/Compose:             nl_BE.ISO8859-1
787  iso8859-15/Compose:            nl_BE.ISO8859-15
788  iso8859-1/Compose:             nl_NL.ISO8859-1
789  iso8859-15/Compose:            nl_NL.ISO8859-15
790 -iso8859-1/Compose:             no_NO.ISO8859-1
791 -iso8859-15/Compose:            no_NO.ISO8859-15
792 -iso8859-1/Compose:             nb_NO.ISO8859-1
793 -iso8859-15/Compose:            nb_NO.ISO8859-15
794  iso8859-1/Compose:             nn_NO.ISO8859-1
795  iso8859-15/Compose:            nn_NO.ISO8859-15
796  iso8859-1/Compose:             nr_ZA.ISO8859-1
797 -iso8859-15/Compose:            nso_ZA.ISO8859-15
798 -iso8859-1/Compose:             ny_NO.ISO8859-1
799 -iso8859-15/Compose:            ny_NO.ISO8859-15
800 +iso8859-10/Compose:            nso_ZA.ISO8859-10
801  iso8859-1/Compose:             oc_FR.ISO8859-1
802  iso8859-15/Compose:            oc_FR.ISO8859-15
803 +iso8859-1/Compose:             om_KE.ISO8859-1
804 +iso8859-1/Compose:             pap_AN.ISO8859-1
805 +iso8859-15/Compose:            pap_AN.ISO8859-15
806  iso8859-1/Compose:             pd_DE.ISO8859-1
807  iso8859-1/Compose:             pd_US.ISO8859-1
808 -iso8859-1/Compose:             ph_PH.ISO8859-1
809  iso8859-2/Compose:             pl_PL.ISO8859-2
810 -iso8859-1/Compose:             pp_AN.ISO8859-1
811 +iso8859-16/Compose:            pl_PL.ISO8859-16
812  iso8859-1/Compose:             pt_BR.ISO8859-1
813  iso8859-15/Compose:            pt_BR.ISO8859-15
814  iso8859-1/Compose:             pt_PT.ISO8859-1
815  iso8859-15/Compose:            pt_PT.ISO8859-15
816  iso8859-2/Compose:             ro_RO.ISO8859-2
817 +iso8859-16/Compose:            ro_RO.ISO8859-16
818  koi8-r/Compose:                        ru_RU.KOI8-R
819  iso8859-5/Compose:             ru_RU.ISO8859-5
820 -microsoft-cp1251/Compose:      ru_RU.CP1251
821 +XCOMM microsoft-cp1251/Compose:        ru_RU.CP1251
822  koi8-u/Compose:                        ru_UA.KOI8-U
823 +XCOMM microsoft-cp1251/Compose:        ru_UA.CP1251
824  iso8859-1/Compose:             rw_RW.ISO8859-1
825 -iso8859-2/Compose:             sh_YU.ISO8859-2
826  iso8859-2/Compose:             sk_SK.ISO8859-2
827  iso8859-2/Compose:             sl_CS.ISO8859-2
828  iso8859-2/Compose:             sl_SI.ISO8859-2
829 -iso8859-5/Compose:             sp_YU.ISO8859-5
830 +iso8859-16/Compose:            sl_SI.ISO8859-16
831 +iso8859-1/Compose:             so_DJ.ISO8859-1
832 +iso8859-1/Compose:             so_KE.ISO8859-1
833 +iso8859-1/Compose:             so_SO.ISO8859-1
834  iso8859-2/Compose:             sq_AL.ISO8859-2
835  iso8859-2/Compose:             sr_CS.ISO8859-2
836  iso8859-5/Compose:             sr_CS.ISO8859-5
837 -iso8859-2/Compose:             sr_SP.ISO8859-2
838 -iso8859-2/Compose:             sr_YU.ISO8859-2
839 -iso8859-5/Compose:             sr_YU.ISO8859-5
840 +XCOMM microsoft-cp1251/Compose:        sr_CS.CP1251
841 +iso8859-5/Compose:             sr_ME.ISO8859-5
842  iso8859-1/Compose:             ss_ZA.ISO8859-1
843  iso8859-1/Compose:             st_ZA.ISO8859-1
844  iso8859-1/Compose:             sv_FI.ISO8859-1
845 @@ -213,39 +239,52 @@
846  iso8859-1/Compose:             sv_SE.ISO8859-1
847  iso8859-15/Compose:            sv_SE.ISO8859-15
848  tscii-0/Compose:               ta_IN.TSCII-0
849 -koi8-c/Compose:                        tg_TJ.KOI8-C
850 +koi8-c/Compose:                        tg_TJ.KOI8-K
851 +XCOMM koi8-t/Compose:                  tg_TJ.KOI8-T
852  iso8859-1/Compose:             tl_PH.ISO8859-1
853 -iso8859-15/Compose:            tn_ZA.ISO8859-15
854 +iso8859-10/Compose:            tn_ZA.ISO8859-10
855 +iso8859-9/Compose:             tr_CY.ISO8859-9
856  iso8859-9/Compose:             tr_TR.ISO8859-9
857  iso8859-1/Compose:             ts_ZA.ISO8859-1
858  tatar-cyr/Compose:             tt_RU.TATAR-CYR
859 -koi8-c/Compose:                        tt_RU.KOI8-C
860 +koi8-c/Compose:                        tt_RU.KOI8-K
861  koi8-u/Compose:                        uk_UA.KOI8-U
862 -microsoft-cp1256/Compose:      ur_PK.CP1256
863 +iso8859-5/Compose:             uk_UA.ISO8859-5
864 +XCOMM microsoft-cp1251/Compose:        uk_UA.CP1251
865 +XCOMM microsoft-cp1256/Compose:        ur_PK.CP1256
866 +iso8859-1/Compose:             uz_UZ.ISO8859-1
867  vi_VN.viscii/Compose:          vi_VN.VISCII
868  vi_VN.tcvn/Compose:            vi_VN.TCVN
869  iso8859-1/Compose:             wa_BE.ISO8859-1
870 +iso8859-15/Compose:            wa_BE.ISO8859-15
871  iso8859-1/Compose:             xh_ZA.ISO8859-1
872 -microsoft-cp1255/Compose:      yi_US.CP1256
873 +XCOMM microsoft-cp1255/Compose:        yi_US.CP1256
874  zh_CN/Compose:                 zh_CN.eucCN
875 -zh_CN/Compose:                 zh_CN.GB2312
876 -zh_CN.gbk/Compose:             zh_CN.GBK
877 -zh_CN.gb18030/Compose:         zh_CN.GB18030
878 +zh_CN/Compose:                 zh_CN.gb2312
879 +zh_CN.gbk/Compose:             zh_CN.gbk
880 +zh_CN.gb18030/Compose:         zh_CN.gb18030
881 +zh_CN/Compose:                 zh_SG.gb2312
882  zh_HK.big5/Compose:            zh_HK.big5
883  zh_HK.big5/Compose:            zh_HK.Big5
884  zh_HK.big5hkscs/Compose:       zh_HK.big5hkscs
885  zh_HK.big5hkscs/Compose:       zh_HK.Big5HKSCS
886  zh_TW.big5/Compose:            zh_TW.big5
887 -zh_TW.big5/Compose:            zh_TW.Big5
888  zh_TW/Compose:                 zh_TW.eucTW
889  iso8859-1/Compose:             zu_ZA.ISO8859-1
890  XCOMM
891  XCOMM
892 +en_US.UTF-8/Compose:           aa_DJ.UTF-8
893 +en_US.UTF-8/Compose:           aa_ER.UTF-8
894 +en_US.UTF-8/Compose:           aa_ET.UTF-8
895  en_US.UTF-8/Compose:           af_ZA.UTF-8
896 +en_US.UTF-8/Compose:           am_ET.UTF-8
897 +en_US.UTF-8/Compose:           an_ES.UTF-8
898  en_US.UTF-8/Compose:           ar_AA.UTF-8
899 +en_US.UTF-8/Compose:           ar_AE.UTF-8
900  en_US.UTF-8/Compose:           ar_BH.UTF-8
901  en_US.UTF-8/Compose:           ar_DZ.UTF-8
902  en_US.UTF-8/Compose:           ar_EG.UTF-8
903 +en_US.UTF-8/Compose:           ar_IN.UTF-8
904  en_US.UTF-8/Compose:           ar_IQ.UTF-8
905  en_US.UTF-8/Compose:           ar_JO.UTF-8
906  en_US.UTF-8/Compose:           ar_KW.UTF-8
907 @@ -255,22 +294,25 @@
908  en_US.UTF-8/Compose:           ar_OM.UTF-8
909  en_US.UTF-8/Compose:           ar_QA.UTF-8
910  en_US.UTF-8/Compose:           ar_SA.UTF-8
911 +en_US.UTF-8/Compose:           ar_SD.UTF-8
912 +en_US.UTF-8/Compose:           ar_SY.UTF-8
913  en_US.UTF-8/Compose:           ar_TN.UTF-8
914  en_US.UTF-8/Compose:           ar_YE.UTF-8
915 -en_US.UTF-8/Compose:           bs_BA.UTF-8
916  en_US.UTF-8/Compose:           az_AZ.UTF-8
917 -en_US.UTF-8/Compose:           a3_AZ.UTF-8
918  en_US.UTF-8/Compose:           be_BY.UTF-8
919  en_US.UTF-8/Compose:           bg_BG.UTF-8
920 +en_US.UTF-8/Compose:           bn_BD.UTF-8
921  en_US.UTF-8/Compose:           bn_IN.UTF-8
922  en_US.UTF-8/Compose:           br_FR.UTF-8
923 +en_US.UTF-8/Compose:           bs_BA.UTF-8
924 +en_US.UTF-8/Compose:           byn_ER.UTF-8
925  en_US.UTF-8/Compose:           ca_AD.UTF-8
926  en_US.UTF-8/Compose:           ca_ES.UTF-8
927  en_US.UTF-8/Compose:           ca_FR.UTF-8
928  en_US.UTF-8/Compose:           ca_IT.UTF-8
929  en_US.UTF-8/Compose:           cs_CZ.UTF-8
930 +en_US.UTF-8/Compose:           csb_PL.UTF-8
931  en_US.UTF-8/Compose:           cy_GB.UTF-8
932 -en_US.UTF-8/Compose:           cz_CZ.UTF-8
933  en_US.UTF-8/Compose:           da_DK.UTF-8
934  en_US.UTF-8/Compose:           de_AT.UTF-8
935  en_US.UTF-8/Compose:           de_BE.UTF-8
936 @@ -278,18 +320,26 @@
937  en_US.UTF-8/Compose:           de_DE.UTF-8
938  en_US.UTF-8/Compose:           de_LI.UTF-8
939  en_US.UTF-8/Compose:           de_LU.UTF-8
940 +el_GR.UTF-8/Compose:           el_CY.UTF-8
941  el_GR.UTF-8/Compose:           el_GR.UTF-8
942  en_US.UTF-8/Compose:           en_AU.UTF-8
943 +en_US.UTF-8/Compose:           en_BE.UTF-8
944 +en_US.UTF-8/Compose:           en_BW.UTF-8
945  en_US.UTF-8/Compose:           en_BZ.UTF-8
946  en_US.UTF-8/Compose:           en_CA.UTF-8
947 +en_US.UTF-8/Compose:           en_DK.UTF-8
948  en_US.UTF-8/Compose:           en_GB.UTF-8
949 +en_US.UTF-8/Compose:           en_HK.UTF-8
950  en_US.UTF-8/Compose:           en_IE.UTF-8
951 +en_US.UTF-8/Compose:           en_IN.UTF-8
952  en_US.UTF-8/Compose:           en_JM.UTF-8
953  en_US.UTF-8/Compose:           en_NZ.UTF-8
954 +en_US.UTF-8/Compose:           en_PH.UTF-8
955 +en_US.UTF-8/Compose:           en_SG.UTF-8
956  en_US.UTF-8/Compose:           en_TT.UTF-8
957 -en_US.UTF-8/Compose:           en_UK.UTF-8
958  en_US.UTF-8/Compose:           en_US.UTF-8
959  en_US.UTF-8/Compose:           en_ZA.UTF-8
960 +en_US.UTF-8/Compose:           en_ZW.UTF-8
961  en_US.UTF-8/Compose:           eo_XX.UTF-8
962  en_US.UTF-8/Compose:           es_AR.UTF-8
963  en_US.UTF-8/Compose:           es_BO.UTF-8
964 @@ -308,12 +358,14 @@
965  en_US.UTF-8/Compose:           es_PR.UTF-8
966  en_US.UTF-8/Compose:           es_PY.UTF-8
967  en_US.UTF-8/Compose:           es_SV.UTF-8
968 +en_US.UTF-8/Compose:           es_US.UTF-8
969  en_US.UTF-8/Compose:           es_UY.UTF-8
970  en_US.UTF-8/Compose:           es_VE.UTF-8
971  en_US.UTF-8/Compose:           et_EE.UTF-8
972  en_US.UTF-8/Compose:           eu_ES.UTF-8
973  en_US.UTF-8/Compose:           fa_IR.UTF-8
974  en_US.UTF-8/Compose:           fi_FI.UTF-8
975 +en_US.UTF-8/Compose:           fil_PH.UTF-8
976  en_US.UTF-8/Compose:           fo_FO.UTF-8
977  en_US.UTF-8/Compose:           fr_BE.UTF-8
978  en_US.UTF-8/Compose:           fr_CA.UTF-8
979 @@ -322,12 +374,14 @@
980  en_US.UTF-8/Compose:           fr_LU.UTF-8
981  en_US.UTF-8/Compose:           ga_IE.UTF-8
982  en_US.UTF-8/Compose:           gd_GB.UTF-8
983 +en_US.UTF-8/Compose:           gez_ER.UTF-8
984  en_US.UTF-8/Compose:           gl_ES.UTF-8
985  en_US.UTF-8/Compose:           gu_IN.UTF-8
986  en_US.UTF-8/Compose:           gv_GB.UTF-8
987  en_US.UTF-8/Compose:           he_IL.UTF-8
988  en_US.UTF-8/Compose:           hi_IN.UTF-8
989  en_US.UTF-8/Compose:           hr_HR.UTF-8
990 +en_US.UTF-8/Compose:           hsb_DE.UTF-8
991  en_US.UTF-8/Compose:           hu_HU.UTF-8
992  en_US.UTF-8/Compose:           hy_AM.UTF-8
993  en_US.UTF-8/Compose:           id_ID.UTF-8
994 @@ -337,51 +391,75 @@
995  en_US.UTF-8/Compose:           iu_CA.UTF-8
996  en_US.UTF-8/Compose:           ja_JP.UTF-8
997  en_US.UTF-8/Compose:           ka_GE.UTF-8
998 +en_US.UTF-8/Compose:           kk_KZ.UTF-8
999  en_US.UTF-8/Compose:           kl_GL.UTF-8
1000 +en_US.UTF-8/Compose:           kn_IN.UTF-8
1001  en_US.UTF-8/Compose:           ko_KR.UTF-8
1002  en_US.UTF-8/Compose:           kw_GB.UTF-8
1003  en_US.UTF-8/Compose:           ky_KG.UTF-8
1004 +en_US.UTF-8/Compose:           lg_UG.UTF-8
1005 +en_US.UTF-8/Compose:           li_BE.UTF-8
1006 +en_US.UTF-8/Compose:           li_NL.UTF-8
1007  en_US.UTF-8/Compose:           lo_LA.UTF-8
1008  en_US.UTF-8/Compose:           lt_LT.UTF-8
1009  en_US.UTF-8/Compose:           lv_LV.UTF-8
1010  en_US.UTF-8/Compose:           mi_NZ.UTF-8
1011  en_US.UTF-8/Compose:           mk_MK.UTF-8
1012 +en_US.UTF-8/Compose:           ml_IN.UTF-8
1013 +en_US.UTF-8/Compose:           mn_MN.UTF-8
1014 +en_US.UTF-8/Compose:           mr_IN.UTF-8
1015  en_US.UTF-8/Compose:           ms_MY.UTF-8
1016 +en_US.UTF-8/Compose:           mt_MT.UTF-8
1017 +en_US.UTF-8/Compose:           nb_NO.UTF-8
1018 +en_US.UTF-8/Compose:           nds_DE.UTF-8
1019 +en_US.UTF-8/Compose:           ne_NP.UTF-8
1020  en_US.UTF-8/Compose:           nl_BE.UTF-8
1021  en_US.UTF-8/Compose:           nl_NL.UTF-8
1022 -en_US.UTF-8/Compose:           no_NO.UTF-8
1023 -en_US.UTF-8/Compose:           nb_NO.UTF-8
1024 +en_US.UTF-8/Compose:           nn_NO.UTF-8
1025  en_US.UTF-8/Compose:           nr_ZA.UTF-8
1026  en_US.UTF-8/Compose:           nso_ZA.UTF-8
1027 -en_US.UTF-8/Compose:           ny_NO.UTF-8
1028  en_US.UTF-8/Compose:           oc_FR.UTF-8
1029 +en_US.UTF-8/Compose:           om_ET.UTF-8
1030 +en_US.UTF-8/Compose:           om_KE.UTF-8
1031 +en_US.UTF-8/Compose:           or_IN.UTF-8
1032  en_US.UTF-8/Compose:           pa_IN.UTF-8
1033 +en_US.UTF-8/Compose:           pap_AN.UTF-8
1034  en_US.UTF-8/Compose:           pd_DE.UTF-8
1035  en_US.UTF-8/Compose:           pd_US.UTF-8
1036 -en_US.UTF-8/Compose:           ph_PH.UTF-8
1037  en_US.UTF-8/Compose:           pl_PL.UTF-8
1038 -en_US.UTF-8/Compose:           pp_AN.UTF-8
1039  pt_BR.UTF-8/Compose:           pt_BR.UTF-8
1040  en_US.UTF-8/Compose:           pt_PT.UTF-8
1041  en_US.UTF-8/Compose:           ro_RO.UTF-8
1042  en_US.UTF-8/Compose:           ru_RU.UTF-8
1043  en_US.UTF-8/Compose:           ru_UA.UTF-8
1044  en_US.UTF-8/Compose:           rw_RW.UTF-8
1045 +en_US.UTF-8/Compose:           se_NO.UTF-8
1046  en_US.UTF-8/Compose:           si_LK.UTF-8
1047 +en_US.UTF-8/Compose:           sid_ET.UTF-8
1048  en_US.UTF-8/Compose:           sk_SK.UTF-8
1049  en_US.UTF-8/Compose:           sl_SI.UTF-8
1050 +en_US.UTF-8/Compose:           so_DJ.UTF-8
1051 +en_US.UTF-8/Compose:           so_ET.UTF-8
1052 +en_US.UTF-8/Compose:           so_KE.UTF-8
1053 +en_US.UTF-8/Compose:           so_SO.UTF-8
1054  en_US.UTF-8/Compose:           sq_AL.UTF-8
1055  en_US.UTF-8/Compose:           sr_CS.UTF-8
1056 -en_US.UTF-8/Compose:           sr_YU.UTF-8
1057 +en_US.UTF-8/Compose:           sr_ME.UTF-8
1058  en_US.UTF-8/Compose:           ss_ZA.UTF-8
1059  en_US.UTF-8/Compose:           st_ZA.UTF-8
1060  en_US.UTF-8/Compose:           sv_FI.UTF-8
1061  en_US.UTF-8/Compose:           sv_SE.UTF-8
1062  en_US.UTF-8/Compose:           ta_IN.UTF-8
1063 +en_US.UTF-8/Compose:           te_IN.UTF-8
1064  en_US.UTF-8/Compose:           tg_TJ.UTF-8
1065  en_US.UTF-8/Compose:           th_TH.UTF-8
1066 +en_US.UTF-8/Compose:           ti_ER.UTF-8
1067 +en_US.UTF-8/Compose:           ti_ET.UTF-8
1068 +en_US.UTF-8/Compose:           tig_ER.UTF-8
1069 +en_US.UTF-8/Compose:           tk_TM.UTF-8
1070  en_US.UTF-8/Compose:           tl_PH.UTF-8
1071  en_US.UTF-8/Compose:           tn_ZA.UTF-8
1072 +en_US.UTF-8/Compose:           tr_CY.UTF-8
1073  en_US.UTF-8/Compose:           tr_TR.UTF-8
1074  en_US.UTF-8/Compose:           ts_ZA.UTF-8
1075  en_US.UTF-8/Compose:           tt_RU.UTF-8
1076 @@ -391,8 +469,7 @@
1077  en_US.UTF-8/Compose:           ve_ZA.UTF-8
1078  en_US.UTF-8/Compose:           vi_VN.UTF-8
1079  en_US.UTF-8/Compose:           wa_BE.UTF-8
1080 -en_US.UTF-8/Compose:           yi_US.UTF-8
1081  en_US.UTF-8/Compose:           xh_ZA.UTF-8
1082 +en_US.UTF-8/Compose:           yi_US.UTF-8
1083  en_US.UTF-8/Compose:           zh_TW.UTF-8
1084  en_US.UTF-8/Compose:           zu_ZA.UTF-8
1085 -en_US.UTF-8/Compose:           bs_BA.UTF-8
1086 --- libX11-1.1.4/nls/locale.alias.pre.orig      2008-03-06 21:45:06.000000000 +0100
1087 +++ libX11-1.1.4/nls/locale.alias.pre   2008-03-07 23:24:28.773527964 +0100
1088 @@ -17,17 +17,34 @@
1089  Cextend:                                       en_US.ISO8859-1
1090  Cextend.en:                                    en_US.ISO8859-1
1091  English_United-States.437:                     C
1092 +aa_DJ:                                         aa_DJ.ISO8859-1
1093 +aa_DJ.iso88591:                                        aa_DJ.ISO8859-1
1094 +aa_DJ.ISO-8859-1:                              aa_DJ.ISO8859-1
1095 +aa_DJ.ISO_8859-1:                              aa_DJ.ISO8859-1
1096 +aa_DJ.utf8:                                    aa_DJ.UTF-8
1097 +aa_ER:                                         aa_ER.UTF-8
1098 +aa_ER.utf8:                                    aa_ER.UTF-8
1099 +aa_ER@saaho:                                   aa_ER.UTF-8
1100 +aa_ER.utf8@saaho:                              aa_ER.UTF-8
1101 +aa_ET:                                         aa_ET.UTF-8
1102 +aa_ET.utf8:                                    aa_ET.UTF-8
1103  XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
1104 -a3:                                            a3_AZ.KOI8-C
1105 -a3_AZ:                                         a3_AZ.KOI8-C
1106 -a3_AZ.koi8c:                                   a3_AZ.KOI8-C
1107 +a3:                                            a3_AZ.KOI8-K
1108 +a3_AZ:                                         a3_AZ.KOI8-K
1109 +a3_AZ.koi8c:                                   a3_AZ.KOI8-K
1110  af:                                            af_ZA.ISO8859-1
1111  af_ZA:                                         af_ZA.ISO8859-1
1112  af_ZA.iso88591:                                        af_ZA.ISO8859-1
1113  af_ZA.ISO-8859-1:                              af_ZA.ISO8859-1
1114 -af_ZA.utf8:                            af_ZA.UTF-8
1115 +af_ZA.ISO_8859-1:                              af_ZA.ISO8859-1
1116  am:                                            am_ET.UTF-8
1117  am_ET:                                         am_ET.UTF-8
1118 +am_ET.utf8:                                    am_ET.UTF-8
1119 +an_ES:                                         an_ES.ISO8859-15
1120 +an_ES.iso885915:                               an_ES.ISO8859-15
1121 +an_ES.ISO-8859-15:                             an_ES.ISO8859-15
1122 +an_ES.ISO_8859-15:                             an_ES.ISO8859-15
1123 +an_ES.utf8:                                    an_ES.UTF-8
1124  ar:                                            ar_AA.ISO8859-6
1125  ar_AA:                                         ar_AA.ISO8859-6
1126  AR_AA:                                         ar_AA.ISO8859-6
1127 @@ -38,78 +55,101 @@
1128  ar_AE:                                         ar_AE.ISO8859-6
1129  ar_AE.iso88596:                                        ar_AE.ISO8859-6
1130  ar_AE.ISO-8859-6:                              ar_AE.ISO8859-6
1131 +ar_AE.ISO_8859-6:                              ar_AE.ISO8859-6
1132  ar_AE.utf8:                                    ar_AE.UTF-8
1133  ar_BH:                                         ar_BH.ISO8859-6
1134  ar_BH.iso88596:                                        ar_BH.ISO8859-6
1135  ar_BH.ISO-8859-6:                              ar_BH.ISO8859-6
1136 +ar_BH.ISO_8859-6:                              ar_BH.ISO8859-6
1137  ar_BH.utf8:                                    ar_BH.UTF-8
1138  ar_DZ:                                         ar_DZ.ISO8859-6
1139  ar_DZ.iso88596:                                        ar_DZ.ISO8859-6
1140  ar_DZ.ISO-8859-6:                              ar_DZ.ISO8859-6
1141 +ar_DZ.ISO_8859-6:                              ar_DZ.ISO8859-6
1142  ar_DZ.utf8:                                    ar_DZ.UTF-8
1143  ar_EG:                                         ar_EG.ISO8859-6
1144  ar_EG.iso88596:                                        ar_EG.ISO8859-6
1145  ar_EG.ISO-8859-6:                              ar_EG.ISO8859-6
1146 +ar_EG.ISO_8859-6:                              ar_EG.ISO8859-6
1147  ar_EG.utf8:                                    ar_EG.UTF-8
1148 +ar_IN:                                         ar_IN.UTF-8
1149 +ar_IN.utf8:                                    ar_IN.UTF-8
1150  ar_IQ:                                         ar_IQ.ISO8859-6
1151  ar_IQ.iso88596:                                        ar_IQ.ISO8859-6
1152  ar_IQ.ISO-8859-6:                              ar_IQ.ISO8859-6
1153 +ar_IQ.ISO_8859-6:                              ar_IQ.ISO8859-6
1154  ar_IQ.utf8:                                    ar_IQ.UTF-8
1155  ar_JO:                                         ar_JO.ISO8859-6
1156  ar_JO.iso88596:                                        ar_JO.ISO8859-6
1157  ar_JO.ISO-8859-6:                              ar_JO.ISO8859-6
1158 +ar_JO.ISO_8859-6:                              ar_JO.ISO8859-6
1159  ar_JO.utf8:                                    ar_JO.UTF-8
1160  ar_KW:                                         ar_KW.ISO8859-6
1161  ar_KW.iso88596:                                        ar_KW.ISO8859-6
1162 -ar_KW.iso88596:                                        ar_KW.ISO8859-6
1163  ar_KW.ISO-8859-6:                              ar_KW.ISO8859-6
1164 +ar_KW.ISO_8859-6:                              ar_KW.ISO8859-6
1165  ar_KW.utf8:                                    ar_KW.UTF-8
1166  ar_LB:                                         ar_LB.ISO8859-6
1167  ar_LB.iso88596:                                        ar_LB.ISO8859-6
1168  ar_LB.ISO-8859-6:                              ar_LB.ISO8859-6
1169 +ar_LB.ISO_8859-6:                              ar_LB.ISO8859-6
1170  ar_LB.utf8:                                    ar_LB.UTF-8
1171  ar_LY:                                         ar_LY.ISO8859-6
1172  ar_LY.iso88596:                                        ar_LY.ISO8859-6
1173  ar_LY.ISO-8859-6:                              ar_LY.ISO8859-6
1174 +ar_LY.ISO_8859-6:                              ar_LY.ISO8859-6
1175  ar_LY.utf8:                                    ar_LY.UTF-8
1176  ar_MA:                                         ar_MA.ISO8859-6
1177  ar_MA.iso88596:                                        ar_MA.ISO8859-6
1178  ar_MA.ISO-8859-6:                              ar_MA.ISO8859-6
1179 +ar_MA.ISO_8859-6:                              ar_MA.ISO8859-6
1180  ar_MA.utf8:                                    ar_MA.UTF-8
1181  ar_OM:                                         ar_OM.ISO8859-6
1182  ar_OM.iso88596:                                        ar_OM.ISO8859-6
1183  ar_OM.ISO-8859-6:                              ar_OM.ISO8859-6
1184 +ar_OM.ISO_8859-6:                              ar_OM.ISO8859-6
1185  ar_OM.utf8:                                    ar_OM.UTF-8
1186  ar_QA:                                         ar_QA.ISO8859-6
1187  ar_QA.iso88596:                                        ar_QA.ISO8859-6
1188  ar_QA.ISO-8859-6:                              ar_QA.ISO8859-6
1189 +ar_QA.ISO_8859-6:                              ar_QA.ISO8859-6
1190  ar_QA.utf8:                                    ar_QA.UTF-8
1191  ar_SA:                                         ar_SA.ISO8859-6
1192  ar_SA.iso88596:                                        ar_SA.ISO8859-6
1193  ar_SA.ISO-8859-6:                              ar_SA.ISO8859-6
1194 +ar_SA.ISO_8859-6:                              ar_SA.ISO8859-6
1195  ar_SA.utf8:                                    ar_SA.UTF-8
1196  ar_SD:                                         ar_SD.ISO8859-6
1197  ar_SD.iso88596:                                        ar_SD.ISO8859-6
1198  ar_SD.ISO-8859-6:                              ar_SD.ISO8859-6
1199 +ar_SD.ISO_8859-6:                              ar_SD.ISO8859-6
1200  ar_SD.utf8:                                    ar_SD.UTF-8
1201  ar_SY:                                         ar_SY.ISO8859-6
1202  ar_SY.iso88596:                                        ar_SY.ISO8859-6
1203  ar_SY.ISO-8859-6:                              ar_SY.ISO8859-6
1204 +ar_SY.ISO_8859-6:                              ar_SY.ISO8859-6
1205  ar_SY.utf8:                                    ar_SY.UTF-8
1206  ar_TN:                                         ar_TN.ISO8859-6
1207  ar_TN.iso88596:                                        ar_TN.ISO8859-6
1208  ar_TN.ISO-8859-6:                              ar_TN.ISO8859-6
1209 +ar_TN.ISO_8859-6:                              ar_TN.ISO8859-6
1210  ar_TN.utf8:                                    ar_TN.UTF-8
1211 -as:                                            as_IN.UTF-8
1212 -as_IN.utf8:                                    as_IN.UTF-8
1213 -as_IN.UTF-8:                                   as_IN.UTF-8
1214  ar_YE:                                         ar_YE.ISO8859-6
1215  ar_YE.iso88596:                                        ar_YE.ISO8859-6
1216  ar_YE.ISO-8859-6:                              ar_YE.ISO8859-6
1217 +ar_YE.ISO_8859-6:                              ar_YE.ISO8859-6
1218  ar_YE.utf8:                                    ar_YE.UTF-8
1219 -az:                                            az_AZ.ISO8859-9E
1220 -az_AZ:                                         az_AZ.ISO8859-9E
1221 +as:                                            as_IN.UTF-8
1222 +as_IN.utf8:                                    as_IN.UTF-8
1223 +as_IN.UTF-8:                                   as_IN.UTF-8
1224 +az:                                            az_AZ.UTF-8
1225 +az_AZ:                                         az_AZ.UTF-8
1226  az_AZ.iso88599e:                               az_AZ.ISO8859-9E
1227 +az_AZ.utf8:                                    az_AZ.UTF-8
1228 +az_AZ.utf8@cyrillic:                           az_AZ.UTF-8
1229 +az_AZ.koi8k:                                   az_AZ.KOI8-K
1230 +az_AZ@cyrillic:                                        az_AZ.KOI8-K
1231 +az_AZ.koi8k@cyrillic:                          az_AZ.KOI8-K
1232  be:                                            be_BY.CP1251
1233  be_BY:                                         be_BY.CP1251
1234  be_BY.cp1251:                                  be_BY.CP1251
1235 @@ -123,28 +163,36 @@
1236  bg_BG.microsoftcp1251:                         bg_BG.CP1251
1237  bg_BG.microsoft-cp1251:                                bg_BG.CP1251
1238  bg_BG.MICROSOFT-CP1251:                                bg_BG.CP1251
1239 -bg_BG.iso88595:                                        bg_BG.ISO8859-5
1240 -bg_BG.ISO-8859-5:                              bg_BG.ISO8859-5
1241  bg_BG.koi8r:                                   bg_BG.KOI8-R
1242  be_BG.utf8:                                    bg_BG.UTF-8
1243 +bn:                                            bn_BD.UTF-8
1244 +bn_BD:                                         bn_BD.UTF-8
1245 +bn_BD.utf8:                                    bn_BD.UTF-8
1246 +bn_IN:                                         bn_IN.UTF-8
1247  bn_IN.utf8:                                    bn_IN.UTF-8
1248 -bn_IN.UTF-8:                                   bn_IN.UTF-8
1249  br:                                            br_FR.ISO8859-1
1250  br_FR:                                         br_FR.ISO8859-1
1251  br_FR.iso88591:                                        br_FR.ISO8859-1
1252  br_FR.ISO-8859-1:                              br_FR.ISO8859-1
1253 +br_FR.ISO_8859-1:                              br_FR.ISO8859-1
1254  br_FR.iso885914:                               br_FR.ISO8859-14
1255  br_FR.ISO-8859-14:                             br_FR.ISO8859-14
1256 +br_FR.ISO_8859-14:                             br_FR.ISO8859-14
1257  br_FR.iso885915:                               br_FR.ISO8859-15
1258 +br_FR.iso885915@euro:                          br_FR.ISO8859-15
1259  br_FR.ISO-8859-15:                             br_FR.ISO8859-15
1260 +br_FR.ISO_8859-15:                             br_FR.ISO8859-15
1261  br_FR.ISO-8859-15@euro:                                br_FR.ISO8859-15
1262 +br_FR.ISO_8859-15@euro:                                br_FR.ISO8859-15
1263  br_FR@euro:                                    br_FR.ISO8859-15
1264 +br_FR.utf8:                                    br_FR.UTF-8
1265  br_FR.UTF-8@euro:                              br_FR.UTF-8
1266  bs:                                            bs_BA.ISO8859-2
1267  bs_BA:                                         bs_BA.ISO8859-2
1268  bs_BA.iso88592:                                        bs_BA.ISO8859-2
1269  bs_BA.ISO-8859-2:                              bs_BA.ISO8859-2
1270  bs_BA.ISO_8859-2:                              bs_BA.ISO8859-2
1271 +bs_BA.utf8:                                    bs_BA.UTF-8
1272  ca:                                            ca_ES.ISO8859-1
1273  ca_AD:                                         ca_AD.ISO8859-1
1274  ca_AD@euro:                                    ca_AD.ISO8859-15
1275 @@ -159,11 +207,15 @@
1276  ca_ES@euro:                                    ca_ES.ISO8859-15
1277  ca_ES.iso88591:                                        ca_ES.ISO8859-1
1278  ca_ES.ISO-8859-1:                              ca_ES.ISO8859-1
1279 +ca_ES.ISO_8859-1:                              ca_ES.ISO8859-1
1280  ca_ES.iso885915:                               ca_ES.ISO8859-15
1281 -ca_ES.utf8:                                    ca_ES.UTF-8
1282 +ca_ES.iso885915@euro:                          ca_ES.ISO8859-15
1283  ca_ES.ISO-8859-15:                             ca_ES.ISO8859-15
1284 +ca_ES.ISO_8859-15:                             ca_ES.ISO8859-15
1285  ca_ES.ISO-8859-15@euro:                                ca_ES.ISO8859-15
1286 +ca_ES.ISO_8859-15@euro:                                ca_ES.ISO8859-15
1287  ca_ES.UTF-8@euro:                              ca_ES.UTF-8
1288 +ca_ES.utf8:                                    ca_ES.UTF-8
1289  ca_FR:                                         ca_FR.ISO8859-1
1290  ca_FR@euro:                                    ca_FR.ISO8859-15
1291  ca_FR.iso88591:                                        ca_FR.ISO8859-1
1292 @@ -191,19 +243,26 @@
1293  cs_CZ.ISO-8859-2:                              cs_CZ.ISO8859-2
1294  cs_CZ.ISO_8859-2:                              cs_CZ.ISO8859-2
1295  cs_CZ.utf8:                                    cs_CZ.UTF-8
1296 -XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
1297 -cz:                                            cs_CZ.ISO8859-2
1298 -cz_CZ:                                         cs_CZ.ISO8859-2
1299 -cz_CZ.utf8:                                    cs_CZ.UTF-8
1300 -cz_CZ.UTF-8:                                   cs_CZ.UTF-8
1301 -cy:                                            cy_GB.ISO8859-1
1302 -cy_GB:                                         cy_GB.ISO8859-1
1303 +csb:                                           csb_PL.UTF-8
1304 +csb_PL:                                                csb_PL.UTF-8
1305 +csb_PL.utf8:                                   csb_PL.UTF-8
1306 +cy:                                            cy_GB.ISO8859-14
1307 +cy_GB:                                         cy_GB.ISO8859-14
1308  cy_GB.iso88591:                                        cy_GB.ISO8859-1
1309  cy_GB.ISO-8859-1:                              cy_GB.ISO8859-1
1310 +cy_GB.ISO_8859-1:                              cy_GB.ISO8859-1
1311  cy_GB.iso885914:                               cy_GB.ISO8859-14
1312  cy_GB.ISO-8859-14:                             cy_GB.ISO8859-14
1313 +cy_GB.ISO_8859-14:                             cy_GB.ISO8859-14
1314  cy_GB.iso885915:                               cy_GB.ISO8859-15
1315  cy_GB.ISO-8859-15:                             cy_GB.ISO8859-15
1316 +cy_GB.ISO_8859-15:                             cy_GB.ISO8859-15
1317 +cy_GB.utf8:                                    cy_GB.UTF-8
1318 +XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
1319 +cz:                                            cs_CZ.ISO8859-2
1320 +cz_CZ:                                         cs_CZ.ISO8859-2
1321 +cz_CZ.utf8:                                    cs_CZ.UTF-8
1322 +cz_CZ.UTF-8:                                   cs_CZ.UTF-8
1323  da:                                            da_DK.ISO8859-1
1324  da_DK:                                         da_DK.ISO8859-1
1325  DA_DK:                                         da_DK.ISO8859-1
1326 @@ -225,18 +284,23 @@
1327  de_AT.ISO_8859-1:                              de_AT.ISO8859-1
1328  de_AT.iso885915:                               de_AT.ISO8859-15
1329  de_AT.ISO-8859-15:                             de_AT.ISO8859-15
1330 +de_AT.iso885915@euro:                          de_AT.ISO8859-15
1331  de_AT.ISO-8859-15@euro:                                de_AT.ISO8859-15
1332 +de_AT.ISO_8859-15@euro:                                de_AT.ISO8859-15
1333  de_AT.UTF-8@euro:                              de_AT.UTF-8
1334  de_AT.utf8:                                    de_AT.UTF-8
1335  de_BE:                                         de_BE.ISO8859-1
1336 +de_BE.iso885915@euro:                          de_BE.ISO8859-15
1337 +de_BE.ISO_8859-15@euro:                                de_BE.ISO8859-15
1338 +de_BE.ISO-8859-15@euro:                                de_BE.ISO8859-15
1339  de_BE@euro:                                    de_BE.ISO8859-15
1340 +de_BE.utf8:                                    de_BE.UTF-8
1341  de_BE.iso88591:                                        de_BE.ISO8859-1
1342  de_BE.ISO_8859-1:                              de_BE.ISO8859-1
1343  de_BE.ISO-8859-1:                              de_BE.ISO8859-1
1344  de_BE.iso885915:                               de_BE.ISO8859-15
1345  de_BE.ISO_8859-15:                             de_BE.ISO8859-15
1346  de_BE.ISO-8859-15:                             de_BE.ISO8859-15
1347 -de_BE.ISO-8859-15@euro:                                de_BE.ISO8859-15
1348  de_BE.UTF-8@euro:                              de_BE.UTF-8
1349  de_CH:                                         de_CH.ISO8859-1
1350  de_CH.iso88591:                                        de_CH.ISO8859-1
1351 @@ -258,7 +322,9 @@
1352  de_DE.ISO_8859-15:                             de_DE.ISO8859-15
1353  de_DE.8859-15:                                 de_DE.ISO8859-15
1354  de_DE.8859-15@euro:                            de_DE.ISO8859-15
1355 +de_DE.iso885915@euro:                          de_DE.ISO8859-15
1356  de_DE.ISO-8859-15@euro:                                de_DE.ISO8859-15
1357 +de_DE.ISO_8859-15@euro:                                de_DE.ISO8859-15
1358  de_DE.UTF-8@euro:                              de_DE.UTF-8
1359  de_DE.utf8:                                    de_DE.UTF-8
1360  de_LU:                                         de_LU.ISO8859-1
1361 @@ -266,22 +332,31 @@
1362  de_LU.iso88591:                                        de_LU.ISO8859-1
1363  de_LU.ISO_8859-1:                              de_LU.ISO8859-1
1364  de_LU.ISO-8859-1:                              de_LU.ISO8859-1
1365 +de_LU.iso885915@euro:                          de_LU.ISO8859-15
1366 +de_LU.ISO_8859-15@euro:                                de_LU.ISO8859-15
1367 +de_LU.ISO-8859-15@euro:                                de_LU.ISO8859-15
1368  de_LU.iso885915:                               de_LU.ISO8859-15
1369  de_LU.ISO_8859-15:                             de_LU.ISO8859-15
1370  de_LU.ISO-8859-15:                             de_LU.ISO8859-15
1371 -de_LU.ISO-8859-15@euro:                                de_LU.ISO8859-15
1372  de_LU.UTF-8@euro:                              de_LU.UTF-8
1373  de_LU.utf8:                                    de_LU.UTF-8
1374  GER_DE.8859:                                   de_DE.ISO8859-1
1375  GER_DE.8859.in:                                        de_DE.ISO8859-1
1376 -ee:                                            ee_EE.ISO8859-4
1377 -ee_EE:                                         ee_EE.ISO8859-4
1378 -ee_EE.iso88594:                                        ee_EE.ISO8859-4
1379 +XCOMM ee* are bogus
1380 +ee:                                            et_EE.ISO8859-4
1381 +ee_EE:                                         et_EE.ISO8859-4
1382 +ee_EE.iso88594:                                        et_EE.ISO8859-4
1383  el:                                            el_GR.ISO8859-7
1384 +el_CY:                                         el_CY.ISO8859-7
1385 +el_CY.iso88597:                                        el_CY.ISO8859-7
1386 +el_CY.ISO-8859-7:                              el_CY.ISO8859-7
1387 +el_CY.ISO_8859-7:                              el_CY.ISO8859-7
1388 +el_CY.utf8:                                    el_CY.UTF-8
1389  el_GR:                                         el_GR.ISO8859-7
1390  el_GR.iso88597:                                        el_GR.ISO8859-7
1391  el_GR.ISO-8859-7:                              el_GR.ISO8859-7
1392 -el_GR@euro:                                    el_GR.ISO8859-15
1393 +el_GR.ISO_8859-7:                              el_GR.ISO8859-7
1394 +el_GR@euro:                                    el_GR.UTF-8
1395  el_GR.utf8:                                    el_GR.UTF-8
1396  en:                                            en_US.ISO8859-1
1397  en.ISO-8859-1:                                 en_US.ISO8859-1
1398 @@ -296,11 +371,18 @@
1399  en_BW:                                         en_BW.ISO8859-1
1400  en_BW.iso88591:                                        en_BW.ISO8859-1
1401  en_BW.ISO-8859-1:                              en_BW.ISO8859-1
1402 +en_BW.ISO_8859-1:                              en_BW.ISO8859-1
1403 +en_BW.utf8:                                    en_BW.UTF-8
1404  en_CA:                                         en_CA.ISO8859-1
1405  en_CA.iso88591:                                        en_CA.ISO8859-1
1406  en_CA.ISO-8859-1:                              en_CA.ISO8859-1
1407  en_CA.ISO_8859-1:                              en_CA.ISO8859-1
1408  en_CA.utf8:                                    en_CA.UTF-8
1409 +en_DK:                                         en_DK.ISO8859-1
1410 +en_DK.iso88591:                                        en_DK.ISO8859-1
1411 +en_DK.ISO-8859-1:                              en_DK.ISO8859-1
1412 +en_DK.ISO_8859-1:                              en_DK.ISO8859-1
1413 +en_DK.utf8:                                    en_DK.UTF-8
1414  en_GB:                                         en_GB.ISO8859-1
1415  en_GB.88591:                                   en_GB.ISO8859-1
1416  en_GB.88591.en:                                        en_GB.ISO8859-1
1417 @@ -311,31 +393,45 @@
1418  en_GB.ISO-8859-15:                             en_GB.ISO8859-15
1419  en_GB.utf8:                                    en_GB.UTF-8
1420  en_UK:                                         en_GB.ISO8859-1
1421 +en_UK.ISO8859-1:                               en_GB.ISO8859-1
1422 +en_UK.UTF-8:                                   en_GB.UTF-8
1423  ENG_GB.8859:                                   en_GB.ISO8859-1
1424  ENG_GB.8859.in:                                        en_GB.ISO8859-1
1425  en_HK:                                         en_HK.ISO8859-1
1426  en_HK.iso88591:                                        en_HK.ISO8859-1
1427  en_HK.ISO-8859-1:                              en_HK.ISO8859-1
1428 +en_HK.ISO_8859-1:                              en_HK.ISO8859-1
1429 +en_HK.utf8:                                    en_HK.UTF-8
1430  en_IE:                                         en_IE.ISO8859-1
1431  en_IE.iso88591:                                        en_IE.ISO8859-1
1432  en_IE.ISO-8859-1:                              en_IE.ISO8859-1
1433 +en_IE.ISO_8859-1:                              en_IE.ISO8859-1
1434  en_IE.iso885915:                               en_IE.ISO8859-15
1435  en_IE.ISO-8859-15:                             en_IE.ISO8859-15
1436 +en_IE.ISO_8859-15:                             en_IE.ISO8859-15
1437 +en_IE.iso885915@euro:                          en_IE.ISO8859-15
1438  en_IE.ISO-8859-15@euro:                                en_IE.ISO8859-15
1439 +en_IE.ISO_8859-15@euro:                                en_IE.ISO8859-15
1440  en_IE@euro:                                    en_IE.ISO8859-15
1441  en_IE.UTF-8@euro:                              en_IE.UTF-8
1442  en_IE.utf8:                                    en_IE.UTF-8
1443  en_IN:                                         en_IN.ISO8859-1
1444 +en_IN.utf8:                                    en_IN.UTF-8
1445  en_NZ:                                         en_NZ.ISO8859-1
1446  en_NZ.iso88591:                                        en_NZ.ISO8859-1
1447  en_NZ.ISO-8859-1:                              en_NZ.ISO8859-1
1448 +en_NZ.ISO_8859-1:                              en_NZ.ISO8859-1
1449  en_NZ.utf8:                                    en_NZ.UTF-8
1450  en_PH:                                         en_PH.ISO8859-1
1451  en_PH.iso88591:                                        en_PH.ISO8859-1
1452  en_PH.ISO-8859-1:                              en_PH.ISO8859-1
1453 +en_PH.ISO_8859-1:                              en_PH.ISO8859-1
1454 +en_PH.utf8:                                    en_PH.UTF-8
1455  en_SG:                                         en_SG.ISO8859-1
1456  en_SG.iso88591:                                        en_SG.ISO8859-1
1457  en_SG.ISO-8859-1:                              en_SG.ISO8859-1
1458 +en_SG.ISO_8859-1:                              en_SG.ISO8859-1
1459 +en_SG.utf8:                                    en_SG.UTF-8
1460  en_US:                                         en_US.ISO8859-1
1461  EN_US:                                         en_US.ISO8859-1
1462  en_US.88591:                                   en_US.ISO8859-1
1463 @@ -349,15 +445,6 @@
1464  en_US.ISO8859-15@euro:                         en_US.ISO8859-15
1465  en_US.utf8:                                    en_US.UTF-8
1466  EN_US.UTF-8:                                   en_US.UTF-8
1467 -en_US.88591.en:                                        en_US.ISO8859-1
1468 -en_US.iso88591:                                        en_US.ISO8859-1
1469 -en_US.ISO-8859-1:                              en_US.ISO8859-1
1470 -en_US.ISO_8859-1:                              en_US.ISO8859-1
1471 -en_US.iso885915:                               en_US.ISO8859-15
1472 -en_US.8859-15:                                 en_US.ISO8859-15
1473 -en_US.ISO8859-15@euro:                         en_US.ISO8859-15
1474 -en_US.utf8:                                    en_US.UTF-8
1475 -EN_US.UTF-8:                                   en_US.UTF-8
1476  en_ZA:                                         en_ZA.ISO8859-1
1477  en_ZA.88591:                                   en_ZA.ISO8859-1
1478  en_ZA.88591.en:                                        en_ZA.ISO8859-1
1479 @@ -370,104 +457,128 @@
1480  en_ZW:                                         en_ZW.ISO8859-1
1481  en_ZW.iso88591:                                        en_ZW.ISO8859-1
1482  en_ZW.ISO-8859-1:                              en_ZW.ISO8859-1
1483 +en_ZW.ISO_8859-1:                              en_ZW.ISO8859-1
1484 +en_ZW.utf8:                                    en_ZW.UTF-8
1485  eo:                                            eo_XX.ISO8859-3
1486 -eo_EO:                                         eo_EO.ISO8859-3
1487 -eo_EO.ISO8859-3:                               eo_EO.ISO8859-3
1488 +eo_EO:                                         eo_XX.ISO8859-3
1489 +eo_EO.ISO8859-3:                               eo_XX.ISO8859-3
1490  eo_XX:                                         eo_XX.ISO8859-3
1491 -eo_XX.ISO8859-3:                               eo_XX.ISO8859-3
1492 +eo_XX.iso88593:                                        eo_XX.ISO8859-3
1493 +eo_XX.ISO-8859-3:                              eo_XX.ISO8859-3
1494 +eo_XX.ISO_8859-3:                              eo_XX.ISO8859-3
1495  es:                                            es_ES.ISO8859-1
1496  es_AR:                                         es_AR.ISO8859-1
1497  es_AR.iso88591:                                        es_AR.ISO8859-1
1498  es_AR.ISO-8859-1:                              es_AR.ISO8859-1
1499 +es_AR.ISO_8859-1:                              es_AR.ISO8859-1
1500  es_AR.utf8:                                    es_AR.UTF-8
1501  es_BO:                                         es_BO.ISO8859-1
1502 -es_BO.iso88591:                                        es_BO.ISO8859-1
1503  es_BO.ISO-8859-1:                              es_BO.ISO8859-1
1504 +es_BO.ISO_8859-1:                              es_BO.ISO8859-1
1505 +es_BO.iso88591:                                        es_BO.ISO8859-1
1506  es_BO.utf8:                                    es_BO.UTF-8
1507 +es_CL.ISO-8859-1:                              es_CL.ISO8859-1
1508 +es_CL.ISO_8859-1:                              es_CL.ISO8859-1
1509  es_CL:                                         es_CL.ISO8859-1
1510  es_CL.iso88591:                                        es_CL.ISO8859-1
1511 -es_CL.ISO-8859-1:                              es_CL.ISO8859-1
1512  es_CL.utf8:                                    es_CL.UTF-8
1513  es_CO:                                         es_CO.ISO8859-1
1514 -es_CO.iso88591:                                        es_CO.ISO8859-1
1515  es_CO.ISO-8859-1:                              es_CO.ISO8859-1
1516 +es_CO.ISO_8859-1:                              es_CO.ISO8859-1
1517 +es_CO.iso88591:                                        es_CO.ISO8859-1
1518  es_CO.utf8:                                    es_CO.UTF-8
1519  es_CR:                                         es_CR.ISO8859-1
1520 -es_CR.iso88591:                                        es_CR.ISO8859-1
1521  es_CR.ISO-8859-1:                              es_CR.ISO8859-1
1522 +es_CR.ISO_8859-1:                              es_CR.ISO8859-1
1523 +es_CR.iso88591:                                        es_CR.ISO8859-1
1524  es_CR.utf8:                                    es_CR.UTF-8
1525  es_DO:                                         es_DO.ISO8859-1
1526  es_DO.iso88591:                                        es_DO.ISO8859-1
1527  es_DO.ISO-8859-1:                              es_DO.ISO8859-1
1528 +es_DO.ISO_8859-1:                              es_DO.ISO8859-1
1529  es_DO.utf8:                                    es_DO.UTF-8
1530  es_EC:                                         es_EC.ISO8859-1
1531  es_EC.iso88591:                                        es_EC.ISO8859-1
1532  es_EC.ISO-8859-1:                              es_EC.ISO8859-1
1533 +es_EC.ISO_8859-1:                              es_EC.ISO8859-1
1534  es_EC.utf8:                                    es_EC.UTF-8
1535 -es_ES:                                         es_ES.ISO8859-1
1536 -es_ES.88591:                                   es_ES.ISO8859-1
1537 -es_ES.88591.en:                                        es_ES.ISO8859-1
1538  es_ES.iso88591:                                        es_ES.ISO8859-1
1539  es_ES.ISO-8859-1:                              es_ES.ISO8859-1
1540  es_ES.ISO_8859-1:                              es_ES.ISO8859-1
1541  es_ES.iso885915:                               es_ES.ISO8859-15
1542 +es_ES.iso885915@euro:                          es_ES.ISO8859-15
1543  es_ES.ISO-8859-15:                             es_ES.ISO8859-15
1544  es_ES.ISO-8859-15@euro:                                es_ES.ISO8859-15
1545 +es_ES.ISO_8859-15@euro:                                es_ES.ISO8859-15
1546  es_ES@euro:                                    es_ES.ISO8859-15
1547  es_ES.UTF-8@euro:                              es_ES.UTF-8
1548  es_ES.utf8:                                    es_ES.UTF-8
1549 -es_GT:                                         es_GT.ISO8859-1
1550 +es_ES:                                         es_ES.ISO8859-1
1551  es_GT.iso88591:                                        es_GT.ISO8859-1
1552  es_GT.ISO-8859-1:                              es_GT.ISO8859-1
1553 +es_GT.ISO_8859-1:                              es_GT.ISO8859-1
1554 +es_GT:                                         es_GT.ISO8859-1
1555  es_GT.utf8:                                    es_GT.UTF-8
1556 +es_HN.ISO-8859-1:                              es_HN.ISO8859-1
1557 +es_HN.ISO_8859-1:                              es_HN.ISO8859-1
1558  es_HN:                                         es_HN.ISO8859-1
1559  es_HN.iso88591:                                        es_HN.ISO8859-1
1560 -es_HN.ISO-8859-1:                              es_HN.ISO8859-1
1561  es_HN.utf8:                                    es_HN.UTF-8
1562 +es_MX.ISO-8859-1:                              es_MX.ISO8859-1
1563 +es_MX.ISO_8859-1:                              es_MX.ISO8859-1
1564  es_MX:                                         es_MX.ISO8859-1
1565  es_MX.iso88591:                                        es_MX.ISO8859-1
1566 -es_MX.ISO-8859-1:                              es_MX.ISO8859-1
1567  es_MX.utf8:                                    es_MX.UTF-8
1568  es_NI:                                         es_NI.ISO8859-1
1569  es_NI.iso88591:                                        es_NI.ISO8859-1
1570  es_NI.ISO-8859-1:                              es_NI.ISO8859-1
1571 +es_NI.ISO_8859-1:                              es_NI.ISO8859-1
1572  es_NI.utf8:                                    es_NI.UTF-8
1573  es_PA:                                         es_PA.ISO8859-1
1574  es_PA.iso88591:                                        es_PA.ISO8859-1
1575  es_PA.ISO-8859-1:                              es_PA.ISO8859-1
1576 -es_PA.iso885915:                               es_PA.ISO8859-15
1577 +es_PA.ISO_8859-1:                              es_PA.ISO8859-1
1578  es_PA.utf8:                                    es_PA.UTF-8
1579  es_PE:                                         es_PE.ISO8859-1
1580  es_PE.iso88591:                                        es_PE.ISO8859-1
1581  es_PE.ISO-8859-1:                              es_PE.ISO8859-1
1582 -es_PE.iso885915:                               es_PE.ISO8859-15
1583 +es_PE.ISO_8859-1:                              es_PE.ISO8859-1
1584  es_PE.utf8:                                    es_PE.UTF-8
1585  es_PR:                                         es_PR.ISO8859-1
1586  es_PR.iso88591:                                        es_PR.ISO8859-1
1587  es_PR.ISO-8859-1:                              es_PR.ISO8859-1
1588 +es_PR.ISO_8859-1:                              es_PR.ISO8859-1
1589  es_PR.utf8:                                    es_PR.UTF-8
1590  es_PY:                                         es_PY.ISO8859-1
1591  es_PY.iso88591:                                        es_PY.ISO8859-1
1592  es_PY.ISO-8859-1:                              es_PY.ISO8859-1
1593 -es_PY.iso885915:                               es_PY.ISO8859-15
1594 +es_PY.ISO_8859-1:                              es_PY.ISO8859-1
1595  es_PY.utf8:                                    es_PY.UTF-8
1596  es_SV:                                         es_SV.ISO8859-1
1597  es_SV.iso88591:                                        es_SV.ISO8859-1
1598  es_SV.ISO-8859-1:                              es_SV.ISO8859-1
1599 +es_SV.ISO_8859-1:                              es_SV.ISO8859-1
1600  es_SV.iso885915:                               es_SV.ISO8859-15
1601 +es_SV.ISO-8859-15:                             es_SV.ISO8859-15
1602 +es_SV.ISO_8859-15:                             es_SV.ISO8859-15
1603  es_SV.utf8:                                    es_SV.UTF-8
1604  es_US:                                         es_US.ISO8859-1
1605  es_US.iso88591:                                        es_US.ISO8859-1
1606  es_US.ISO-8859-1:                              es_US.ISO8859-1
1607 +es_US.ISO_8859-1:                              es_US.ISO8859-1
1608 +es_US.utf8:                                    es_US.UTF-8
1609  es_UY:                                         es_UY.ISO8859-1
1610  es_UY.iso88591:                                        es_UY.ISO8859-1
1611  es_UY.ISO-8859-1:                              es_UY.ISO8859-1
1612 +es_UY.ISO_8859-1:                              es_UY.ISO8859-1
1613  es_UY.iso885915:                               es_UY.ISO8859-15
1614 +es_UY.ISO-8859-15:                             es_UY.ISO8859-15
1615 +es_UY.ISO_8859-15:                             es_UY.ISO8859-15
1616  es_UY.utf8:                                    es_UY.UTF-8
1617  es_VE:                                         es_VE.ISO8859-1
1618  es_VE.iso88591:                                        es_VE.ISO8859-1
1619  es_VE.ISO-8859-1:                              es_VE.ISO8859-1
1620 -es_VE.iso885915:                               es_VE.ISO8859-15
1621 +es_VE.ISO_8859-1:                              es_VE.ISO8859-1
1622  es_VE.utf8:                                    es_VE.UTF-8
1623  #if defined(SVR4) && defined(sun)
1624  XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
1625 @@ -475,47 +586,64 @@
1626  #endif
1627  XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
1628  XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
1629 -et:                                            et_EE.ISO8859-15
1630 -et_EE:                                         et_EE.ISO8859-15
1631 +XCOMM However we use ISO8859-1 for backward compatibility.
1632 +et:                                            et_EE.ISO8859-1
1633 +et_EE:                                         et_EE.ISO8859-1
1634  et_EE.iso88591:                                        et_EE.ISO8859-1
1635  et_EE.ISO-8859-1:                              et_EE.ISO8859-1
1636 +et_EE.ISO_8859-1:                              et_EE.ISO8859-1
1637  et_EE.iso88594:                                        et_EE.ISO8859-4
1638  et_EE.ISO-8859-4:                              et_EE.ISO8859-4
1639  et_EE.iso885913:                               et_EE.ISO8859-13
1640 +et_EE.ISO-8859-15:                             et_EE.ISO8859-15
1641 +et_EE.ISO_8859-15:                             et_EE.ISO8859-15
1642  et_EE.ISO-8859-13:                             et_EE.ISO8859-13
1643  et_EE.iso885915:                               et_EE.ISO8859-15
1644 -et_EE.ISO-8859-15:                             et_EE.ISO8859-15
1645  et_EE.utf8:                                    et_EE.UTF-8
1646  eu:                                            eu_ES.ISO8859-1
1647  eu_ES:                                         eu_ES.ISO8859-1
1648  eu_ES.iso88591:                                        eu_ES.ISO8859-1
1649  eu_ES.ISO-8859-1:                              eu_ES.ISO8859-1
1650 +eu_ES.ISO_8859-1:                              eu_ES.ISO8859-1
1651  eu_ES.iso885915:                               eu_ES.ISO8859-15
1652  eu_ES.ISO-8859-15:                             eu_ES.ISO8859-15
1653 +eu_ES.ISO_8859-15:                             eu_ES.ISO8859-15
1654 +eu_ES.iso885915@euro:                          eu_ES.ISO8859-15
1655  eu_ES.ISO-8859-15@euro:                                eu_ES.ISO8859-15
1656 +eu_ES.ISO_8859-15@euro:                                eu_ES.ISO8859-15
1657  eu_ES@euro:                                    eu_ES.ISO8859-15
1658  eu_ES.UTF-8@euro:                              eu_ES.UTF-8
1659 +eu_ES.utf8:                                    eu_ES.UTF-8
1660  fa:                                            fa_IR.UTF-8
1661  fa_IR:                                         fa_IR.UTF-8
1662  fa_IR.isiri3342:                               fa_IR.ISIRI-3342
1663  fa_IR.utf8:                                    fa_IR.UTF-8
1664 -fi:                                            fi_FI.ISO8859-15
1665 -fi_FI:                                         fi_FI.ISO8859-15
1666 +fi:                                            fi_FI.ISO8859-1
1667 +fi_FI:                                         fi_FI.ISO8859-1
1668  fi_FI.88591:                                   fi_FI.ISO8859-1
1669  fi_FI.88591.en:                                        fi_FI.ISO8859-1
1670  fi_FI.iso88591:                                        fi_FI.ISO8859-1
1671  fi_FI.ISO-8859-1:                              fi_FI.ISO8859-1
1672  fi_FI.ISO_8859-1:                              fi_FI.ISO8859-1
1673  fi_FI.iso885915:                               fi_FI.ISO8859-15
1674 -fi_FI.ISO-8859-15:                             fi_FI.ISO8859-15
1675 +fi_FI.iso885915@euro:                          fi_FI.ISO8859-15
1676  fi_FI.ISO-8859-15@euro:                                fi_FI.ISO8859-15
1677 +fi_FI.ISO_8859-15@euro:                                fi_FI.ISO8859-15
1678 +fi_FI.ISO-8859-15:                             fi_FI.ISO8859-15
1679  fi_FI@euro:                                    fi_FI.ISO8859-15
1680  fi_FI.utf8:                                    fi_FI.UTF-8
1681  fi_FI.UTF-8@euro:                              fi_FI.UTF-8
1682 +fil:                                           fil_PH.ISO8859-1
1683 +fil_PH:                                                fil_PH.ISO8859-1
1684 +fil_PH.iso88591:                               fil_PH.ISO8859-1
1685 +fil_PH.ISO-8859-1:                             fil_PH.ISO8859-1
1686 +fil_PH.ISO_8859-1:                             fil_PH.ISO8859-1
1687 +fil_PH.utf8:                                   fil_PH.UTF-8
1688  fo:                                            fo_FO.ISO8859-1
1689  fo_FO:                                         fo_FO.ISO8859-1
1690  fo_FO.iso88591:                                        fo_FO.ISO8859-1
1691  fo_FO.ISO-8859-1:                              fo_FO.ISO8859-1
1692 +fo_FO.ISO_8859-1:                              fo_FO.ISO8859-1
1693  fo_FO.iso885915:                               fo_FO.ISO8859-15
1694  fo_FO.ISO-8859-15:                             fo_FO.ISO8859-15
1695  fo_FO.utf8:                                    fo_FO.UTF-8
1696 @@ -523,11 +651,15 @@
1697  fr_BE:                                         fr_BE.ISO8859-1
1698  fr_BE.88591:                                   fr_BE.ISO8859-1
1699  fr_BE.88591.en:                                        fr_BE.ISO8859-1
1700 +fr_BE.iso88591:                                        fr_BE.ISO8859-1
1701  fr_BE.ISO-8859-1:                              fr_BE.ISO8859-1
1702  fr_BE.ISO_8859-1:                              fr_BE.ISO8859-1
1703  fr_BE.iso885915:                               fr_BE.ISO8859-15
1704  fr_BE.ISO-8859-15:                             fr_BE.ISO8859-15
1705 +fr_BE.ISO_8859-15:                             fr_BE.ISO8859-15
1706 +fr_BE.iso885915@euro:                          fr_BE.ISO8859-15
1707  fr_BE.ISO-8859-15@euro:                                fr_BE.ISO8859-15
1708 +fr_BE.ISO_8859-15@euro:                                fr_BE.ISO8859-15
1709  fr_BE@euro:                                    fr_BE.ISO8859-15
1710  fr_BE.utf8:                                    fr_BE.UTF-8
1711  fr_BE.UTF-8@euro:                              fr_BE.UTF-8
1712 @@ -543,11 +675,15 @@
1713  fr_CH:                                         fr_CH.ISO8859-1
1714  fr_CH.88591:                                   fr_CH.ISO8859-1
1715  fr_CH.88591.en:                                        fr_CH.ISO8859-1
1716 +fr_CH.iso88591:                                        fr_CH.ISO8859-1
1717  fr_CH.ISO-8859-1:                              fr_CH.ISO8859-1
1718  fr_CH.ISO_8859-1:                              fr_CH.ISO8859-1
1719  fr_CH.iso885915:                               fr_CH.ISO8859-15
1720  fr_CH.ISO-8859-15:                             fr_CH.ISO8859-15
1721  fr_CH.utf8:                                    fr_CH.UTF-8
1722 +fr_FR.iso885915@euro:                          fr_FR.ISO8859-15
1723 +fr_FR.ISO-8859-15@euro:                                fr_FR.ISO8859-15
1724 +fr_FR.ISO_8859-15@euro:                                fr_FR.ISO8859-15
1725  fr_FR:                                         fr_FR.ISO8859-1
1726  fr_FR.88591:                                   fr_FR.ISO8859-1
1727  fr_FR.88591.en:                                        fr_FR.ISO8859-1
1728 @@ -556,10 +692,12 @@
1729  fr_FR.ISO_8859-1:                              fr_FR.ISO8859-1
1730  fr_FR.iso885915:                               fr_FR.ISO8859-15
1731  fr_FR.ISO-8859-15:                             fr_FR.ISO8859-15
1732 -fr_FR.ISO-8859-15@euro:                                fr_FR.ISO8859-15
1733  fr_FR@euro:                                    fr_FR.ISO8859-15
1734  fr_FR.UTF-8@euro:                              fr_FR.UTF-8
1735  fr_FR.utf8:                                    fr_FR.UTF-8
1736 +fr_LU.iso885915@euro:                          fr_LU.ISO8859-15
1737 +fr_LU.ISO-8859-15@euro:                                fr_LU.ISO8859-15
1738 +fr_LU.ISO_8859-15@euro:                                fr_LU.ISO8859-15
1739  fr_LU:                                         fr_LU.ISO8859-1
1740  fr_LU.88591:                                   fr_LU.ISO8859-1
1741  fr_LU.88591.en:                                        fr_LU.ISO8859-1
1742 @@ -568,7 +706,6 @@
1743  fr_LU.ISO_8859-1:                              fr_LU.ISO8859-1
1744  fr_LU.iso885915:                               fr_LU.ISO8859-15
1745  fr_LU.ISO-8859-15:                             fr_LU.ISO8859-15
1746 -fr_LU.ISO-8859-15@euro:                                fr_LU.ISO8859-15
1747  fr_LU@euro:                                    fr_LU.ISO8859-15
1748  fr_LU.UTF-8@euro:                              fr_LU.UTF-8
1749  fr_LU.utf8:                                    fr_LU.UTF-8
1750 @@ -578,11 +715,16 @@
1751  ga_IE:                                         ga_IE.ISO8859-1
1752  ga_IE.iso88591:                                        ga_IE.ISO8859-1
1753  ga_IE.ISO-8859-1:                              ga_IE.ISO8859-1
1754 +ga_IE.ISO_8859-1:                              ga_IE.ISO8859-1
1755  ga_IE.iso885914:                               ga_IE.ISO8859-14
1756  ga_IE.ISO-8859-14:                             ga_IE.ISO8859-14
1757 +ga_IE.ISO_8859-14:                             ga_IE.ISO8859-14
1758  ga_IE.iso885915:                               ga_IE.ISO8859-15
1759  ga_IE.ISO-8859-15:                             ga_IE.ISO8859-15
1760 +ga_IE.ISO_8859-15:                             ga_IE.ISO8859-15
1761 +ga_IE.iso885915@euro:                          ga_IE.ISO8859-15
1762  ga_IE.ISO-8859-15@euro:                                ga_IE.ISO8859-15
1763 +ga_IE.ISO_8859-15@euro:                                ga_IE.ISO8859-15
1764  ga_IE@euro:                                    ga_IE.ISO8859-15
1765  ga_IE.UTF-8@euro:                              ga_IE.UTF-8
1766  ga_IE.utf8:                                    ga_IE.UTF-8
1767 @@ -590,44 +732,62 @@
1768  gd_GB:                                         gd_GB.ISO8859-1
1769  gd_GB.iso88591:                                        gd_GB.ISO8859-1
1770  gd_GB.ISO-8859-1:                              gd_GB.ISO8859-1
1771 +gd_GB.ISO_8859-1:                              gd_GB.ISO8859-1
1772  gd_GB.iso885914:                               gd_GB.ISO8859-14
1773  gd_GB.ISO-8859-14:                             gd_GB.ISO8859-14
1774 +gd_GB.ISO_8859-14:                             gd_GB.ISO8859-14
1775  gd_GB.iso885915:                               gd_GB.ISO8859-15
1776  gd_GB.ISO-8859-15:                             gd_GB.ISO8859-15
1777 +gd_GB.ISO_8859-15:                             gd_GB.ISO8859-15
1778 +gez_ER:                                                gez_ER.UTF-8
1779 +gez_ER@abegede:                                        gez_ER.UTF-8
1780 +gez_ER.utf8:                                   gez_ER.UTF-8
1781 +gez_ER.utf8@abegede:                           gez_ER.UTF-8
1782  gl:                                            gl_ES.ISO8859-1
1783  gl_ES:                                         gl_ES.ISO8859-1
1784  gl_ES.iso88591:                                        gl_ES.ISO8859-1
1785  gl_ES.ISO-8859-1:                              gl_ES.ISO8859-1
1786 +gl_ES.ISO_8859-1:                              gl_ES.ISO8859-1
1787  gl_ES.iso885915:                               gl_ES.ISO8859-15
1788  gl_ES.ISO-8859-15:                             gl_ES.ISO8859-15
1789 +gl_ES.ISO_8859-15:                             gl_ES.ISO8859-15
1790 +gl_ES.iso885915@euro:                          gl_ES.ISO8859-15
1791  gl_ES.ISO-8859-15@euro:                                gl_ES.ISO8859-15
1792 +gl_ES.ISO_8859-15@euro:                                gl_ES.ISO8859-15
1793  gl_ES@euro:                                    gl_ES.ISO8859-15
1794  gl_ES.UTF-8@euro:                              gl_ES.UTF-8
1795  gl_ES.utf8:                                    gl_ES.UTF-8
1796 +gu:                                            gu_IN.UTF-8
1797 +gu_IN:                                         gu_IN.UTF-8
1798  gu_IN.utf8:                                    gu_IN.UTF-8
1799  gu_IN.UTF-8:                                   gu_IN.UTF-8
1800  gv:                                            gv_GB.ISO8859-1
1801  gv_GB:                                         gv_GB.ISO8859-1
1802  gv_GB.iso88591:                                        gv_GB.ISO8859-1
1803  gv_GB.ISO-8859-1:                              gv_GB.ISO8859-1
1804 +gv_GB.ISO_8859-1:                              gv_GB.ISO8859-1
1805  gv_GB.iso885914:                               gv_GB.ISO8859-14
1806  gv_GB.ISO-8859-14:                             gv_GB.ISO8859-14
1807 +gv_GB.ISO_8859-14:                             gv_GB.ISO8859-14
1808  gv_GB.iso885915:                               gv_GB.ISO8859-15
1809  gv_GB.ISO-8859-15:                             gv_GB.ISO8859-15
1810 +gv_GB.ISO_8859-15:                             gv_GB.ISO8859-15
1811 +gv_GB.utf8:                                    gv_GB.UTF-8
1812  he:                                            he_IL.ISO8859-8
1813  he_IL:                                         he_IL.ISO8859-8
1814  HE_IL:                                         he_IL.ISO8859-8
1815  he_IL.iso88598:                                        he_IL.ISO8859-8
1816  he_IL.ISO-8859-8:                              he_IL.ISO8859-8
1817 +he_IL.ISO_8859-8:                              he_IL.ISO8859-8
1818  he_IL.cp1255:                                  he_IL.CP1255
1819  he_IL.microsoftcp1255:                         he_IL.CP1255
1820  he_IL.microsoft-cp1255:                                he_IL.CP1255
1821  he_IL.MICROSOFT-CP1255:                                he_IL.CP1255
1822  he_IL.utf8:                                    he_IL.UTF-8
1823  HE_IL.UTF-8:                                   he_IL.UTF-8
1824 -hi:                                            hi_IN.ISCII-DEV
1825 -hi_IN:                                         hi_IN.ISCII-DEV
1826 -HI_IN:                                         hi_IN.ISCII-DEV
1827 +hi:                                            hi_IN.UTF-8
1828 +hi_IN:                                         hi_IN.UTF-8
1829 +HI_IN:                                         hi_IN.UTF-8
1830  hi_IN.isciidev:                                        hi_IN.ISCII-DEV
1831  hi_IN.utf8:                                    hi_IN.UTF-8
1832  HI_IN.UTF-8:                                   hi_IN.UTF-8
1833 @@ -637,10 +797,31 @@
1834  hr_HR.ISO-8859-2:                              hr_HR.ISO8859-2
1835  hr_HR.ISO_8859-2:                              hr_HR.ISO8859-2
1836  hr_HR.utf8:                                    hr_HR.UTF-8
1837 +hsb:                                           hsb_DE.ISO8859-2
1838 +hsb_DE:                                                hsb_DE.ISO8859-2
1839 +hsb_DE.iso88592:                               hsb_DE.ISO8859-2
1840 +hsb_DE.ISO-8859-2:                             hsb_DE.ISO8859-2
1841 +hsb_DE.ISO_8859-2:                             hsb_DE.ISO8859-2
1842 +hsb_DE.utf8:                                   hsb_DE.UTF-8
1843  hu:                                            hu_HU.ISO8859-2
1844  hu_HU:                                         hu_HU.ISO8859-2
1845  hu_HU.iso88592:                                        hu_HU.ISO8859-2
1846  hu_HU.ISO-8859-2:                              hu_HU.ISO8859-2
1847 +hu_HU.ISO_8859-2:                              hu_HU.ISO8859-2
1848 +hu_HU.iso885916:                               hu_HU.ISO8859-16
1849 +hu_HU.ISO-8859-16:                             hu_HU.ISO8859-16
1850 +hu_HU.ISO_8859-16:                             hu_HU.ISO8859-16
1851 +hu_HU.utf8:                                    hu_HU.UTF-8
1852 +hy:                                            hy_AM.UTF-8
1853 +hy_AM:                                         hy_AM.UTF-8
1854 +hy_AM.armscii8:                                        hy_AM.ARMSCII-8
1855 +hy_AM.utf8:                                    hy_AM.UTF-8
1856 +id:                                            id_ID.ISO8859-1
1857 +id_ID:                                         id_ID.ISO8859-1
1858 +id_ID.iso88591:                                        id_ID.ISO8859-1
1859 +id_ID.ISO-8859-1:                              id_ID.ISO8859-1
1860 +id_ID.ISO_8859-1:                              id_ID.ISO8859-1
1861 +id_ID.utf8:                                    id_ID.UTF-8
1862  XCOMM in was the old ISO code for Indonesian (now id).  These lines should be
1863  XCOMM deleted in the future.
1864  in:                                            id_ID.ISO8859-1
1865 @@ -656,8 +837,8 @@
1866  it:                                            it_IT.ISO8859-1
1867  it_CH:                                         it_CH.ISO8859-1
1868  it_CH.iso88591:                                        it_CH.ISO8859-1
1869 -it_CH.ISO_8859-1:                              it_CH.ISO8859-1
1870  it_CH.ISO-8859-1:                              it_CH.ISO8859-1
1871 +it_CH.ISO_8859-1:                              it_CH.ISO8859-1
1872  it_CH.iso885915:                               it_CH.ISO8859-15
1873  it_CH.utf8:                                    it_CH.UTF-8
1874  it_IT:                                         it_IT.ISO8859-1
1875 @@ -668,13 +849,16 @@
1876  it_IT.ISO_8859-1:                              it_IT.ISO8859-1
1877  it_IT.iso885915:                               it_IT.ISO8859-15
1878  it_IT.ISO-8859-15:                             it_IT.ISO8859-15
1879 +it_IT.ISO_8859-15:                             it_IT.ISO8859-15
1880 +it_IT.iso885915@euro:                          it_IT.ISO8859-15
1881  it_IT.ISO-8859-15@euro:                                it_IT.ISO8859-15
1882 +it_IT.ISO_8859-15@euro:                                it_IT.ISO8859-15
1883  it_IT@euro:                                    it_IT.ISO8859-15
1884  it_IT.utf8:                                    it_IT.UTF-8
1885  it_IT.UTF-8@euro:                              it_IT.UTF-8
1886 -iu:                                            iu_CA.NUNACOM-8
1887 -iu_CA:                                         iu_CA.NUNACOM-8
1888 -iu_CA.nunacom8:                                        iu_CA.NUNACOM-8
1889 +iu:                                            iu_CA.UTF-8
1890 +iu_CA:                                         iu_CA.UTF-8
1891 +iu_CA.utf8:                                    iu_CA.UTF-8
1892  XCOMM iw was the old ISO code for Hebrew (now he).  These lines should be
1893  XCOMM deleted in the future.
1894  iw:                                            he_IL.ISO8859-8
1895 @@ -683,20 +867,20 @@
1896  iw_IL.iso88598:                                        he_IL.ISO8859-8
1897  iw_IL.ISO-8859-8:                              he_IL.ISO8859-8
1898  #ifndef __uxp__
1899 +ja:                                            ja_JP.eucJP
1900  ja_JP:                                         ja_JP.eucJP
1901  #else /* __uxp__ */
1902 +ja:                                            ja_JP.U90
1903  ja_JP:                                         ja_JP.U90
1904  ja_JP.U90:                                     ja_JP.U90
1905  ja_JP.S90:                                     ja_JP.S90
1906  #endif /* __uxp__ */
1907 -ja:                                            ja_JP.eucJP
1908  ja.JIS:                                                ja_JP.JIS7
1909  ja.SJIS:                                       ja_JP.SJIS
1910 -ja_JP:                                         ja_JP.eucJP
1911  ja_JP.ujis:                                    ja_JP.eucJP
1912 -ja_JP.eucjp:                                   ja_JP.eucJP
1913  Jp_JP:                                         ja_JP.eucJP
1914  ja_JP.AJEC:                                    ja_JP.eucJP
1915 +ja_JP.eucjp:                                   ja_JP.eucJP
1916  ja_JP.EUC:                                     ja_JP.eucJP
1917  ja_JP.EUC-JP:                                  ja_JP.eucJP
1918  ja_JP.EUC_JP:                                  ja_JP.eucJP
1919 @@ -705,24 +889,28 @@
1920  ja_JP.JIS:                                     ja_JP.JIS7
1921  ja_JP.jis7:                                    ja_JP.JIS7
1922  ja_JP.mscode:                                  ja_JP.SJIS
1923 -ja_JP.SJIS:                                    ja_JP.SJIS
1924  ja_JP.sjis:                                    ja_JP.SJIS
1925  ja_JP.utf8:                                    ja_JP.UTF-8
1926  JA_JP.utf8:                                    ja_JP.UTF-8
1927 -ka:                                            ka_GE.GEORGIAN-ACADEMY
1928 -ka_GE:                                         ka_GE.GEORGIAN-ACADEMY
1929 +ka:                                            ka_GE.GEORGIAN-PS
1930 +ka_GE:                                         ka_GE.GEORGIAN-PS
1931  ka_GE.georgianacademy:                         ka_GE.GEORGIAN-ACADEMY
1932  ka_GE.georgianrs:                              ka_GE.GEORGIAN-ACADEMY
1933  ka_GE.georgianps:                              ka_GE.GEORGIAN-PS
1934 +ka_GE.utf8:                                    ka_GE.UTF-8
1935 +kk:                                            kk_KZ.PT154
1936 +kk_KZ:                                         kk_KZ.PT154
1937 +kk_KZ.pt154:                                   kk_KZ.PT154
1938 +kk_KZ.utf8:                                    kk_KZ.UTF-8
1939  kl:                                            kl_GL.ISO8859-1
1940  kl_GL:                                         kl_GL.ISO8859-1
1941  kl_GL.iso88591:                                        kl_GL.ISO8859-1
1942  kl_GL.ISO-8859-1:                              kl_GL.ISO8859-1
1943 -kl_GL.iso885915:                               kl_GL.ISO8859-15
1944 +kl_GL.ISO_8859-1:                              kl_GL.ISO8859-1
1945  kl_GL.utf8:                                    kl_GL.UTF-8
1946  kn:                                            kn_IN.UTF-8
1947 +kn_IN:                                         kn_IN.UTF-8
1948  kn_IN.utf8:                                    kn_IN.UTF-8
1949 -kn_IN.UTF-8:                                   kn_IN.UTF-8
1950  ko:                                            ko_KR.eucKR
1951  ko_KR:                                         ko_KR.eucKR
1952  KO_KR:                                         ko_KR.eucKR
1953 @@ -732,23 +920,56 @@
1954  ko_KR.euckr:                                   ko_KR.eucKR
1955  ko_KR.utf8:                                    ko_KR.UTF-8
1956  KO_KR.UTF-8:                                   ko_KR.UTF-8
1957 +ku:                                            ku_TR.UTF-8
1958 +ku_TR:                                         ku_TR.UTF-8
1959 +ku_TR.utf8:                                    ku_TR.UTF-8
1960  kw:                                            kw_GB.ISO8859-1
1961  kw_GB:                                         kw_GB.ISO8859-1
1962  kw_GB.iso88591:                                        kw_GB.ISO8859-1
1963  kw_GB.ISO-8859-1:                              kw_GB.ISO8859-1
1964 +kw_GB.ISO_8859-1:                              kw_GB.ISO8859-1
1965  kw_GB.iso885914:                               kw_GB.ISO8859-14
1966  kw_GB.ISO-8859-14:                             kw_GB.ISO8859-14
1967 +kw_GB.ISO_8859-14:                             kw_GB.ISO8859-14
1968  kw_GB.iso885915:                               kw_GB.ISO8859-15
1969  kw_GB.ISO-8859-15:                             kw_GB.ISO8859-15
1970 +kw_GB.ISO_8859-15:                             kw_GB.ISO8859-15
1971 +kw_GB.utf8:                                    kw_GB.UTF-8
1972  ky:                                            ky_KG.UTF-8
1973  ky_KG:                                                 ky_KG.UTF-8
1974  ky_KG.utf8:                                            ky_KG.UTF-8
1975  ky_KG.UTF-8:                                   ky_KG.UTF-8
1976 -lo:                                            lo_LA.MULELAO-1
1977 -lo_LA:                                         lo_LA.MULELAO-1
1978 +lg:                                            lg_UG.ISO8859-10
1979 +lg_UG:                                         lg_UG.ISO8859-10
1980 +lg_UG.iso885910:                               lg_UG.ISO8859-10
1981 +lg_UG.ISO-8859-10:                             lg_UG.ISO8859-10
1982 +lg_UG.ISO_8859-10:                             lg_UG.ISO8859-10
1983 +lg_UG.utf8:                                    lg_UG.UTF-8
1984 +li:                                            li_BE.ISO8859-1
1985 +li_BE:                                         li_BE.ISO8859-1
1986 +li_BE.iso88591:                                        li_BE.ISO8859-1
1987 +li_BE.ISO-8859-1:                              li_BE.ISO8859-1
1988 +li_BE.ISO_8859-1:                              li_BE.ISO8859-1
1989 +li_BE.iso885915@euro:                          li_BE.ISO8859-15
1990 +li_BE.ISO-8859-15@euro:                                li_BE.ISO8859-15
1991 +li_BE.ISO_8859-15@euro:                                li_BE.ISO8859-15
1992 +li_BE@euro:                                    li_BE.ISO8859-15
1993 +li_BE.utf8:                                    li_BE.UTF-8
1994 +li_NL:                                         li_NL.ISO8859-1
1995 +li_NL.iso88591:                                        li_NL.ISO8859-1
1996 +li_NL.ISO-8859-1:                              li_NL.ISO8859-1
1997 +li_NL.ISO_8859-1:                              li_NL.ISO8859-1
1998 +li_NL.iso885915@euro:                          li_NL.ISO8859-15
1999 +li_NL.ISO-8859-15@euro:                                li_NL.ISO8859-15
2000 +li_NL.ISO_8859-15@euro:                                li_NL.ISO8859-15
2001 +li_NL@euro:                                    li_NL.ISO8859-15
2002 +li_NL.utf8:                                    li_NL.UTF-8
2003 +lo:                                            lo_LA.UTF-8
2004 +lo_LA:                                         lo_LA.UTF-8
2005  lo_LA.cp1133:                                  lo_LA.IBM-CP1133
2006  lo_LA.ibmcp1133:                               lo_LA.IBM-CP1133
2007  lo_LA.mulelao1:                                        lo_LA.MULELAO-1
2008 +lo_LA.utf8:                                    lo_LA.UTF-8
2009  #if defined(VeryOldFreeBSD)
2010  XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
2011  XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
2012 @@ -765,6 +986,8 @@
2013  lt_LT.ISO-8859-13:                             lt_LT.ISO8859-13
2014  lt_LT.ISO_8859-13:                             lt_LT.ISO8859-13
2015  lt_LT.utf8:                                    lt_LT.UTF-8
2016 +lug:                                           lg_UG.ISO8859-10
2017 +lug_UG:                                                lg_UG.ISO8859-10
2018  lv:                                            lv_LV.ISO8859-13
2019  lv_LV:                                         lv_LV.ISO8859-13
2020  lv_LV.iso88594:                                        lv_LV.ISO8859-4
2021 @@ -776,34 +999,68 @@
2022  mi:                                            mi_NZ.ISO8859-1
2023  mi_NZ:                                         mi_NZ.ISO8859-1
2024  mi_NZ.iso88591:                                        mi_NZ.ISO8859-1
2025 +mi_NZ.ISO-8859-1:                              mi_NZ.ISO8859-1
2026 +mi_NZ.ISO_8859-1:                              mi_NZ.ISO8859-1
2027 +mi_NZ.utf8:                                    mi_NZ.UTF-8
2028  mk:                                            mk_MK.ISO8859-5
2029  mk_MK:                                         mk_MK.ISO8859-5
2030  mk_MK.iso88595:                                        mk_MK.ISO8859-5
2031  mk_MK.ISO-8859-5:                              mk_MK.ISO8859-5
2032 +mk_MK.ISO_8859-5:                              mk_MK.ISO8859-5
2033  mk_MK.cp1251:                                  mk_MK.CP1251
2034  mk_MK.microsoftcp1251:                         mk_MK.CP1251
2035  mk_MK.microsoft-cp1251:                                mk_MK.CP1251
2036  mk_MK.MICROSOFT-CP1251:                                mk_MK.CP1251
2037  mk_MK.utf8:                                    mk_MK.UTF-8
2038  ml:                                            ml_IN.UTF-8
2039 +ml_IN:                                         ml_IN.UTF-8
2040  ml_IN.utf8:                                    ml_IN.UTF-8
2041  ml_IN.UTF-8:                                   ml_IN.UTF-8
2042 +mn:                                            mn_MN.UTF-8
2043 +mn_MN:                                         mn_MN.UTF-8
2044 +mn_MN.utf8:                                    mn_MN.UTF-8
2045  mr_IN:                                         mr_IN.UTF-8
2046  mr_IN.utf8:                                    mr_IN.UTF-8
2047  ms:                                            ms_MY.ISO8859-1
2048  ms_MY:                                         ms_MY.ISO8859-1
2049  ms_MY.iso88591:                                        ms_MY.ISO8859-1
2050  ms_MY.ISO-8859-1:                              ms_MY.ISO8859-1
2051 +ms_MY.ISO_8859-1:                              ms_MY.ISO8859-1
2052 +ms_MY.utf8:                                    ms_MY.UTF-8
2053  mt:                                            mt_MT.ISO8859-3
2054  mt_MT:                                         mt_MT.ISO8859-3
2055 +mt_MT.iso88593:                                        mt_MT.ISO8859-3
2056  mt_MT.ISO-8859-3:                              mt_MT.ISO8859-3
2057 +mt_MT.ISO_8859-3:                              mt_MT.ISO8859-3
2058 +mt_MT.utf8:                                    mt_MT.UTF-8
2059  nb:                                            nb_NO.ISO8859-1
2060  nb_NO:                                         nb_NO.ISO8859-1
2061  nb_NO.88591:                                   nb_NO.ISO8859-1
2062  nb_NO.iso88591:                                        nb_NO.ISO8859-1
2063  nb_NO.ISO-8859-1:                              nb_NO.ISO8859-1
2064 +nb_NO.ISO_8859-1:                              nb_NO.ISO8859-1
2065  nb_NO.iso885915:                               nb_NO.ISO8859-15
2066  nb_NO.ISO-8859-15:                             nb_NO.ISO8859-15
2067 +nb_NO.ISO_8859-15:                             nb_NO.ISO8859-15
2068 +nb_NO.utf8:                                    nb_NO.UTF-8
2069 +nds:                                           nds_DE.ISO8859-1
2070 +nds_DE:                                                nds_DE.ISO8859-1
2071 +nds_DE.iso88591:                               nds_DE.ISO8859-1
2072 +nds_DE.ISO-8859-1:                             nds_DE.ISO8859-1
2073 +nds_DE.ISO_8859-1:                             nds_DE.ISO8859-1
2074 +nds_DE.iso88591@traditional:                   nds_DE.ISO8859-1
2075 +nds_DE.ISO-8859-1@traditional:                 nds_DE.ISO8859-1
2076 +nds_DE.ISO_8859-1@traditional:                 nds_DE.ISO8859-1
2077 +nds_DE@traditional:                            nds_DE.ISO8859-1
2078 +nds_DE.iso885915:                              nds_DE.ISO8859-15
2079 +nds_DE.iso885915@euro:                         nds_DE.ISO8859-15
2080 +nds_DE.ISO-8859-15@euro:                       nds_DE.ISO8859-15
2081 +nds_DE.ISO_8859-15@euro:                       nds_DE.ISO8859-15
2082 +nds_DE@euro:                                   nds_DE.ISO8859-15
2083 +nds_DE.utf8:                                   nds_DE.UTF-8
2084 +ne:                                            ne_NP.UTF-8
2085 +ne_NP:                                         ne_NP.UTF-8
2086 +ne_NP.utf8:                                    ne_NP.UTF-8
2087  nl:                                            nl_NL.ISO8859-1
2088  nl_BE:                                         nl_BE.ISO8859-1
2089  nl_BE.88591:                                   nl_BE.ISO8859-1
2090 @@ -812,8 +1069,10 @@
2091  nl_BE.ISO-8859-1:                              nl_BE.ISO8859-1
2092  nl_BE.ISO_8859-1:                              nl_BE.ISO8859-1
2093  nl_BE.iso885915:                               nl_BE.ISO8859-15
2094 -nl_BE.ISO-8859-15:                             nl_BE.ISO8859-15
2095 +nl_BE.iso885915@euro:                          nl_BE.ISO8859-15
2096  nl_BE.ISO-8859-15@euro:                                nl_BE.ISO8859-15
2097 +nl_BE.ISO_8859-15@euro:                                nl_BE.ISO8859-15
2098 +nl_BE.ISO-8859-15:                             nl_BE.ISO8859-15
2099  nl_BE@euro:                                    nl_BE.ISO8859-15
2100  nl_BE.utf8:                                    nl_BE.UTF-8
2101  nl_BE.UTF-8@euro:                              nl_BE.UTF-8
2102 @@ -821,11 +1080,13 @@
2103  nl_NL.88591:                                   nl_NL.ISO8859-1
2104  nl_NL.88591.en:                                        nl_NL.ISO8859-1
2105  nl_NL.iso88591:                                        nl_NL.ISO8859-1
2106 +nl_NL.iso885915@euro:                          nl_NL.ISO8859-15
2107 +nl_NL.ISO-8859-15@euro:                                nl_NL.ISO8859-15
2108 +nl_NL.ISO_8859-15@euro:                                nl_NL.ISO8859-15
2109  nl_NL.ISO-8859-1:                              nl_NL.ISO8859-1
2110  nl_NL.ISO_8859-1:                              nl_NL.ISO8859-1
2111  nl_NL.iso885915:                               nl_NL.ISO8859-15
2112  nl_NL.ISO-8859-15:                             nl_NL.ISO8859-15
2113 -nl_NL.ISO-8859-15@euro:                                nl_NL.ISO8859-15
2114  nl_NL@euro:                                    nl_NL.ISO8859-15
2115  nl_NL.utf8:                                    nl_NL.UTF-8
2116  nl_NL.UTF-8@euro:                              nl_NL.UTF-8
2117 @@ -836,42 +1097,79 @@
2118  nn_NO.ISO_8859-1:                              nn_NO.ISO8859-1
2119  nn_NO.iso885915:                               nn_NO.ISO8859-15
2120  nn_NO.ISO-8859-15:                             nn_NO.ISO8859-15
2121 -no:                                            no_NO.ISO8859-1
2122 -no_NO:                                         no_NO.ISO8859-1
2123 -no_NO.88591:                                   no_NO.ISO8859-1
2124 -no_NO.88591.en:                                        no_NO.ISO8859-1
2125 -no_NO.iso88591:                                        no_NO.ISO8859-1
2126 -no_NO.ISO-8859-1:                              no_NO.ISO8859-1
2127 -no_NO.iso885915:                               no_NO.ISO8859-15
2128 -no_NO.ISO-8859-15:                             no_NO.ISO8859-15
2129 -no_NO.utf8:                                    no_NO.UTF-8
2130 +nn_NO.ISO_8859-15:                             nn_NO.ISO8859-15
2131 +nn_NO.utf8:                                    nn_NO.UTF-8
2132 +no:                                            nb_NO.ISO8859-1
2133 +no_NO:                                         nb_NO.ISO8859-1
2134 +no_NO.88591:                                   nb_NO.ISO8859-1
2135 +no_NO.88591.en:                                        nb_NO.ISO8859-1
2136 +no_NO.iso88591:                                        nb_NO.ISO8859-1
2137 +no_NO.ISO-8859-1:                              nb_NO.ISO8859-1
2138 +no_NO.ISO_8859-1:                              nb_NO.ISO8859-1
2139 +no_NO.iso885915:                               nb_NO.ISO8859-15
2140 +no_NO.ISO-8859-15:                             nb_NO.ISO8859-15
2141 +no_NO.ISO_8859-15:                             nb_NO.ISO8859-15
2142 +no_NO.utf8:                                    nb_NO.UTF-8
2143  nr:                                                    nr_ZA.ISO8859-1
2144  nr_ZA:                                         nr_ZA.ISO8859-1
2145  nr_ZA.iso88591:                                nr_ZA.ISO8859-1
2146 +nr_ZA.ISO-8859-1:                              nr_ZA.ISO8859-1
2147 +nr_ZA.ISO_8859-1:                              nr_ZA.ISO8859-1
2148  nr_ZA.utf8:                                    nr_ZA.UTF-8
2149 -nso:                                           nso_ZA.ISO8859-15
2150 -nso_ZA:                                                nso_ZA.ISO8859-15
2151 +nso:                                           nso_ZA.ISO8859-10
2152 +nso_ZA:                                                nso_ZA.ISO8859-10
2153 +nso_ZA.iso885910:                      nso_ZA.ISO8859-10
2154 +nso_ZA.ISO-8859-10:                            nso_ZA.ISO8859-10
2155 +nso_ZA.ISO_8859-10:                            nso_ZA.ISO8859-10
2156  nso_ZA.iso885915:                      nso_ZA.ISO8859-15
2157 +nso_ZA.ISO-8859-15:                            nso_ZA.ISO8859-15
2158 +nso_ZA.ISO_8859-15:                            nso_ZA.ISO8859-15
2159  nso_ZA.utf8:                           nso_ZA.UTF-8
2160 -ny:                                            ny_NO.ISO8859-1
2161 -ny_NO:                                         ny_NO.ISO8859-1
2162 -ny_NO.88591:                                   ny_NO.ISO8859-1
2163 -ny_NO.ISO_8859-1:                              ny_NO.ISO8859-1
2164 -ny_NO.iso885915:                               ny_NO.ISO8859-15
2165 -no@nynorsk:                                    ny_NO.ISO8859-1
2166 +ny:                                            nn_NO.ISO8859-1
2167 +ny_NO:                                         nn_NO.ISO8859-1
2168 +ny_NO.88591:                                   nn_NO.ISO8859-1
2169 +ny_NO.ISO-8859-1:                              nn_NO.ISO8859-1
2170 +ny_NO.ISO_8859-1:                              nn_NO.ISO8859-1
2171 +ny_NO.iso885915:                               nn_NO.ISO8859-15
2172 +ny_NO.ISO-8859-15:                             nn_NO.ISO8859-15
2173 +ny_NO.ISO_8859-15:                             nn_NO.ISO8859-15
2174 +no@nynorsk:                                    nn_NO.ISO8859-1
2175  nynorsk:                                       nn_NO.ISO8859-1
2176  oc:                                            oc_FR.ISO8859-1
2177  oc_FR:                                         oc_FR.ISO8859-1
2178  oc_FR.iso88591:                                        oc_FR.ISO8859-1
2179  oc_FR.ISO-8859-1:                              oc_FR.ISO8859-1
2180 +oc_FR.ISO_8859-1:                              oc_FR.ISO8859-1
2181  oc_FR.iso885915:                               oc_FR.ISO8859-15
2182  oc_FR.ISO-8859-15:                             oc_FR.ISO8859-15
2183 +oc_FR.ISO_8859-15:                             oc_FR.ISO8859-15
2184 +oc_FR.iso885915@euro:                          oc_FR.ISO8859-15
2185 +oc_FR.ISO-8859-15@euro:                                oc_FR.ISO8859-15
2186 +oc_FR.ISO_8859-15@euro:                                oc_FR.ISO8859-15
2187  oc_FR@euro:                                    oc_FR.ISO8859-15
2188 +om:                                            om_ET.UTF-8
2189 +om_ET:                                         om_ET.UTF-8
2190 +om_ET.utf8:                                    om_ET.UTF-8
2191 +om_KE:                                         om_KE.ISO8859-1
2192 +om_KE.iso88591:                                        om_KE.ISO8859-1
2193 +om_KE.ISO-8859-1:                              om_KE.ISO8859-1
2194 +om_KE.ISO_8859-1:                              om_KE.ISO8859-1
2195 +om_KE.utf8:                                    om_KE.UTF-8
2196  or:                                            or_IN.UTF-8
2197 +or_IN:                                         or_IN.UTF-8
2198  or_IN.utf8:                                    or_IN.UTF-8
2199 -or_IN.UTF-8:                                   or_IN.UTF-8
2200 +pa:                                            pa_IN.UTF-8
2201 +pa_IN:                                         pa_IN.UTF-8
2202  pa_IN.utf8:                                    pa_IN.UTF-8
2203 -pa_IN.UTF-8:                                   pa_IN.UTF-8
2204 +pap:                                           pap_AN.ISO8859-1
2205 +pap_AN:                                                pap_AN.ISO8859-1
2206 +pap_AN.iso88591:                               pap_AN.ISO8859-1
2207 +pap_AN.ISO-8859-1:                             pap_AN.ISO8859-1
2208 +pap_AN.ISO_8859-1:                             pap_AN.ISO8859-1
2209 +pap_AN.iso885915@euro:                         pap_AN.ISO8859-15
2210 +pap_AN.ISO-8859-15@euro:                       pap_AN.ISO8859-15
2211 +pap_AN.ISO_8859-15@euro:                       pap_AN.ISO8859-15
2212 +pap_AN.utf8:                                   pap_AN.UTF-8
2213  pd:                                            pd_US.ISO8859-1
2214  pd_DE:                                         pd_DE.ISO8859-1
2215  pd_US:                                         pd_US.ISO8859-1
2216 @@ -879,17 +1177,23 @@
2217  pd_US.iso88591:                                        pd_US.ISO8859-1
2218  pd_DE.iso885915:                               pd_DE.ISO8859-15
2219  pd_US.iso885915:                               pd_US.ISO8859-15
2220 -ph:                                            ph_PH.ISO8859-1
2221 -ph_PH:                                         ph_PH.ISO8859-1
2222 -ph_PH.iso88591:                                        ph_PH.ISO8859-1
2223 +ph:                                            fil_PH.ISO8859-1
2224 +ph_PH:                                         fil_PH.ISO8859-1
2225 +ph_PH.iso88591:                                        fil_PH.ISO8859-1
2226 +ph_PH.ISO8859-1                                        fil_PH.ISO8859-1
2227  pl:                                            pl_PL.ISO8859-2
2228  pl_PL:                                         pl_PL.ISO8859-2
2229  pl_PL.iso88592:                                        pl_PL.ISO8859-2
2230  pl_PL.ISO-8859-2:                              pl_PL.ISO8859-2
2231 +pl_PL.ISO_8859-2:                              pl_PL.ISO8859-2
2232 +pl_PL.iso885916:                               pl_PL.ISO8859-16
2233 +pl_PL.ISO-8859-16:                             pl_PL.ISO8859-16
2234 +pl_PL.ISO_8859-16:                             pl_PL.ISO8859-16
2235  pl_PL.utf8:                                    pl_PL.UTF-8
2236 -pp:                                            pp_AN.ISO8859-1
2237 -pp_AN:                                         pp_AN.ISO8859-1
2238 -pp_AN.iso88591:                                        pp_AN.ISO8859-1
2239 +pp:                                            pap_AN.ISO8859-1
2240 +pp_AN:                                         pap_AN.ISO8859-1
2241 +pp_AN.iso88591:                                        pap_AN.ISO8859-1
2242 +pp_AN.ISO8859-1                                        pap_AN.ISO8859-1
2243  pt:                                            pt_PT.ISO8859-1
2244  pt_BR:                                         pt_BR.ISO8859-1
2245  pt_BR.88591:                                   pt_BR.ISO8859-1
2246 @@ -897,7 +1201,6 @@
2247  pt_BR.iso88591:                                        pt_BR.ISO8859-1
2248  pt_BR.ISO-8859-1:                              pt_BR.ISO8859-1
2249  pt_BR.ISO_8859-1:                              pt_BR.ISO8859-1
2250 -pt_BR.iso885915:                               pt_BR.ISO8859-15
2251  pt_BR.utf8:                                    pt_BR.UTF-8
2252  pt_PT:                                         pt_PT.ISO8859-1
2253  pt_PT.88591:                                   pt_PT.ISO8859-1
2254 @@ -906,8 +1209,10 @@
2255  pt_PT.ISO-8859-1:                              pt_PT.ISO8859-1
2256  pt_PT.ISO_8859-1:                              pt_PT.ISO8859-1
2257  pt_PT.iso885915:                               pt_PT.ISO8859-15
2258 -pt_PT.ISO-8859-15:                             pt_PT.ISO8859-15
2259 +pt_PT.iso885915@euro:                          pt_PT.ISO8859-15
2260  pt_PT.ISO-8859-15@euro:                                pt_PT.ISO8859-15
2261 +pt_PT.ISO_8859-15@euro:                                pt_PT.ISO8859-15
2262 +pt_PT.ISO-8859-15:                             pt_PT.ISO8859-15
2263  pt_PT@euro:                                    pt_PT.ISO8859-15
2264  pt_PT.utf8:                                    pt_PT.UTF-8
2265  pt_PT.UTF-8@euro:                              pt_PT.UTF-8
2266 @@ -915,16 +1220,22 @@
2267  ro_RO:                                         ro_RO.ISO8859-2
2268  ro_RO.iso88592:                                        ro_RO.ISO8859-2
2269  ro_RO.ISO-8859-2:                              ro_RO.ISO8859-2
2270 +ro_RO.ISO_8859-2:                              ro_RO.ISO8859-2
2271 +ro_RO.iso885916:                               ro_RO.ISO8859-16
2272 +ro_RO.ISO-8859-16:                             ro_RO.ISO8859-16
2273 +ro_RO.ISO_8859-16:                             ro_RO.ISO8859-16
2274  ro_RO.utf8:                                    ro_RO.UTF-8
2275  ru:                                            ru_RU.ISO8859-5
2276  ru_RU:                                         ru_RU.ISO8859-5
2277  ru_RU.iso88595:                                        ru_RU.ISO8859-5
2278  ru_RU.ISO-8859-5:                              ru_RU.ISO8859-5
2279 +ru_RU.ISO_8859-5:                              ru_RU.ISO8859-5
2280  ru_RU.koi8r:                                   ru_RU.KOI8-R
2281  ru_RU.cp1251:                                  ru_RU.CP1251
2282  ru_RU.microsoftcp1251:                         ru_RU.CP1251
2283  ru_RU.microsoft-cp1251:                                ru_RU.CP1251
2284  ru_RU.MICROSOFT-CP1251:                                ru_RU.CP1251
2285 +ru_RU.utf8:                                    ru_RU.UTF-8
2286  #if defined(INCLUDE_ru_SU)
2287  XCOMM ru_SU is redundant now
2288  ru_SU:                                         ru_RU.KOI8-R
2289 @@ -937,10 +1248,12 @@
2290  ru_UA.microsoftcp1251:                         ru_UA.CP1251
2291  ru_UA.microsoft-cp1251:                                ru_UA.CP1251
2292  ru_UA.MICROSOFT-CP1251:                                ru_UA.CP1251
2293 +ru_UA.utf8:                                    ru_UA.UTF-8
2294  rw:                         rw_RW.ISO8859-1
2295  rw_RW:                      rw_RW.ISO8859-1
2296  rw_RW.iso8859-1:            rw_RW.ISO8859-1
2297  rw_RW.ISO-8859-1:           rw_RW.ISO8859-1
2298 +rw_RW.ISO_8859-1:           rw_RW.ISO8859-1
2299  rw_RW.utf8:                 rw_RW.UTF-8
2300  se_NO:                                         se_NO.UTF-8
2301  se_NO.utf8:                                    se_NO.UTF-8
2302 @@ -954,25 +1267,52 @@
2303  sh_YU.utf8:                                    sr_CS.UTF-8
2304  si:                                            si_LK.UTF-8
2305  si_LK:                                         si_LK.UTF-8
2306 +si_LK.utf8:                                    si_LK.UTF-8
2307 +sid:                                           sid_ET.UTF-8
2308 +sid_ET:                                                sid_ET.UTF-8
2309 +sid_ET.utf8:                                   sid_ET.UTF-8
2310  sk:                                            sk_SK.ISO8859-2
2311  sk_SK:                                         sk_SK.ISO8859-2
2312  sk_SK.iso88592:                                        sk_SK.ISO8859-2
2313  sk_SK.ISO-8859-2:                              sk_SK.ISO8859-2
2314 +sk_SK.ISO_8859-2:                              sk_SK.ISO8859-2
2315  sk_SK.utf8:                                    sk_SK.UTF-8
2316  sl:                                            sl_SI.ISO8859-2
2317  sl_SI:                                         sl_SI.ISO8859-2
2318  sl_SI.iso88592:                                        sl_SI.ISO8859-2
2319  sl_SI.ISO-8859-2:                              sl_SI.ISO8859-2
2320 +sl_SI.ISO_8859-2:                              sl_SI.ISO8859-2
2321 +sl_SI.iso885916:                               sl_SI.ISO8859-16
2322 +sl_SI.ISO-8859-16:                             sl_SI.ISO8859-16
2323 +sl_SI.ISO_8859-16:                             sl_SI.ISO8859-16
2324  sl_SI.utf8:                                    sl_SI.UTF-8
2325 +so_DJ:                                         so_DJ.ISO8859-1
2326 +so_DJ.iso88591:                                        so_DJ.ISO8859-1
2327 +so_DJ.ISO-8859-1:                              so_DJ.ISO8859-1
2328 +so_DJ.ISO_8859-1:                              so_DJ.ISO8859-1
2329 +so_DJ.utf8:                                    so_DJ.UTF-8
2330 +so_ET:                                         so_ET.UTF-8
2331 +so_ET.utf8:                                    so_ET.UTF-8
2332 +so_KE:                                         so_KE.ISO8859-1
2333 +so_KE.iso88591:                                        so_KE.ISO8859-1
2334 +so_KE.ISO-8859-1:                              so_KE.ISO8859-1
2335 +so_KE.ISO_8859-1:                              so_KE.ISO8859-1
2336 +so_KE.utf8:                                    so_KE.UTF-8
2337 +so_SO:                                         so_SO.ISO8859-1
2338 +so_SO.iso88591:                                        so_SO.ISO8859-1
2339 +so_SO.ISO-8859-1:                              so_SO.ISO8859-1
2340 +so_SO.ISO_8859-1:                              so_SO.ISO8859-1
2341 +so_SO.utf8:                                    so_SO.UTF-8
2342  XCOMM sp is not an ISO 639 language code, but in Cyrillic, "R" looks like "P".
2343  XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
2344  XCOMM These lines should be deleted in the future.
2345  sp:                                            sr_CS.ISO8859-5
2346  sp_YU:                                         sr_CS.ISO8859-5
2347 -sq:                                            sq_AL.ISO8859-2
2348 -sq_AL:                                         sq_AL.ISO8859-2
2349 -sq_AL.iso88592:                                        sq_AL.ISO8859-2
2350 -sq_AL.ISO-8859-2:                              sq_AL.ISO8859-2
2351 +sq:                                            sq_AL.ISO8859-1
2352 +sq_AL:                                         sq_AL.ISO8859-1
2353 +sq_AL.iso88591:                                        sq_AL.ISO8859-1
2354 +sq_AL.ISO-8859-1:                              sq_AL.ISO8859-1
2355 +sq_AL.ISO_8859-1:                              sq_AL.ISO8859-1
2356  sq_AL.utf8:                                    sq_AL.UTF-8
2357  XCOMM SP is not an ISO 639 country code, but in Cyrillic, "R" looks like "P".
2358  XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
2359 @@ -982,8 +1322,10 @@
2360  sr_YU:                                         sr_CS.ISO8859-5
2361  sr_YU.iso88592:                                        sr_CS.ISO8859-2
2362  sr_YU.ISO-8859-2:                              sr_CS.ISO8859-2
2363 +sr_YU.ISO_8859-2:                              sr_CS.ISO8859-2
2364  sr_YU.iso88595:                                        sr_CS.ISO8859-5
2365  sr_YU.ISO-8859-5:                              sr_CS.ISO8859-5
2366 +sr_YU.ISO_8859-5:                              sr_CS.ISO8859-5
2367  sr@cyrillic:                                   sr_CS.ISO8859-5
2368  sr_YU@cyrillic:                                        sr_CS.ISO8859-5
2369  sr_YU.iso88595@cyrillic:                       sr_CS.ISO8859-5
2370 @@ -996,32 +1338,50 @@
2371  sr_YU.MICROSOFT-CP1251@cyrillic:               sr_CS.CP1251
2372  sr_YU.utf8:                                    sr_CS.UTF-8
2373  sr_YU.UTF-8@cyrillic:                          sr_CS.UTF-8
2374 +sr_CS:                                         sr_CS.ISO8859-5
2375  sr_CS.iso88592:                                        sr_CS.ISO8859-2
2376  sr_CS.ISO-8859-2:                              sr_CS.ISO8859-2
2377 +sr_CS.ISO_8859-2:                              sr_CS.ISO8859-2
2378  sr_CS.iso88595:                                        sr_CS.ISO8859-5
2379  sr_CS.ISO-8859-5:                              sr_CS.ISO8859-5
2380 +sr_CS.ISO_8859-5:                              sr_CS.ISO8859-5
2381  sr@Latn:                                       sr_CS.ISO8859-2
2382  sr_CS@Latn:                                    sr_CS.ISO8859-2
2383  sr_CS.iso88592@Latn:                           sr_CS.ISO8859-2
2384  sr_CS.ISO-8859-2@Latn:                         sr_CS.ISO8859-2
2385 +sr_CS.ISO_8859-2@Latn:                         sr_CS.ISO8859-2
2386  sr_CS.ISO8859-2@Latn:                          sr_CS.ISO8859-2
2387  sr_CS.utf8:                                    sr_CS.UTF-8
2388  sr_CS.UTF-8@Latn:                              sr_CS.UTF-8
2389 +sr_ME:                                         sr_ME.ISO8859-5
2390 +sr_ME.ISO-8859-5:                              sr_ME.ISO8859-5
2391 +sr_ME.ISO_8859-5:                              sr_ME.ISO8859-5
2392 +sr_ME.utf8:                                    sr_ME.UTF-8
2393 +sr@ije:                                                sr_ME.ISO8859-5
2394 +sr_CS@ije:                                     sr_CS.ISO8859-5
2395  ss:                                                    ss_ZA.ISO8859-1
2396  ss_ZA:                                         ss_ZA.ISO8859-1
2397  ss_ZA.iso88591:                                ss_ZA.ISO8859-1
2398 +ss_ZA.ISO-8859-1:                              ss_ZA.ISO8859-1
2399 +ss_ZA.ISO_8859-1:                              ss_ZA.ISO8859-1
2400  ss_ZA.utf8:                                    ss_ZA.UTF-8
2401  st:                                                    st_ZA.ISO8859-1
2402  st_ZA:                                         st_ZA.ISO8859-1
2403  st_ZA.iso88591:                                st_ZA.ISO8859-1
2404 +st_ZA.ISO-8859-1:                              st_ZA.ISO8859-1
2405 +st_ZA.ISO_8859-1:                              st_ZA.ISO8859-1
2406  st_ZA.utf8:                                    st_ZA.UTF-8
2407  sv:                                            sv_SE.ISO8859-1
2408  sv_FI:                                         sv_FI.ISO8859-1
2409  sv_FI.iso88591:                                        sv_FI.ISO8859-1
2410  sv_FI.ISO-8859-1:                              sv_FI.ISO8859-1
2411 +sv_FI.ISO_8859-1:                              sv_FI.ISO8859-1
2412  sv_FI.iso885915:                               sv_FI.ISO8859-15
2413  sv_FI.ISO-8859-15:                             sv_FI.ISO8859-15
2414 +sv_FI.ISO_8859-15:                             sv_FI.ISO8859-15
2415 +sv_FI.iso885915@euro:                          sv_FI.ISO8859-15
2416  sv_FI.ISO-8859-15@euro:                                sv_FI.ISO8859-15
2417 +sv_FI.ISO_8859-15@euro:                                sv_FI.ISO8859-15
2418  sv_FI@euro:                                    sv_FI.ISO8859-15
2419  sv_FI.UTF-8@euro:                              sv_FI.UTF-8
2420  sv_FI.utf8:                                    sv_FI.UTF-8
2421 @@ -1035,49 +1395,85 @@
2422  sv_SE.ISO-8859-15:                             sv_SE.ISO8859-15
2423  sv_SE@euro:                                    sv_SE.ISO8859-15
2424  sv_SE.utf8:                                    sv_SE.UTF-8
2425 -ta:                                            ta_IN.TSCII-0
2426 -ta_IN:                                         ta_IN.TSCII-0
2427 +ta:                                            ta_IN.UTF-8
2428 +ta_IN:                                         ta_IN.UTF-8
2429  ta_IN.tscii:                                   ta_IN.TSCII-0
2430  ta_IN.tscii0:                                  ta_IN.TSCII-0
2431 +ta_IN.utf8:                                    ta_IN.UTF-8
2432  te:                                            te_IN.UTF-8
2433 +te_IN:                                         te_IN.UTF-8
2434  te_IN.utf8:                                    te_IN.UTF-8
2435 -te_IN.UTF-8:                                   te_IN.UTF-8
2436 -tg:                                            tg_TJ.KOI8-C
2437 -tg_TJ:                                         tg_TJ.KOI8-C
2438 -tg_TJ.koi8c:                                   tg_TJ.KOI8-C
2439 +tg:                                            tg_TJ.KOI8-T
2440 +tg_TJ:                                         tg_TJ.KOI8-T
2441 +tg_TJ.koi8c:                                   tg_TJ.KOI8-K
2442 +tg_TJ.koi8k:                                   tg_TJ.KOI8-K
2443 +tg_TJ.koi8t:                                   tg_TJ.KOI8-T
2444 +tg_TJ.utf8:                                    tg_TJ.UTF-8
2445  th:                                            th_TH.ISO8859-11
2446  th_TH:                                         th_TH.ISO8859-11
2447 +th_TH.iso885911:                               th_TH.ISO8859-11
2448  th_TH.ISO-8859-11:                             th_TH.ISO8859-11
2449 +th_TH.ISO_8859-11:                             th_TH.ISO8859-11
2450  th_TH.tis620:                                  th_TH.TIS620
2451  th_TH.TIS-620:                                 th_TH.TIS620
2452  th_TH.TACTIS:                                  th_TH.TIS620
2453  th_TH.utf8:                                    th_TH.UTF-8
2454 +ti:                                            ti_ER.UTF-8
2455 +ti_ER:                                         ti_ER.UTF-8
2456 +ti_ER.utf8:                                    ti_ER.UTF-8
2457 +ti_ET:                                         ti_ET.UTF-8
2458 +ti_ET.utf8:                                    ti_ET.UTF-8
2459 +tig:                                           tig_ER.UTF-8
2460 +tig_ER:                                                tig_ER.UTF-8
2461 +tig_ER.utf8:                                   tig_ER.UTF-8
2462 +tk:                                            tk_TM.UTF-8
2463 +tk_TM:                                         tk_TM.UTF-8
2464 +tk_TM.utf8:                                    tk_TM.UTF-8
2465  tl:                                            tl_PH.ISO8859-1
2466  tl_PH:                                         tl_PH.ISO8859-1
2467  tl_PH.iso88591:                                        tl_PH.ISO8859-1
2468  tl_PH.ISO-8859-1:                              tl_PH.ISO8859-1
2469 -tn:                                            tn_ZA.ISO8859-15
2470 -tn_ZA:                                 tn_ZA.ISO8859-15
2471 -tn_ZA.iso8859-15:              tn_ZA.ISO8859-15
2472 +tl_PH.ISO_8859-1:                              tl_PH.ISO8859-1
2473 +tl_PH.utf8:                                    tl_PH.UTF-8
2474 +tn:                                            tn_ZA.ISO8859-10
2475 +tn_ZA:                                         tn_ZA.ISO8859-10
2476 +tn_ZA.iso885910:                               tn_ZA.ISO8859-10
2477 +tn_ZA.ISO-8859-10:                             tn_ZA.ISO8859-10
2478 +tn_ZA.ISO_8859-10:                             tn_ZA.ISO8859-10
2479 +tn_ZA.iso885915:                               tn_ZA.ISO8859-15
2480 +tn_ZA.ISO-8859-15:                             tn_ZA.ISO8859-15
2481 +tn_ZA.ISO_8859-15:                             tn_ZA.ISO8859-15
2482  tn_ZA.utf8:                            tn_ZA.UTF-8
2483  tr:                                            tr_TR.ISO8859-9
2484 +tr_CY:                                         tr_CY.ISO8859-9
2485 +tr_CY.iso88599:                                        tr_CY.ISO8859-9
2486 +tr_CY.ISO-8859-9:                              tr_CY.ISO8859-9
2487 +tr_CY.ISO_8859-9:                              tr_CY.ISO8859-9
2488 +tr_CY.utf8:                                    tr_CY.UTF-8
2489  tr_TR:                                         tr_TR.ISO8859-9
2490  TR_TR:                                         tr_TR.ISO8859-9
2491  tr_TR.iso88599:                                        tr_TR.ISO8859-9
2492  tr_TR.ISO-8859-9:                              tr_TR.ISO8859-9
2493 +tr_TR.ISO_8859-9:                              tr_TR.ISO8859-9
2494  tr_TR.utf8:                                    tr_TR.UTF-8
2495  TR_TR.utf8:                                    tr_TR.UTF-8
2496  ts:                                                    ts_ZA.ISO8859-1
2497  ts_ZA:                                         ts_ZA.ISO8859-1
2498  ts_ZA.iso88591:                                ts_ZA.ISO8859-1
2499 +ts_ZA.ISO-8859-1:                              ts_ZA.ISO8859-1
2500 +ts_ZA.ISO_8859-1:                              ts_ZA.ISO8859-1
2501  ts_ZA.utf8:                                    ts_ZA.UTF-8
2502  tt:                                            tt_RU.TATAR-CYR
2503  tt_RU:                                         tt_RU.TATAR-CYR
2504  tt_RU.tatarcyr:                                        tt_RU.TATAR-CYR
2505 -tt_RU.koi8c:                                   tt_RU.KOI8-C
2506 +tt_RU.koi8c:                                   tt_RU.KOI8-K
2507 +tt_RU.koi8k:                                   tt_RU.KOI8-K
2508 +tt_RU.utf8:                                    tt_RU.UTF-8
2509  uk:                                            uk_UA.KOI8-U
2510  uk_UA:                                         uk_UA.KOI8-U
2511  uk_UA.iso88595:                                        uk_UA.ISO8859-5
2512 +uk_UA.ISO-8859-5:                              uk_UA.ISO8859-5
2513 +uk_UA.ISO_8859-5:                              uk_UA.ISO8859-5
2514  uk_UA.koi8u:                                   uk_UA.KOI8-U
2515  uk_UA.cp1251:                                  uk_UA.CP1251
2516  uk_UA.microsoftcp1251:                         uk_UA.CP1251
2517 @@ -1093,35 +1489,53 @@
2518  ur_PK.microsoftcp1256:                         ur_PK.CP1256
2519  ur_PK.microsoft-cp1256:                                ur_PK.CP1256
2520  ur_PK.MICROSOFT-CP1256:                                ur_PK.CP1256
2521 +ur_PK.utf8:                                    ur_PK.UTF-8
2522  uz:                                            uz_UZ.UTF-8
2523  uz_UZ:                                         uz_UZ.UTF-8
2524 +uz_UZ.iso88591:                                        uz_UZ.ISO8859-1
2525  uz_UZ.ISO-8859-1:                              uz_UZ.ISO8859-1
2526 +uz_UZ.ISO_8859-1:                              uz_UZ.ISO8859-1
2527 +uz_UZ.utf8:                                    uz_UZ.UTF-8
2528 +uz@Latn:                                       uz_UZ.ISO8859-1
2529 +uz_UZ@Latn:                                    uz_UZ.ISO8859-1
2530 +uz@cyrillic:                                   uz_UZ.UTF-8
2531  uz_UZ@cyrillic:                                        uz_UZ.UTF-8
2532 +uz_UZ.utf8@cyrillic:                           uz_UZ.UTF-8
2533  uz_UZ.UTF-8@cyrillic:                          uz_UZ.UTF-8
2534  ve:                                            ve_ZA.UTF-8
2535 -ve_ZA:                                 ve_ZA.UTF-8
2536 -ve_ZA.utf8:                            ve_ZA.UTF-8
2537 +ve_ZA:                                         ve_ZA.UTF-8
2538 +ve_ZA.utf8:                                    ve_ZA.UTF-8
2539 +ven:                                           ve_ZA.UTF-8
2540 +ven_ZA:                                                ve_ZA.UTF-8
2541 +ven_ZA.utf8:                                   ve_ZA.UTF-8
2542  vi:                                            vi_VN.TCVN
2543  vi_VN:                                         vi_VN.TCVN
2544  Vi_VN:                                         vi_VN.TCVN
2545  VI_VN:                                         vi_VN.TCVN
2546  vi_VN.tcvn:                                    vi_VN.TCVN
2547  vi_VN.tcvn5712:                                        vi_VN.TCVN
2548 +vi_VN.utf8:                                    vi_VN.UTF-8
2549  vi_VN.viscii:                                  vi_VN.VISCII
2550  vi_VN.viscii111:                               vi_VN.VISCII
2551 -vi_VN.utf8:                                    vi_VN.UTF-8
2552  VI_VN.UTF-8:                                   vi_VN.UTF-8
2553  wa:                                            wa_BE.ISO8859-1
2554  wa_BE:                                         wa_BE.ISO8859-1
2555  wa_BE.iso88591:                                        wa_BE.ISO8859-1
2556  wa_BE.ISO-8859-1:                              wa_BE.ISO8859-1
2557 +wa_BE.ISO_8859-1:                              wa_BE.ISO8859-1
2558  wa_BE.iso885915:                               wa_BE.ISO8859-15
2559  wa_BE.ISO-8859-15:                             wa_BE.ISO8859-15
2560 +wa_BE.ISO_8859-15:                             wa_BE.ISO8859-15
2561 +wa_BE.iso885915@euro:                          wa_BE.ISO8859-15
2562  wa_BE.ISO-8859-15@euro:                                wa_BE.ISO8859-15
2563 +wa_BE.ISO_8859-15@euro:                                wa_BE.ISO8859-15
2564  wa_BE@euro:                                    wa_BE.ISO8859-15
2565 +wa_BE.utf8:                                    wa_BE.UTF-8
2566  xh:                                                    xh_ZA.ISO8859-1
2567  xh_ZA:                                         xh_ZA.ISO8859-1
2568  xh_ZA.iso88591:                                xh_ZA.ISO8859-1
2569 +xh_ZA.ISO-8859-1:                              xh_ZA.ISO8859-1
2570 +xh_ZA.ISO_8859-1:                              xh_ZA.ISO8859-1
2571  xh_ZA.utf8:                                    xh_ZA.UTF-8
2572  yi:                                            yi_US.CP1255
2573  yi_US:                                         yi_US.CP1255
2574 @@ -1129,6 +1543,7 @@
2575  yi_US.microsoftcp1255:                         yi_US.CP1255
2576  yi_US.microsoft-cp1255:                                yi_US.CP1255
2577  yi_US.MICROSOFT-CP1255:                                yi_US.CP1255
2578 +yi_US.utf8:                                    yi_US.UTF-8
2579  zh_CN:                                         zh_CN.gb2312
2580  zh_CN.Big5:                                    zh_TW.big5
2581  zh_CN.EUC:                                     zh_CN.eucCN
2582 @@ -1140,8 +1555,10 @@
2583  zh_CN.utf8:                                    zh_CN.UTF-8
2584  ZH_CN.UTF-8:                                   zh_CN.UTF-8
2585  zh_HK:                                         zh_HK.big5hkscs
2586 +zh_HK.big5-hkscs:                              zh_HK.big5hkscs
2587  zh_HK.Big5hkscs:                               zh_HK.big5hkscs
2588  zh_HK.Big5-hkscs:                              zh_HK.big5hkscs
2589 +zh_HK.Big5-HKSCS:                              zh_HK.big5hkscs
2590  zh_HK.Big5_hkscs:                              zh_HK.big5hkscs
2591  zh_HK.Big5HKSCS:                               zh_HK.big5hkscs
2592  zh_HK.BIG5-HKSCS:                              zh_HK.big5hkscs
2593 @@ -1149,6 +1566,10 @@
2594  zh_HK.Big5:                                    zh_HK.big5
2595  zh_HK.utf8:                                    zh_HK.UTF-8
2596  ZH_HK.UTF-8:                                   zh_HK.UTF-8
2597 +zh_SG:                                         zh_SG.gb2312
2598 +zh_SG.GB2312:                                  zh_SG.gb2312
2599 +zh_SG.GBK:                                     zh_SG.gbk
2600 +zh_SG.utf8:                                    zh_SG.UTF-8
2601  ZH_SG.UTF-8:                                   zh_SG.UTF-8
2602  zh_TW:                                         zh_TW.big5
2603  zh_TW.Big5:                                    zh_TW.big5
2604 @@ -1158,9 +1579,11 @@
2605  zh_TW.EUC-TW:                                  zh_TW.eucTW
2606  zh_TW.utf8:                                    zh_TW.UTF-8
2607  ZH_TW.UTF-8:                                   zh_TW.UTF-8
2608 -zu:                                                    zu_ZA.ISO8859-1
2609 +zu:                                            zu_ZA.ISO8859-1
2610  zu_ZA:                                         zu_ZA.ISO8859-1
2611 -zu_ZA.iso88591:                                zu_ZA.ISO8859-1
2612 +zu_ZA.iso88591:                                        zu_ZA.ISO8859-1
2613 +zu_ZA.ISO-8859-1:                              zu_ZA.ISO8859-1
2614 +zu_ZA.ISO_8859-1:                              zu_ZA.ISO8859-1
2615  zu_ZA.utf8:                                    zu_ZA.UTF-8
2616  
2617  XCOMM The following locale names are used in SCO 3.0
2618 --- libX11-1.1.4/nls/locale.dir.pre.orig        2008-03-06 21:45:06.000000000 +0100
2619 +++ libX11-1.1.4/nls/locale.dir.pre     2008-03-07 23:25:54.322403116 +0100
2620 @@ -9,8 +9,11 @@
2621  XCOMM
2622  
2623  C/XLC_LOCALE:                          C
2624 +iso8859-1/XLC_LOCALE:                  aa_DJ.ISO8859-1
2625  iso8859-1/XLC_LOCALE:                  af_ZA.ISO8859-1
2626 +iso8859-15/XLC_LOCALE:                 an_ES.ISO8859-15
2627  iso8859-6/XLC_LOCALE:                  ar_AA.ISO8859-6
2628 +iso8859-6/XLC_LOCALE:                  ar_AE.ISO8859-6
2629  iso8859-6/XLC_LOCALE:                  ar_BH.ISO8859-6
2630  iso8859-6/XLC_LOCALE:                  ar_DZ.ISO8859-6
2631  iso8859-6/XLC_LOCALE:                  ar_EG.ISO8859-6
2632 @@ -28,7 +31,7 @@
2633  iso8859-6/XLC_LOCALE:                  ar_TN.ISO8859-6
2634  iso8859-6/XLC_LOCALE:                  ar_YE.ISO8859-6
2635  iso8859-9e/XLC_LOCALE:                 az_AZ.ISO8859-9E
2636 -koi8-c/XLC_LOCALE:                     az_AZ.KOI8-C
2637 +koi8-c/XLC_LOCALE:                     az_AZ.KOI8-K
2638  iso8859-5/XLC_LOCALE:                  be_BY.ISO8859-5
2639  microsoft-cp1251/XLC_LOCALE:           be_BY.CP1251
2640  iso8859-5/XLC_LOCALE:                  bg_BG.ISO8859-5
2641 @@ -38,6 +41,7 @@
2642  iso8859-1/XLC_LOCALE:                  br_FR.ISO8859-1
2643  iso8859-14/XLC_LOCALE:                 br_FR.ISO8859-14
2644  iso8859-15/XLC_LOCALE:                 br_FR.ISO8859-15
2645 +iso8859-2/XLC_LOCALE:                  bs_BA.ISO8859-2
2646  iso8859-1/XLC_LOCALE:                  ca_AD.ISO8859-1
2647  iso8859-15/XLC_LOCALE:                 ca_AD.ISO8859-15
2648  iso8859-1/XLC_LOCALE:                  ca_ES.ISO8859-1
2649 @@ -50,7 +54,6 @@
2650  iso8859-1/XLC_LOCALE:                  cy_GB.ISO8859-1
2651  iso8859-14/XLC_LOCALE:                 cy_GB.ISO8859-14
2652  iso8859-15/XLC_LOCALE:                 cy_GB.ISO8859-15
2653 -iso8859-2/XLC_LOCALE:                  cz_CZ.ISO8859-2
2654  iso8859-1/XLC_LOCALE:                  da_DK.ISO8859-1
2655  iso8859-15/XLC_LOCALE:                 da_DK.ISO8859-15
2656  iso8859-1/XLC_LOCALE:                  de_AT.ISO8859-1
2657 @@ -64,13 +67,14 @@
2658  iso8859-1/XLC_LOCALE:                  de_LI.ISO8859-1
2659  iso8859-1/XLC_LOCALE:                  de_LU.ISO8859-1
2660  iso8859-15/XLC_LOCALE:                 de_LU.ISO8859-15
2661 +iso8859-7/XLC_LOCALE:                  el_CY.ISO8859-7
2662  iso8859-7/XLC_LOCALE:                  el_GR.ISO8859-7
2663 -iso8859-15/XLC_LOCALE:                 el_GR.ISO8859-15
2664  iso8859-1/XLC_LOCALE:                  en_AU.ISO8859-1
2665  iso8859-1/XLC_LOCALE:                  en_BE.ISO8859-1
2666 -iso8859-1/XLC_LOCALE:                  en_BZ.ISO8859-1
2667  iso8859-1/XLC_LOCALE:                  en_BW.ISO8859-1
2668 +iso8859-1/XLC_LOCALE:                  en_BZ.ISO8859-1
2669  iso8859-1/XLC_LOCALE:                  en_CA.ISO8859-1
2670 +iso8859-1/XLC_LOCALE:                  en_DK.ISO8859-1
2671  iso8859-1/XLC_LOCALE:                  en_GB.ISO8859-1
2672  iso8859-15/XLC_LOCALE:                 en_GB.ISO8859-15
2673  iso8859-1/XLC_LOCALE:                  en_HK.ISO8859-1
2674 @@ -82,8 +86,6 @@
2675  iso8859-1/XLC_LOCALE:                  en_PH.ISO8859-1
2676  iso8859-1/XLC_LOCALE:                  en_SG.ISO8859-1
2677  iso8859-1/XLC_LOCALE:                  en_TT.ISO8859-1
2678 -iso8859-1/XLC_LOCALE:                  en_UK.ISO8859-1
2679 -iso8859-15/XLC_LOCALE:                 en_UK.ISO8859-15
2680  iso8859-1/XLC_LOCALE:                  en_US.ISO8859-1
2681  iso8859-15/XLC_LOCALE:                 en_US.ISO8859-15
2682  iso8859-1/XLC_LOCALE:                  en_ZA.ISO8859-1
2683 @@ -120,6 +122,7 @@
2684  isiri-3342/XLC_LOCALE:                 fa_IR.ISIRI-3342
2685  iso8859-1/XLC_LOCALE:                  fi_FI.ISO8859-1
2686  iso8859-15/XLC_LOCALE:                 fi_FI.ISO8859-15
2687 +iso8859-1/XLC_LOCALE:                  fil_PH.ISO8859-1
2688  iso8859-1/XLC_LOCALE:                  fo_FO.ISO8859-1
2689  iso8859-15/XLC_LOCALE:                 fo_FO.ISO8859-15
2690  iso8859-1/XLC_LOCALE:                  fr_BE.ISO8859-1
2691 @@ -147,7 +150,9 @@
2692  microsoft-cp1255/XLC_LOCALE:           he_IL.CP1255
2693  iscii-dev/XLC_LOCALE:                  hi_IN.ISCII-DEV
2694  iso8859-2/XLC_LOCALE:                  hr_HR.ISO8859-2
2695 +iso8859-2/XLC_LOCALE:                  hsb_DE.ISO8859-2
2696  iso8859-2/XLC_LOCALE:                  hu_HU.ISO8859-2
2697 +iso8859-16/XLC_LOCALE:                 hu_HU.ISO8859-16
2698  armscii-8/XLC_LOCALE:                  hy_AM.ARMSCII-8
2699  iso8859-1/XLC_LOCALE:                  id_ID.ISO8859-1
2700  iso8859-1/XLC_LOCALE:                  is_IS.ISO8859-1
2701 @@ -160,62 +165,71 @@
2702  ja.JIS/XLC_LOCALE:                     ja_JP.JIS7
2703  georgian-academy/XLC_LOCALE:           ka_GE.GEORGIAN-ACADEMY
2704  georgian-ps/XLC_LOCALE:                        ka_GE.GEORGIAN-PS
2705 +XCOMM pt-154/XLC_LOCALE:                       kk_KZ.PT154
2706  iso8859-1/XLC_LOCALE:                  kl_GL.ISO8859-1
2707  ko/XLC_LOCALE:                         ko_KR.eucKR
2708  iso8859-1/XLC_LOCALE:                  kw_GB.ISO8859-1
2709  iso8859-14/XLC_LOCALE:                 kw_GB.ISO8859-14
2710  iso8859-15/XLC_LOCALE:                 kw_GB.ISO8859-15
2711 +iso8859-10/XLC_LOCALE:                 lg_UG.ISO8859-10
2712 +iso8859-1/XLC_LOCALE:                  li_BE.ISO8859-1
2713 +iso8859-15/XLC_LOCALE:                 li_BE.ISO8859-15
2714 +iso8859-1/XLC_LOCALE:                  li_NL.ISO8859-1
2715 +iso8859-15/XLC_LOCALE:                 li_NL.ISO8859-15
2716  ibm-cp1133/XLC_LOCALE:                 lo_LA.IBM-CP1133
2717  mulelao-1/XLC_LOCALE:                  lo_LA.MULELAO-1
2718  iso8859-4/XLC_LOCALE:                  lt_LT.ISO8859-4
2719  iso8859-13/XLC_LOCALE:                 lt_LT.ISO8859-13
2720  iso8859-4/XLC_LOCALE:                  lv_LV.ISO8859-4
2721  iso8859-13/XLC_LOCALE:                 lv_LV.ISO8859-13
2722 -iso8859-13/XLC_LOCALE:                 mi_NZ.ISO8859-13
2723 +iso8859-1/XLC_LOCALE:                  mi_NZ.ISO8859-1
2724  iso8859-5/XLC_LOCALE:                  mk_MK.ISO8859-5
2725  microsoft-cp1251/XLC_LOCALE:           mk_MK.CP1251
2726  iso8859-1/XLC_LOCALE:                  ms_MY.ISO8859-1
2727  iso8859-3/XLC_LOCALE:                  mt_MT.ISO8859-3
2728  iso8859-1/XLC_LOCALE:                  nb_NO.ISO8859-1
2729 -iso8859-1/XLC_LOCALE:                  nb_NO.ISO8859-15
2730 +iso8859-15/XLC_LOCALE:                 nb_NO.ISO8859-15
2731 +iso8859-1/XLC_LOCALE:                  nds_DE.ISO8859-1
2732 +iso8859-15/XLC_LOCALE:                 nds_DE.ISO8859-15
2733  iso8859-1/XLC_LOCALE:                  nl_BE.ISO8859-1
2734  iso8859-15/XLC_LOCALE:                 nl_BE.ISO8859-15
2735  iso8859-1/XLC_LOCALE:                  nl_NL.ISO8859-1
2736  iso8859-15/XLC_LOCALE:                 nl_NL.ISO8859-15
2737  iso8859-1/XLC_LOCALE:                  nn_NO.ISO8859-1
2738  iso8859-1/XLC_LOCALE:                  nn_NO.ISO8859-15
2739 -iso8859-1/XLC_LOCALE:                  no_NO.ISO8859-1
2740 -iso8859-1/XLC_LOCALE:                  no_NO.ISO8859-15
2741  iso8859-1/XLC_LOCALE:                  nr_ZA.ISO8859-1
2742 -iso8859-15/XLC_LOCALE:                 nso_ZA.ISO8859-15
2743 -iso8859-1/XLC_LOCALE:                  ny_NO.ISO8859-1
2744 -iso8859-1/XLC_LOCALE:                  ny_NO.ISO8859-15
2745 +iso8859-10/XLC_LOCALE:                 nso_ZA.ISO8859-10
2746  iso8859-1/XLC_LOCALE:                  oc_FR.ISO8859-1
2747  iso8859-15/XLC_LOCALE:                 oc_FR.ISO8859-15
2748 +iso8859-1/XLC_LOCALE:                  om_KE.ISO8859-1
2749 +iso8859-1/XLC_LOCALE:                  pap_AN.ISO8859-1
2750 +iso8859-15/XLC_LOCALE:                 pap_AN.ISO8859-15
2751  iso8859-1/XLC_LOCALE:                  pd_DE.ISO8859-1
2752 -iso8859-1/XLC_LOCALE:                  ph_PH.ISO8859-1
2753  iso8859-2/XLC_LOCALE:                  pl_PL.ISO8859-2
2754 -iso8859-1/XLC_LOCALE:                  pp_AN.ISO8859-1
2755 +iso8859-16/XLC_LOCALE:                 pl_PL.ISO8859-16
2756  iso8859-1/XLC_LOCALE:                  pt_BR.ISO8859-1
2757  iso8859-1/XLC_LOCALE:                  pt_PT.ISO8859-1
2758  iso8859-15/XLC_LOCALE:                 pt_PT.ISO8859-15
2759  iso8859-2/XLC_LOCALE:                  ro_RO.ISO8859-2
2760 +iso8859-16/XLC_LOCALE:                 ro_RO.ISO8859-16
2761  iso8859-5/XLC_LOCALE:                  ru_RU.ISO8859-5
2762  microsoft-cp1251/XLC_LOCALE:           ru_RU.CP1251
2763  koi8-r/XLC_LOCALE:                     ru_RU.KOI8-R
2764  koi8-u/XLC_LOCALE:                     ru_UA.KOI8-U
2765 +microsoft-cp1251/XLC_LOCALE:           ru_UA.CP1251
2766  iso8859-1/XLC_LOCALE:           rw_RW.ISO8859-1
2767 -iso8859-2/XLC_LOCALE:                  sh_YU.ISO8859-2
2768  iso8859-2/XLC_LOCALE:                  sk_SK.ISO8859-2
2769  iso8859-2/XLC_LOCALE:                  sl_SI.ISO8859-2
2770 -iso8859-5/XLC_LOCALE:                  sp_YU.ISO8859-5
2771 -iso8859-2/XLC_LOCALE:                  sq_AL.ISO8859-2
2772 +iso8859-16/XLC_LOCALE:                         sl_SI.ISO8859-16
2773 +iso8859-16/XLC_LOCALE:                 sl_SI.ISO8859-16
2774 +iso8859-1/XLC_LOCALE:                  so_DJ.ISO8859-1
2775 +iso8859-1/XLC_LOCALE:                  so_KE.ISO8859-1
2776 +iso8859-1/XLC_LOCALE:                  so_SO.ISO8859-1
2777 +iso8859-1/XLC_LOCALE:                  sq_AL.ISO8859-1
2778  iso8859-2/XLC_LOCALE:                  sr_CS.ISO8859-2
2779  iso8859-5/XLC_LOCALE:                  sr_CS.ISO8859-5
2780 -iso8859-2/XLC_LOCALE:                  sr_SP.ISO8859-2
2781 -iso8859-2/XLC_LOCALE:                  sr_YU.ISO8859-2
2782 -iso8859-5/XLC_LOCALE:                  sr_YU.ISO8859-5
2783 -microsoft-cp1251/XLC_LOCALE:           sr_YU.CP1251
2784 +microsoft-cp1251/XLC_LOCALE:           sr_CS.CP1251
2785 +iso8859-5/XLC_LOCALE:                  sr_ME.ISO8859-5
2786  iso8859-1/XLC_LOCALE:                  ss_ZA.ISO8859-1
2787  iso8859-1/XLC_LOCALE:                  st_ZA.ISO8859-1
2788  iso8859-1/XLC_LOCALE:                  sv_FI.ISO8859-1
2789 @@ -223,19 +237,22 @@
2790  iso8859-1/XLC_LOCALE:                  sv_SE.ISO8859-1
2791  iso8859-15/XLC_LOCALE:                 sv_SE.ISO8859-15
2792  tscii-0/XLC_LOCALE:                    ta_IN.TSCII-0
2793 -koi8-c/XLC_LOCALE:                     tg_TJ.KOI8-C
2794 +koi8-c/XLC_LOCALE:                     tg_TJ.KOI8-K
2795 +koi8-t/XLC_LOCALE:                     tg_TJ.KOI8-T
2796  th_TH/XLC_LOCALE:                      th_TH.TIS620
2797  iso8859-11/XLC_LOCALE:                 th_TH.ISO8859-11
2798  iso8859-1/XLC_LOCALE:                  tl_PH.ISO8859-1
2799 -iso8859-15/XLC_LOCALE:                 tn_ZA.ISO8859-15
2800 +iso8859-10/XLC_LOCALE:                 tn_ZA.ISO8859-10
2801 +iso8859-9/XLC_LOCALE:                  tr_CY.ISO8859-9
2802  iso8859-9/XLC_LOCALE:                  tr_TR.ISO8859-9
2803  iso8859-1/XLC_LOCALE:                  ts_ZA.ISO8859-1
2804  tatar-cyr/XLC_LOCALE:                  tt_RU.TATAR-CYR
2805 -koi8-c/XLC_LOCALE:                     tt_RU.KOI8-C
2806 +koi8-c/XLC_LOCALE:                     tt_RU.KOI8-K
2807  iso8859-5/XLC_LOCALE:                  uk_UA.ISO8859-5
2808  microsoft-cp1251/XLC_LOCALE:           uk_UA.CP1251
2809  koi8-u/XLC_LOCALE:                     uk_UA.KOI8-U
2810  microsoft-cp1256/XLC_LOCALE:           ur_PK.CP1256
2811 +iso8859-1/XLC_LOCALE:                  uz_UZ.ISO8859-1
2812  vi_VN.tcvn/XLC_LOCALE:                 vi_VN.TCVN
2813  vi_VN.viscii/XLC_LOCALE:               vi_VN.VISCII
2814  iso8859-1/XLC_LOCALE:                  wa_BE.ISO8859-1
2815 @@ -247,21 +264,23 @@
2816  zh_CN.gbk/XLC_LOCALE:                  zh_CN.gbk
2817  zh_CN.gb18030/XLC_LOCALE:              zh_CN.gb18030
2818  zh_HK.big5/XLC_LOCALE:                 zh_HK.big5
2819 -zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.big5-hkscs
2820 -zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.Big5-HKSCS
2821  zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.big5hkscs
2822 -zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.Big5HKSCS
2823  zh_TW.big5/XLC_LOCALE:                 zh_TW.big5
2824  zh_TW/XLC_LOCALE:                      zh_TW.eucTW
2825  iso8859-1/XLC_LOCALE:                  zu_ZA.ISO8859-1
2826  XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
2827 +en_US.UTF-8/XLC_LOCALE:                        aa_DJ.UTF-8
2828 +en_US.UTF-8/XLC_LOCALE:                        aa_ER.UTF-8
2829 +en_US.UTF-8/XLC_LOCALE:                        aa_ET.UTF-8
2830  en_US.UTF-8/XLC_LOCALE:                        af_ZA.UTF-8
2831  en_US.UTF-8/XLC_LOCALE:                        am_ET.UTF-8
2832 +en_US.UTF-8/XLC_LOCALE:                        an_ES.UTF-8
2833  en_US.UTF-8/XLC_LOCALE:                        ar_AA.UTF-8
2834  en_US.UTF-8/XLC_LOCALE:                        ar_AE.UTF-8
2835  en_US.UTF-8/XLC_LOCALE:                        ar_BH.UTF-8
2836  en_US.UTF-8/XLC_LOCALE:                        ar_DZ.UTF-8
2837  en_US.UTF-8/XLC_LOCALE:                        ar_EG.UTF-8
2838 +en_US.UTF-8/XLC_LOCALE:                        ar_IN.UTF-8
2839  en_US.UTF-8/XLC_LOCALE:                        ar_IQ.UTF-8
2840  en_US.UTF-8/XLC_LOCALE:                        ar_JO.UTF-8
2841  en_US.UTF-8/XLC_LOCALE:                        ar_KW.UTF-8
2842 @@ -278,19 +297,20 @@
2843  en_US.UTF-8/XLC_LOCALE:                        ar_YE.UTF-8
2844  en_US.UTF-8/XLC_LOCALE:                        as_IN.UTF-8
2845  en_US.UTF-8/XLC_LOCALE:                        az_AZ.UTF-8
2846 -en_US.UTF-8/XLC_LOCALE:                        a3_AZ.UTF-8
2847  en_US.UTF-8/XLC_LOCALE:                        be_BY.UTF-8
2848  en_US.UTF-8/XLC_LOCALE:                        bg_BG.UTF-8
2849  en_US.UTF-8/XLC_LOCALE:                        bn_BD.UTF-8
2850  en_US.UTF-8/XLC_LOCALE:                        bn_IN.UTF-8
2851  en_US.UTF-8/XLC_LOCALE:                        br_FR.UTF-8
2852 +en_US.UTF-8/XLC_LOCALE:                        bs_BA.UTF-8
2853 +en_US.UTF-8/XLC_LOCALE:                        byn_ER.UTF-8
2854  en_US.UTF-8/XLC_LOCALE:                        ca_AD.UTF-8
2855  en_US.UTF-8/XLC_LOCALE:                        ca_ES.UTF-8
2856  en_US.UTF-8/XLC_LOCALE:                        ca_FR.UTF-8
2857  en_US.UTF-8/XLC_LOCALE:                        ca_IT.UTF-8
2858  en_US.UTF-8/XLC_LOCALE:                        cs_CZ.UTF-8
2859 +en_US.UTF-8/XLC_LOCALE:                        csb_PL.UTF-8
2860  en_US.UTF-8/XLC_LOCALE:                        cy_GB.UTF-8
2861 -en_US.UTF-8/XLC_LOCALE:                        cs_CZ.UTF-8
2862  en_US.UTF-8/XLC_LOCALE:                        da_DK.UTF-8
2863  en_US.UTF-8/XLC_LOCALE:                        de_AT.UTF-8
2864  en_US.UTF-8/XLC_LOCALE:                        de_BE.UTF-8
2865 @@ -298,19 +318,26 @@
2866  en_US.UTF-8/XLC_LOCALE:                        de_DE.UTF-8
2867  en_US.UTF-8/XLC_LOCALE:                        de_LI.UTF-8
2868  en_US.UTF-8/XLC_LOCALE:                        de_LU.UTF-8
2869 +en_US.UTF-8/XLC_LOCALE:                        el_CY.UTF-8
2870  en_US.UTF-8/XLC_LOCALE:                        el_GR.UTF-8
2871  en_US.UTF-8/XLC_LOCALE:                        en_AU.UTF-8
2872  en_US.UTF-8/XLC_LOCALE:                        en_BE.UTF-8
2873 +en_US.UTF-8/XLC_LOCALE:                        en_BW.UTF-8
2874  en_US.UTF-8/XLC_LOCALE:                        en_BZ.UTF-8
2875  en_US.UTF-8/XLC_LOCALE:                        en_CA.UTF-8
2876 +en_US.UTF-8/XLC_LOCALE:                        en_DK.UTF-8
2877  en_US.UTF-8/XLC_LOCALE:                        en_GB.UTF-8
2878 +en_US.UTF-8/XLC_LOCALE:                        en_HK.UTF-8
2879  en_US.UTF-8/XLC_LOCALE:                        en_IE.UTF-8
2880 +en_US.UTF-8/XLC_LOCALE:                        en_IN.UTF-8
2881  en_US.UTF-8/XLC_LOCALE:                        en_JM.UTF-8
2882  en_US.UTF-8/XLC_LOCALE:                        en_NZ.UTF-8
2883 +en_US.UTF-8/XLC_LOCALE:                        en_PH.UTF-8
2884 +en_US.UTF-8/XLC_LOCALE:                        en_SG.UTF-8
2885  en_US.UTF-8/XLC_LOCALE:                        en_TT.UTF-8
2886 -en_US.UTF-8/XLC_LOCALE:                        en_UK.UTF-8
2887  en_US.UTF-8/XLC_LOCALE:                        en_US.UTF-8
2888  en_US.UTF-8/XLC_LOCALE:                        en_ZA.UTF-8
2889 +en_US.UTF-8/XLC_LOCALE:                        en_ZW.UTF-8
2890  en_US.UTF-8/XLC_LOCALE:                        eo_EO.UTF-8
2891  en_US.UTF-8/XLC_LOCALE:                        eo_XX.UTF-8
2892  en_US.UTF-8/XLC_LOCALE:                        es_AR.UTF-8
2893 @@ -330,12 +357,14 @@
2894  en_US.UTF-8/XLC_LOCALE:                        es_PR.UTF-8
2895  en_US.UTF-8/XLC_LOCALE:                        es_PY.UTF-8
2896  en_US.UTF-8/XLC_LOCALE:                        es_SV.UTF-8
2897 +en_US.UTF-8/XLC_LOCALE:                        es_US.UTF-8
2898  en_US.UTF-8/XLC_LOCALE:                        es_UY.UTF-8
2899  en_US.UTF-8/XLC_LOCALE:                        es_VE.UTF-8
2900  en_US.UTF-8/XLC_LOCALE:                        et_EE.UTF-8
2901  en_US.UTF-8/XLC_LOCALE:                        eu_ES.UTF-8
2902  en_US.UTF-8/XLC_LOCALE:                        fa_IR.UTF-8
2903  en_US.UTF-8/XLC_LOCALE:                        fi_FI.UTF-8
2904 +en_US.UTF-8/XLC_LOCALE:                        fil_PH.UTF-8
2905  en_US.UTF-8/XLC_LOCALE:                        fo_FO.UTF-8
2906  en_US.UTF-8/XLC_LOCALE:                        fr_BE.UTF-8
2907  en_US.UTF-8/XLC_LOCALE:                        fr_CA.UTF-8
2908 @@ -344,12 +373,14 @@
2909  en_US.UTF-8/XLC_LOCALE:                        fr_LU.UTF-8
2910  en_US.UTF-8/XLC_LOCALE:                        ga_IE.UTF-8
2911  en_US.UTF-8/XLC_LOCALE:                        gd_GB.UTF-8
2912 +en_US.UTF-8/XLC_LOCALE:                        gez_ER.UTF-8
2913  en_US.UTF-8/XLC_LOCALE:                        gl_ES.UTF-8
2914  en_US.UTF-8/XLC_LOCALE:                        gu_IN.UTF-8
2915  en_US.UTF-8/XLC_LOCALE:                        gv_GB.UTF-8
2916  en_US.UTF-8/XLC_LOCALE:                        he_IL.UTF-8
2917  en_US.UTF-8/XLC_LOCALE:                        hi_IN.UTF-8
2918  en_US.UTF-8/XLC_LOCALE:                        hr_HR.UTF-8
2919 +en_US.UTF-8/XLC_LOCALE:                        hsb_DE.UTF-8
2920  en_US.UTF-8/XLC_LOCALE:                        hu_HU.UTF-8
2921  en_US.UTF-8/XLC_LOCALE:                        hy_AM.UTF-8
2922  en_US.UTF-8/XLC_LOCALE:                        id_ID.UTF-8
2923 @@ -359,35 +390,42 @@
2924  en_US.UTF-8/XLC_LOCALE:                        iu_CA.UTF-8
2925  ja_JP.UTF-8/XLC_LOCALE:                        ja_JP.UTF-8
2926  en_US.UTF-8/XLC_LOCALE:                        ka_GE.UTF-8
2927 +en_US.UTF-8/XLC_LOCALE:                        kk_KZ.UTF-8
2928  en_US.UTF-8/XLC_LOCALE:                        kl_GL.UTF-8
2929  en_US.UTF-8/XLC_LOCALE:                        kn_IN.UTF-8
2930  ko_KR.UTF-8/XLC_LOCALE:                        ko_KR.UTF-8
2931 +en_US.UTF-8/XLC_LOCALE:                        ku_TR.UTF-8
2932  en_US.UTF-8/XLC_LOCALE:                        kw_GB.UTF-8
2933  en_US.UTF-8/XLC_LOCALE:                        ky_KG.UTF-8
2934 +en_US.UTF-8/XLC_LOCALE:                        lg_UG.UTF-8
2935 +en_US.UTF-8/XLC_LOCALE:                        li_BE.UTF-8
2936 +en_US.UTF-8/XLC_LOCALE:                        li_NL.UTF-8
2937  en_US.UTF-8/XLC_LOCALE:                        lo_LA.UTF-8
2938  en_US.UTF-8/XLC_LOCALE:                        lt_LT.UTF-8
2939  en_US.UTF-8/XLC_LOCALE:                        lv_LV.UTF-8
2940  en_US.UTF-8/XLC_LOCALE:                        mi_NZ.UTF-8
2941  en_US.UTF-8/XLC_LOCALE:                        mk_MK.UTF-8
2942  en_US.UTF-8/XLC_LOCALE:                        ml_IN.UTF-8
2943 +en_US.UTF-8/XLC_LOCALE:                        mn_MN.UTF-8
2944  en_US.UTF-8/XLC_LOCALE:                        mr_IN.UTF-8
2945  en_US.UTF-8/XLC_LOCALE:                        ms_MY.UTF-8
2946 +en_US.UTF-8/XLC_LOCALE:                        mt_MT.UTF-8
2947 +en_US.UTF-8/XLC_LOCALE:                        nb_NO.UTF-8
2948 +en_US.UTF-8/XLC_LOCALE:                        nds_DE.UTF-8
2949  en_US.UTF-8/XLC_LOCALE:                        nl_BE.UTF-8
2950  en_US.UTF-8/XLC_LOCALE:                        nl_NL.UTF-8
2951 -en_US.UTF-8/XLC_LOCALE:                        nb_NO.UTF-8
2952  en_US.UTF-8/XLC_LOCALE:                        nn_NO.UTF-8
2953 -en_US.UTF-8/XLC_LOCALE:                        no_NO.UTF-8
2954  en_US.UTF-8/XLC_LOCALE:                        nr_ZA.UTF-8
2955  en_US.UTF-8/XLC_LOCALE:                        nso_ZA.UTF-8
2956 -en_US.UTF-8/XLC_LOCALE:                        ny_NO.UTF-8
2957  en_US.UTF-8/XLC_LOCALE:                        oc_FR.UTF-8
2958 +en_US.UTF-8/XLC_LOCALE:                        om_ET.UTF-8
2959 +en_US.UTF-8/XLC_LOCALE:                        om_KE.UTF-8
2960  en_US.UTF-8/XLC_LOCALE:                        or_IN.UTF-8
2961  en_US.UTF-8/XLC_LOCALE:                        pa_IN.UTF-8
2962 +en_US.UTF-8/XLC_LOCALE:                        pap_AN.UTF-8
2963  en_US.UTF-8/XLC_LOCALE:                        pd_DE.UTF-8
2964  en_US.UTF-8/XLC_LOCALE:                        pd_US.UTF-8
2965 -en_US.UTF-8/XLC_LOCALE:                        ph_PH.UTF-8
2966  en_US.UTF-8/XLC_LOCALE:                        pl_PL.UTF-8
2967 -en_US.UTF-8/XLC_LOCALE:                        pp_AN.UTF-8
2968  pt_BR.UTF-8/XLC_LOCALE:                        pt_BR.UTF-8
2969  en_US.UTF-8/XLC_LOCALE:                        pt_PT.UTF-8
2970  en_US.UTF-8/XLC_LOCALE:                        ro_RO.UTF-8
2971 @@ -395,13 +433,17 @@
2972  en_US.UTF-8/XLC_LOCALE:                        ru_UA.UTF-8
2973  en_US.UTF-8/XLC_LOCALE:         rw_RW.UTF-8
2974  en_US.UTF-8/XLC_LOCALE:                        se_NO.UTF-8
2975 -en_US.UTF-8/XLC_LOCALE:                        sh_YU.UTF-8
2976  en_US.UTF-8/XLC_LOCALE:                        si_LK.UTF-8
2977 +en_US.UTF-8/XLC_LOCALE:                        sid_ET.UTF-8
2978  en_US.UTF-8/XLC_LOCALE:                        sk_SK.UTF-8
2979  en_US.UTF-8/XLC_LOCALE:                        sl_SI.UTF-8
2980 +en_US.UTF-8/XLC_LOCALE:                        so_DJ.UTF-8
2981 +en_US.UTF-8/XLC_LOCALE:                        so_ET.UTF-8
2982 +en_US.UTF-8/XLC_LOCALE:                        so_KE.UTF-8
2983 +en_US.UTF-8/XLC_LOCALE:                        so_SO.UTF-8
2984  en_US.UTF-8/XLC_LOCALE:                        sq_AL.UTF-8
2985  en_US.UTF-8/XLC_LOCALE:                        sr_CS.UTF-8
2986 -en_US.UTF-8/XLC_LOCALE:                        sr_YU.UTF-8
2987 +en_US.UTF-8/XLC_LOCALE:                        sr_ME.UTF-8
2988  en_US.UTF-8/XLC_LOCALE:                        ss_ZA.UTF-8
2989  en_US.UTF-8/XLC_LOCALE:                        st_ZA.UTF-8
2990  en_US.UTF-8/XLC_LOCALE:                        sv_FI.UTF-8
2991 @@ -412,8 +454,11 @@
2992  th_TH.UTF-8/XLC_LOCALE:                        th_TH.UTF-8
2993  en_US.UTF-8/XLC_LOCALE:                        ti_ER.UTF-8
2994  en_US.UTF-8/XLC_LOCALE:                        ti_ET.UTF-8
2995 +en_US.UTF-8/XLC_LOCALE:                        tig_ER.UTF-8
2996 +en_US.UTF-8/XLC_LOCALE:                        tk_TM.UTF-8
2997  en_US.UTF-8/XLC_LOCALE:                        tl_PH.UTF-8
2998  en_US.UTF-8/XLC_LOCALE:                        tn_ZA.UTF-8
2999 +en_US.UTF-8/XLC_LOCALE:                        tr_CY.UTF-8
3000  en_US.UTF-8/XLC_LOCALE:                        tr_TR.UTF-8
3001  en_US.UTF-8/XLC_LOCALE:                        ts_ZA.UTF-8
3002  en_US.UTF-8/XLC_LOCALE:                        tt_RU.UTF-8
3003 --- libX11-1.0.2/configure.ac.orig      2006-06-23 01:22:12.000000000 +0200
3004 +++ libX11-1.0.2/configure.ac   2006-06-29 23:06:03.183418500 +0200
3005 @@ -374,6 +374,7 @@
3006            nls/iso8859-13/Makefile
3007            nls/iso8859-14/Makefile
3008            nls/iso8859-15/Makefile
3009 +          nls/iso8859-16/Makefile
3010            nls/iso8859-2/Makefile
3011            nls/iso8859-3/Makefile
3012            nls/iso8859-4/Makefile
3013 @@ -392,6 +393,7 @@
3014            nls/ko/Makefile
3015            nls/koi8-c/Makefile
3016            nls/koi8-r/Makefile
3017 +          nls/koi8-t/Makefile
3018            nls/koi8-u/Makefile
3019            nls/ko_KR.UTF-8/Makefile
3020            nls/microsoft-cp1251/Makefile
This page took 0.284602 seconds and 4 git commands to generate.