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