]> git.pld-linux.org Git - packages/X11.git/blob - X11-glibc-locale_sync.patch
synces X11 locale encodings with glibc locale
[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.8.1/xc/nls/locale.dir.orig    2004-09-22 09:38:51.000000000 +0200
451 +++ X11-6.8.1/xc/nls/locale.dir 2004-11-23 05:15:48.000000000 +0100
452 @@ -1 +1,2 @@
453 +#      $XdotOrg: xc/nls/locale.dir,v 1.2 2004/04/23 18:44:33 eich Exp $
454  XCOMM  $XdotOrg: xc/nls/locale.dir,v 1.2 2004/04/23 18:44:33 eich Exp $
455 @@ -11,4 +12,7 @@
456  C/XLC_LOCALE:                          C
457 +iso8859-1/XLC_LOCALE:                  aa_DJ.ISO8859-1
458  iso8859-1/XLC_LOCALE:                  af_ZA.ISO8859-1
459 +iso8859-15/XLC_LOCALE:                 an_ES.ISO8859-15
460  iso8859-6/XLC_LOCALE:                  ar_AA.ISO8859-6
461 +iso8859-6/XLC_LOCALE:                  ar_AE.ISO8859-6
462  iso8859-6/XLC_LOCALE:                  ar_BH.ISO8859-6
463 @@ -27,2 +31,4 @@
464  iso8859-6/XLC_LOCALE:                  ar_SY.ISO8859-6
465 +iso8859-6/XLC_LOCALE:                  ar_SD.ISO8859-6
466 +iso8859-6/XLC_LOCALE:                  ar_SY.ISO8859-6
467  iso8859-6/XLC_LOCALE:                  ar_TN.ISO8859-6
468 @@ -39,2 +45,3 @@
469  iso8859-15/XLC_LOCALE:                 br_FR.ISO8859-15
470 +iso8859-2/XLC_LOCALE:                  bs_BA.ISO8859-2
471  iso8859-1/XLC_LOCALE:                  ca_ES.ISO8859-1
472 @@ -45,3 +52,2 @@
473  iso8859-15/XLC_LOCALE:                 cy_GB.ISO8859-15
474 -iso8859-2/XLC_LOCALE:                  cz_CZ.ISO8859-2
475  iso8859-1/XLC_LOCALE:                  da_DK.ISO8859-1
476 @@ -59,9 +65,10 @@
477  iso8859-15/XLC_LOCALE:                 de_LU.ISO8859-15
478 +iso8859-7/XLC_LOCALE:                  el_CY.ISO8859-7
479  iso8859-7/XLC_LOCALE:                  el_GR.ISO8859-7
480 -iso8859-15/XLC_LOCALE:                 el_GR.ISO8859-15
481  iso8859-1/XLC_LOCALE:                  en_AU.ISO8859-1
482  iso8859-1/XLC_LOCALE:                  en_BE.ISO8859-1
483 -iso8859-1/XLC_LOCALE:                  en_BZ.ISO8859-1
484  iso8859-1/XLC_LOCALE:                  en_BW.ISO8859-1
485 +iso8859-1/XLC_LOCALE:                  en_BZ.ISO8859-1
486  iso8859-1/XLC_LOCALE:                  en_CA.ISO8859-1
487 +iso8859-1/XLC_LOCALE:                  en_DK.ISO8859-1
488  iso8859-1/XLC_LOCALE:                  en_GB.ISO8859-1
489 @@ -76,5 +83,7 @@
490  iso8859-1/XLC_LOCALE:                  en_SG.ISO8859-1
491 +iso8859-1/XLC_LOCALE:                  en_PH.ISO8859-1
492 +iso8859-1/XLC_LOCALE:                  en_SG.ISO8859-1
493  iso8859-1/XLC_LOCALE:                  en_TT.ISO8859-1
494 -iso8859-1/XLC_LOCALE:                  en_UK.ISO8859-1
495 -iso8859-15/XLC_LOCALE:                 en_UK.ISO8859-15
496 +iso8859-1/XLC_LOCALE:                  en_GB.ISO8859-1
497 +iso8859-15/XLC_LOCALE:                 en_GB.ISO8859-15
498  iso8859-1/XLC_LOCALE:                  en_US.ISO8859-1
499 @@ -104,2 +113,3 @@
500  iso8859-1/XLC_LOCALE:                  es_US.ISO8859-1
501 +iso8859-1/XLC_LOCALE:                  es_US.ISO8859-1
502  iso8859-1/XLC_LOCALE:                  es_UY.ISO8859-1
503 @@ -115,2 +125,3 @@
504  iso8859-15/XLC_LOCALE:                 fi_FI.ISO8859-15
505 +iso8859-1/XLC_LOCALE:                  fil_PH.ISO8859-1
506  iso8859-1/XLC_LOCALE:                  fo_FO.ISO8859-1
507 @@ -142,3 +153,5 @@
508  iso8859-2/XLC_LOCALE:                  hr_HR.ISO8859-2
509 +iso8859-2/XLC_LOCALE:                  hsb_DE.ISO8859-2
510  iso8859-2/XLC_LOCALE:                  hu_HU.ISO8859-2
511 +iso8859-16/XLC_LOCALE:                 hu_HU.ISO8859-16
512  armscii-8/XLC_LOCALE:                  hy_AM.ARMSCII-8
513 @@ -155,2 +168,3 @@
514  georgian-ps/XLC_LOCALE:                        ka_GE.GEORGIAN-PS
515 +XCOMM pt-154/XLC_LOCALE:                       kk_KZ.PT154
516  iso8859-1/XLC_LOCALE:                  kl_GL.ISO8859-1
517 @@ -160,2 +174,7 @@
518  iso8859-15/XLC_LOCALE:                 kw_GB.ISO8859-15
519 +iso8859-10/XLC_LOCALE:                 lg_UG.ISO8859-10
520 +iso8859-1/XLC_LOCALE:                  li_BE.ISO8859-1
521 +iso8859-15/XLC_LOCALE:                 li_BE.ISO8859-15
522 +iso8859-1/XLC_LOCALE:                  li_NL.ISO8859-1
523 +iso8859-15/XLC_LOCALE:                 li_NL.ISO8859-15
524  ibm-cp1133/XLC_LOCALE:                 lo_LA.IBM-CP1133
525 @@ -166,3 +185,3 @@
526  iso8859-13/XLC_LOCALE:                 lv_LV.ISO8859-13
527 -iso8859-13/XLC_LOCALE:                 mi_NZ.ISO8859-13
528 +iso8859-1/XLC_LOCALE:                  mi_NZ.ISO8859-1
529  iso8859-5/XLC_LOCALE:                  mk_MK.ISO8859-5
530 @@ -172,3 +191,5 @@
531  iso8859-1/XLC_LOCALE:                  nb_NO.ISO8859-1
532 -iso8859-1/XLC_LOCALE:                  nb_NO.ISO8859-15
533 +iso8859-15/XLC_LOCALE:                 nb_NO.ISO8859-15
534 +iso8859-1/XLC_LOCALE:                  nds_DE.ISO8859-1
535 +iso8859-15/XLC_LOCALE:                 nds_DE.ISO8859-15
536  iso8859-1/XLC_LOCALE:                  nl_BE.ISO8859-1
537 @@ -179,12 +200,11 @@
538  iso8859-1/XLC_LOCALE:                  nn_NO.ISO8859-15
539 -iso8859-1/XLC_LOCALE:                  no_NO.ISO8859-1
540 -iso8859-1/XLC_LOCALE:                  no_NO.ISO8859-15
541 -iso8859-1/XLC_LOCALE:                  ny_NO.ISO8859-1
542 -iso8859-1/XLC_LOCALE:                  ny_NO.ISO8859-15
543 +iso8859-10/XLC_LOCALE:                 nr_ZA.ISO8859-10
544 +iso8859-10/XLC_LOCALE:                 nso_ZA.ISO8859-10
545  iso8859-1/XLC_LOCALE:                  oc_FR.ISO8859-1
546  iso8859-15/XLC_LOCALE:                 oc_FR.ISO8859-15
547 +iso8859-1/XLC_LOCALE:                  om_KE.ISO8859-1
548 +iso8859-1/XLC_LOCALE:                  pap_AN.ISO8859-1
549  iso8859-1/XLC_LOCALE:                  pd_DE.ISO8859-1
550 -iso8859-1/XLC_LOCALE:                  ph_PH.ISO8859-1
551  iso8859-2/XLC_LOCALE:                  pl_PL.ISO8859-2
552 -iso8859-1/XLC_LOCALE:                  pp_AN.ISO8859-1
553 +iso8859-16/XLC_LOCALE:                 pl_PL.ISO8859-16
554  iso8859-1/XLC_LOCALE:                  pt_BR.ISO8859-1
555 @@ -193,2 +213,3 @@
556  iso8859-2/XLC_LOCALE:                  ro_RO.ISO8859-2
557 +iso8859-16/XLC_LOCALE:                 ro_RO.ISO8859-16
558  iso8859-5/XLC_LOCALE:                  ru_RU.ISO8859-5
559 @@ -196,12 +217,18 @@
560  koi8-r/XLC_LOCALE:                     ru_RU.KOI8-R
561 +microsoft-cp1251/XLC_LOCALE:           ru_UA.CP1251
562  koi8-u/XLC_LOCALE:                     ru_UA.KOI8-U
563 -iso8859-2/XLC_LOCALE:                  sh_YU.ISO8859-2
564 +iso8859-1/XLC_LOCALE:                  rw_RW.ISO8859-1
565  iso8859-2/XLC_LOCALE:                  sk_SK.ISO8859-2
566  iso8859-2/XLC_LOCALE:                  sl_SI.ISO8859-2
567 -iso8859-5/XLC_LOCALE:                  sp_YU.ISO8859-5
568 +iso8859-16/XLC_LOCALE:                 sl_SI.ISO8859-16
569 +iso8859-1/XLC_LOCALE:                  so_DJ.ISO8859-1
570 +iso8859-1/XLC_LOCALE:                  so_KE.ISO8859-1
571 +iso8859-1/XLC_LOCALE:                  so_SO.ISO8859-1
572 +iso8859-1/XLC_LOCALE:                  sq_AL.ISO8859-1
573  iso8859-2/XLC_LOCALE:                  sq_AL.ISO8859-2
574 -iso8859-2/XLC_LOCALE:                  sr_SP.ISO8859-2
575 -iso8859-2/XLC_LOCALE:                  sr_YU.ISO8859-2
576 -iso8859-5/XLC_LOCALE:                  sr_YU.ISO8859-5
577 -microsoft-cp1251/XLC_LOCALE:           sr_YU.CP1251
578 +iso8859-2/XLC_LOCALE:                  sr_CS.ISO8859-2
579 +iso8859-5/XLC_LOCALE:                  sr_CS.ISO8859-5
580 +microsoft-cp1251/XLC_LOCALE:           sr_CS.CP1251
581 +iso8859-1/XLC_LOCALE:                  ss_ZA.ISO8859-1
582 +iso8859-1/XLC_LOCALE:                  st_ZA.ISO8859-1
583  iso8859-1/XLC_LOCALE:                  sv_FI.ISO8859-1
584 @@ -212,2 +239,3 @@
585  koi8-c/XLC_LOCALE:                     tg_TJ.KOI8-C
586 +koi8-t/XLC_LOCALE:                     tg_TJ.KOI8-T
587  th_TH/XLC_LOCALE:                      th_TH.TIS620
588 @@ -215,3 +243,6 @@
589  iso8859-1/XLC_LOCALE:                  tl_PH.ISO8859-1
590 +iso8859-10/XLC_LOCALE:                 tn_ZA.ISO8859-10
591 +iso8859-9/XLC_LOCALE:                  tr_CY.ISO8859-9
592  iso8859-9/XLC_LOCALE:                  tr_TR.ISO8859-9
593 +iso8859-1/XLC_LOCALE:                  ts_ZA.ISO8859-1
594  tatar-cyr/XLC_LOCALE:                  tt_RU.TATAR-CYR
595 @@ -222,2 +253,3 @@
596  microsoft-cp1256/XLC_LOCALE:           ur_PK.CP1256
597 +iso8859-1/XLC_LOCALE:                  uz_UZ.ISO8859-1
598  vi_VN.tcvn/XLC_LOCALE:                 vi_VN.TCVN
599 @@ -226,2 +258,3 @@
600  iso8859-15/XLC_LOCALE:                 wa_BE.ISO8859-15
601 +iso8859-1/XLC_LOCALE:                  xh_ZA.ISO8859-1
602  microsoft-cp1255/XLC_LOCALE:           yi_US.CP1255
603 @@ -231,11 +264,15 @@
604  zh_HK.big5/XLC_LOCALE:                 zh_HK.big5
605 -zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.big5-hkscs
606 -zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.Big5-HKSCS
607  zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.big5hkscs
608 -zh_HK.big5hkscs/XLC_LOCALE:            zh_HK.Big5HKSCS
609 +zh_CN/XLC_LOCALE:                      zh_SG.gb2312
610 +zh_CN.gbk/XLC_LOCALE:                  zh_SG.gbk
611  zh_TW.big5/XLC_LOCALE:                 zh_TW.big5
612  zh_TW/XLC_LOCALE:                      zh_TW.eucTW
613 +iso8859-1/XLC_LOCALE:                  zu_ZA.ISO8859-1
614  XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
615 +en_US.UTF-8/XLC_LOCALE:                        aa_DJ.UTF-8
616 +en_US.UTF-8/XLC_LOCALE:                        aa_ER.UTF-8
617 +en_US.UTF-8/XLC_LOCALE:                        aa_ET.UTF-8
618  en_US.UTF-8/XLC_LOCALE:                        af_ZA.UTF-8
619  en_US.UTF-8/XLC_LOCALE:                        am_ET.UTF-8
620 +en_US.UTF-8/XLC_LOCALE:                        an_ES.UTF-8
621  en_US.UTF-8/XLC_LOCALE:                        ar_AA.UTF-8
622 @@ -245,2 +282,3 @@
623  en_US.UTF-8/XLC_LOCALE:                        ar_EG.UTF-8
624 +en_US.UTF-8/XLC_LOCALE:                        ar_IN.UTF-8
625  en_US.UTF-8/XLC_LOCALE:                        ar_IQ.UTF-8
626 @@ -256,2 +294,4 @@
627  en_US.UTF-8/XLC_LOCALE:                        ar_SY.UTF-8
628 +en_US.UTF-8/XLC_LOCALE:                        ar_SD.UTF-8
629 +en_US.UTF-8/XLC_LOCALE:                        ar_SY.UTF-8
630  en_US.UTF-8/XLC_LOCALE:                        ar_TN.UTF-8
631 @@ -259,3 +299,2 @@
632  en_US.UTF-8/XLC_LOCALE:                        az_AZ.UTF-8
633 -en_US.UTF-8/XLC_LOCALE:                        a3_AZ.UTF-8
634  en_US.UTF-8/XLC_LOCALE:                        be_BY.UTF-8
635 @@ -263,7 +302,10 @@
636  en_US.UTF-8/XLC_LOCALE:                        bn_BD.UTF-8
637 +en_US.UTF-8/XLC_LOCALE:                        bn_IN.UTF-8
638  en_US.UTF-8/XLC_LOCALE:                        br_FR.UTF-8
639 +en_US.UTF-8/XLC_LOCALE:                        bs_BA.UTF-8
640 +en_US.UTF-8/XLC_LOCALE:                        byn_ER.UTF-8
641  en_US.UTF-8/XLC_LOCALE:                        ca_ES.UTF-8
642  en_US.UTF-8/XLC_LOCALE:                        cs_CZ.UTF-8
643 +en_US.UTF-8/XLC_LOCALE:                        csb_PL.UTF-8
644  en_US.UTF-8/XLC_LOCALE:                        cy_GB.UTF-8
645 -en_US.UTF-8/XLC_LOCALE:                        cs_CZ.UTF-8
646  en_US.UTF-8/XLC_LOCALE:                        da_DK.UTF-8
647 @@ -275,2 +317,3 @@
648  en_US.UTF-8/XLC_LOCALE:                        de_LU.UTF-8
649 +en_US.UTF-8/XLC_LOCALE:                        el_CY.UTF-8
650  en_US.UTF-8/XLC_LOCALE:                        el_GR.UTF-8
651 @@ -278,12 +321,18 @@
652  en_US.UTF-8/XLC_LOCALE:                        en_BE.UTF-8
653 +en_US.UTF-8/XLC_LOCALE:                        en_BW.UTF-8
654  en_US.UTF-8/XLC_LOCALE:                        en_BZ.UTF-8
655  en_US.UTF-8/XLC_LOCALE:                        en_CA.UTF-8
656 +en_US.UTF-8/XLC_LOCALE:                        en_DK.UTF-8
657  en_US.UTF-8/XLC_LOCALE:                        en_GB.UTF-8
658 +en_US.UTF-8/XLC_LOCALE:                        en_HK.UTF-8
659  en_US.UTF-8/XLC_LOCALE:                        en_IE.UTF-8
660 +en_US.UTF-8/XLC_LOCALE:                        en_IN.UTF-8
661  en_US.UTF-8/XLC_LOCALE:                        en_JM.UTF-8
662  en_US.UTF-8/XLC_LOCALE:                        en_NZ.UTF-8
663 +en_US.UTF-8/XLC_LOCALE:                        en_PH.UTF-8
664 +en_US.UTF-8/XLC_LOCALE:                        en_SG.UTF-8
665  en_US.UTF-8/XLC_LOCALE:                        en_TT.UTF-8
666 -en_US.UTF-8/XLC_LOCALE:                        en_UK.UTF-8
667  en_US.UTF-8/XLC_LOCALE:                        en_US.UTF-8
668  en_US.UTF-8/XLC_LOCALE:                        en_ZA.UTF-8
669 +en_US.UTF-8/XLC_LOCALE:                        en_ZW.UTF-8
670  en_US.UTF-8/XLC_LOCALE:                        eo_EO.UTF-8
671 @@ -307,2 +356,3 @@
672  en_US.UTF-8/XLC_LOCALE:                        es_SV.UTF-8
673 +en_US.UTF-8/XLC_LOCALE:                        es_US.UTF-8
674  en_US.UTF-8/XLC_LOCALE:                        es_UY.UTF-8
675 @@ -313,2 +363,3 @@
676  en_US.UTF-8/XLC_LOCALE:                        fi_FI.UTF-8
677 +en_US.UTF-8/XLC_LOCALE:                        fil_PH.UTF-8
678  en_US.UTF-8/XLC_LOCALE:                        fo_FO.UTF-8
679 @@ -321,3 +372,5 @@
680  en_US.UTF-8/XLC_LOCALE:                        gd_GB.UTF-8
681 +en_US.UTF-8/XLC_LOCALE:                        gez_ER.UTF-8
682  en_US.UTF-8/XLC_LOCALE:                        gl_ES.UTF-8
683 +en_US.UTF-8/XLC_LOCALE:                        gu_IN.UTF-8
684  en_US.UTF-8/XLC_LOCALE:                        gv_GB.UTF-8
685 @@ -326,2 +379,3 @@
686  en_US.UTF-8/XLC_LOCALE:                        hr_HR.UTF-8
687 +en_US.UTF-8/XLC_LOCALE:                        hsb_DE.UTF-8
688  en_US.UTF-8/XLC_LOCALE:                        hu_HU.UTF-8
689 @@ -335,5 +389,12 @@
690  en_US.UTF-8/XLC_LOCALE:                        ka_GE.UTF-8
691 +en_US.UTF-8/XLC_LOCALE:                        kk_KZ.UTF-8
692  en_US.UTF-8/XLC_LOCALE:                        kl_GL.UTF-8
693 +en_US.UTF-8/XLC_LOCALE:                        kn_IN.UTF-8
694  ko_KR.UTF-8/XLC_LOCALE:                        ko_KR.UTF-8
695 +en_US.UTF-8/XLC_LOCALE:                        ku_TR.UTF-8
696  en_US.UTF-8/XLC_LOCALE:                        kw_GB.UTF-8
697 +en_US.UTF-8/XLC_LOCALE:                        ky_KG.UTF-8
698 +en_US.UTF-8/XLC_LOCALE:                        lg_UG.UTF-8
699 +en_US.UTF-8/XLC_LOCALE:                        li_BE.UTF-8
700 +en_US.UTF-8/XLC_LOCALE:                        li_NL.UTF-8
701  en_US.UTF-8/XLC_LOCALE:                        lo_LA.UTF-8
702 @@ -343,16 +404,23 @@
703  en_US.UTF-8/XLC_LOCALE:                        mk_MK.UTF-8
704 +en_US.UTF-8/XLC_LOCALE:                        ml_IN.UTF-8
705 +en_US.UTF-8/XLC_LOCALE:                        mn_MN.UTF-8
706  en_US.UTF-8/XLC_LOCALE:                        mr_IN.UTF-8
707  en_US.UTF-8/XLC_LOCALE:                        ms_MY.UTF-8
708 +en_US.UTF-8/XLC_LOCALE:                        mt_MT.UTF-8
709 +en_US.UTF-8/XLC_LOCALE:                        nb_NO.UTF-8
710 +en_US.UTF-8/XLC_LOCALE:                        nds_DE.UTF-8
711  en_US.UTF-8/XLC_LOCALE:                        nl_BE.UTF-8
712  en_US.UTF-8/XLC_LOCALE:                        nl_NL.UTF-8
713 -en_US.UTF-8/XLC_LOCALE:                        nb_NO.UTF-8
714  en_US.UTF-8/XLC_LOCALE:                        nn_NO.UTF-8
715 -en_US.UTF-8/XLC_LOCALE:                        no_NO.UTF-8
716 -en_US.UTF-8/XLC_LOCALE:                        ny_NO.UTF-8
717 +en_US.UTF-8/XLC_LOCALE:                        nr_ZA.UTF-8
718 +en_US.UTF-8/XLC_LOCALE:                        nso_ZA.UTF-8
719  en_US.UTF-8/XLC_LOCALE:                        oc_FR.UTF-8
720 +en_US.UTF-8/XLC_LOCALE:                        om_ET.UTF-8
721 +en_US.UTF-8/XLC_LOCALE:                        om_KE.UTF-8
722 +en_US.UTF-8/XLC_LOCALE:                        or_IN.UTF-8
723 +en_US.UTF-8/XLC_LOCALE:                        pa_IN.UTF-8
724 +en_US.UTF-8/XLC_LOCALE:                        pap_AN.UTF-8
725  en_US.UTF-8/XLC_LOCALE:                        pd_DE.UTF-8
726  en_US.UTF-8/XLC_LOCALE:                        pd_US.UTF-8
727 -en_US.UTF-8/XLC_LOCALE:                        ph_PH.UTF-8
728  en_US.UTF-8/XLC_LOCALE:                        pl_PL.UTF-8
729 -en_US.UTF-8/XLC_LOCALE:                        pp_AN.UTF-8
730  en_US.UTF-8/XLC_LOCALE:                        pt_BR.UTF-8
731 @@ -362,8 +430,16 @@
732  en_US.UTF-8/XLC_LOCALE:                        ru_UA.UTF-8
733 +en_US.UTF-8/XLC_LOCALE:                        rw_RW.UTF-8
734  en_US.UTF-8/XLC_LOCALE:                        se_NO.UTF-8
735 -en_US.UTF-8/XLC_LOCALE:                        sh_YU.UTF-8
736 +en_US.UTF-8/XLC_LOCALE:                        si_LK.UTF-8
737 +en_US.UTF-8/XLC_LOCALE:                        sid_ET.UTF-8
738  en_US.UTF-8/XLC_LOCALE:                        sk_SK.UTF-8
739  en_US.UTF-8/XLC_LOCALE:                        sl_SI.UTF-8
740 +en_US.UTF-8/XLC_LOCALE:                        so_DJ.UTF-8
741 +en_US.UTF-8/XLC_LOCALE:                        so_ET.UTF-8
742 +en_US.UTF-8/XLC_LOCALE:                        so_KE.UTF-8
743 +en_US.UTF-8/XLC_LOCALE:                        so_SO.UTF-8
744  en_US.UTF-8/XLC_LOCALE:                        sq_AL.UTF-8
745 -en_US.UTF-8/XLC_LOCALE:                        sr_YU.UTF-8
746 +en_US.UTF-8/XLC_LOCALE:                        sr_CS.UTF-8
747 +en_US.UTF-8/XLC_LOCALE:                        ss_ZA.UTF-8
748 +en_US.UTF-8/XLC_LOCALE:                        st_ZA.UTF-8
749  en_US.UTF-8/XLC_LOCALE:                        sv_FI.UTF-8
750 @@ -371,2 +447,3 @@
751  en_US.UTF-8/XLC_LOCALE:                        ta_IN.UTF-8
752 +en_US.UTF-8/XLC_LOCALE:                        te_IN.UTF-8
753  en_US.UTF-8/XLC_LOCALE:                        tg_TJ.UTF-8
754 @@ -375,4 +452,9 @@
755  en_US.UTF-8/XLC_LOCALE:                        ti_ET.UTF-8
756 +en_US.UTF-8/XLC_LOCALE:                        tig_ER.UTF-8
757 +en_US.UTF-8/XLC_LOCALE:                        tk_TM.UTF-8
758  en_US.UTF-8/XLC_LOCALE:                        tl_PH.UTF-8
759 +en_US.UTF-8/XLC_LOCALE:                        tn_ZA.UTF-8
760 +en_US.UTF-8/XLC_LOCALE:                        tr_CY.UTF-8
761  en_US.UTF-8/XLC_LOCALE:                        tr_TR.UTF-8
762 +en_US.UTF-8/XLC_LOCALE:                        ts_ZA.UTF-8
763  en_US.UTF-8/XLC_LOCALE:                        tt_RU.UTF-8
764 @@ -381,4 +463,6 @@
765  en_US.UTF-8/XLC_LOCALE:                        uz_UZ.UTF-8
766 +en_US.UTF-8/XLC_LOCALE:                        ve_ZA.UTF-8
767  en_US.UTF-8/XLC_LOCALE:                        vi_VN.UTF-8
768  en_US.UTF-8/XLC_LOCALE:                        wa_BE.UTF-8
769 +en_US.UTF-8/XLC_LOCALE:                        xh_ZA.UTF-8
770  en_US.UTF-8/XLC_LOCALE:                        yi_US.UTF-8
771 @@ -388,2 +472,3 @@
772  zh_TW.UTF-8/XLC_LOCALE:                        zh_TW.UTF-8
773 +en_US.UTF-8/XLC_LOCALE:                        zu_ZA.UTF-8
774  #ifdef __uxp__
775 --- X11-6.8.1/xc/nls/locale.alias.orig  2004-09-22 06:26:28.000000000 +0200
776 +++ X11-6.8.1/xc/nls/locale.alias       2004-11-23 11:11:07.000000000 +0100
777 @@ -1 +1,2 @@
778 +#      $XdotOrg: xc/nls/locale.alias,v 1.2 2004/04/23 18:44:33 eich Exp $
779  XCOMM  $XdotOrg: xc/nls/locale.alias,v 1.2 2004/04/23 18:44:33 eich Exp $
780 @@ -19,2 +20,13 @@
781  English_United-States.437:                     C
782 +aa_DJ:                                         aa_DJ.ISO8859-1
783 +aa_DJ.iso88591:                                        aa_DJ.ISO8859-1
784 +aa_DJ.ISO-8859-1:                              aa_DJ.ISO8859-1
785 +aa_DJ.ISO_8859-1:                              aa_DJ.ISO8859-1
786 +aa_DJ.utf8:                                    aa_DJ.UTF-8
787 +aa_ER:                                         aa_ER.UTF-8
788 +aa_ER.utf8:                                    aa_ER.UTF-8
789 +aa_ER@saaho:                                   aa_ER.UTF-8
790 +aa_ER.utf8@saaho:                              aa_ER.UTF-8
791 +aa_ET:                                         aa_ET.UTF-8
792 +aa_ET.utf8:                                    aa_ET.UTF-8
793  af:                                            af_ZA.ISO8859-1
794 @@ -22,3 +34,13 @@
795  af_ZA.iso88591:                                        af_ZA.ISO8859-1
796 +af_ZA.ISO-8859-1:                              af_ZA.ISO8859-1
797 +af_ZA.ISO_8859-1:                              af_ZA.ISO8859-1
798 +af_ZA.utf8:                                    af_ZA.UTF-8
799  am:                                            am_ET.UTF-8
800 +am_ET:                                         am_ET.UTF-8
801 +am_ET.utf8:                                    am_ET.UTF-8
802 +an_ES:                                         an_ES.ISO8859-15
803 +an_ES.iso885915:                               an_ES.ISO8859-15
804 +an_ES.ISO-8859-15:                             an_ES.ISO8859-15
805 +an_ES.ISO_8859-15:                             an_ES.ISO8859-15
806 +an_ES.utf8:                                    an_ES.UTF-8
807  ar:                                            ar_AA.ISO8859-6
808 @@ -30,6 +52,15 @@
809  ar_AE:                                         ar_AE.ISO8859-6
810 +ar_AE.iso88596:                                        ar_AE.ISO8859-6
811 +ar_AE.ISO-8859-6:                              ar_AE.ISO8859-6
812 +ar_AE.ISO_8859-6:                              ar_AE.ISO8859-6
813  ar_AE.utf8:                                    ar_AE.UTF-8
814  ar_BH:                                         ar_BH.ISO8859-6
815 +ar_BH.iso88596:                                        ar_BH.ISO8859-6
816 +ar_BH.ISO-8859-6:                              ar_BH.ISO8859-6
817 +ar_BH.ISO_8859-6:                              ar_BH.ISO8859-6
818  ar_BH.utf8:                                    ar_BH.UTF-8
819  ar_DZ:                                         ar_DZ.ISO8859-6
820 +ar_DZ.iso88596:                                        ar_DZ.ISO8859-6
821 +ar_DZ.ISO-8859-6:                              ar_DZ.ISO8859-6
822 +ar_DZ.ISO_8859-6:                              ar_DZ.ISO8859-6
823  ar_DZ.utf8:                                    ar_DZ.UTF-8
824 @@ -37,18 +68,46 @@
825  ar_EG.iso88596:                                        ar_EG.ISO8859-6
826 +ar_EG.ISO-8859-6:                              ar_EG.ISO8859-6
827 +ar_EG.ISO_8859-6:                              ar_EG.ISO8859-6
828  ar_EG.utf8:                                    ar_EG.UTF-8
829 +ar_IN:                                         ar_IN.UTF-8
830 +ar_IN.utf8:                                    ar_IN.UTF-8
831  ar_IQ:                                         ar_IQ.ISO8859-6
832 +ar_IQ.iso88596:                                        ar_IQ.ISO8859-6
833 +ar_IQ.ISO-8859-6:                              ar_IQ.ISO8859-6
834 +ar_IQ.ISO_8859-6:                              ar_IQ.ISO8859-6
835  ar_IQ.utf8:                                    ar_IQ.UTF-8
836  ar_JO:                                         ar_JO.ISO8859-6
837 +ar_JO.iso88596:                                        ar_JO.ISO8859-6
838 +ar_JO.ISO-8859-6:                              ar_JO.ISO8859-6
839 +ar_JO.ISO_8859-6:                              ar_JO.ISO8859-6
840  ar_JO.utf8:                                    ar_JO.UTF-8
841  ar_KW:                                         ar_KW.ISO8859-6
842 +ar_KW.iso88596:                                        ar_KW.ISO8859-6
843 +ar_KW.ISO-8859-6:                              ar_KW.ISO8859-6
844 +ar_KW.ISO_8859-6:                              ar_KW.ISO8859-6
845  ar_KW.utf8:                                    ar_KW.UTF-8
846  ar_LB:                                         ar_LB.ISO8859-6
847 +ar_LB.iso88596:                                        ar_LB.ISO8859-6
848 +ar_LB.ISO-8859-6:                              ar_LB.ISO8859-6
849 +ar_LB.ISO_8859-6:                              ar_LB.ISO8859-6
850  ar_LB.utf8:                                    ar_LB.UTF-8
851  ar_LY:                                         ar_LY.ISO8859-6
852 +ar_LY.iso88596:                                        ar_LY.ISO8859-6
853 +ar_LY.ISO-8859-6:                              ar_LY.ISO8859-6
854 +ar_LY.ISO_8859-6:                              ar_LY.ISO8859-6
855  ar_LY.utf8:                                    ar_LY.UTF-8
856  ar_MA:                                         ar_MA.ISO8859-6
857 +ar_MA.iso88596:                                        ar_MA.ISO8859-6
858 +ar_MA.ISO-8859-6:                              ar_MA.ISO8859-6
859 +ar_MA.ISO_8859-6:                              ar_MA.ISO8859-6
860  ar_MA.utf8:                                    ar_MA.UTF-8
861  ar_OM:                                         ar_OM.ISO8859-6
862 +ar_OM.iso88596:                                        ar_OM.ISO8859-6
863 +ar_OM.ISO-8859-6:                              ar_OM.ISO8859-6
864 +ar_OM.ISO_8859-6:                              ar_OM.ISO8859-6
865  ar_OM.utf8:                                    ar_OM.UTF-8
866  ar_QA:                                         ar_QA.ISO8859-6
867 +ar_QA.iso88596:                                        ar_QA.ISO8859-6
868 +ar_QA.ISO-8859-6:                              ar_QA.ISO8859-6
869 +ar_QA.ISO_8859-6:                              ar_QA.ISO8859-6
870  ar_QA.utf8:                                    ar_QA.UTF-8
871 @@ -56,17 +115,36 @@
872  ar_SA.iso88596:                                        ar_SA.ISO8859-6
873 +ar_SA.ISO-8859-6:                              ar_SA.ISO8859-6
874 +ar_SA.ISO_8859-6:                              ar_SA.ISO8859-6
875  ar_SA.utf8:                                    ar_SA.UTF-8
876  ar_SD:                                         ar_SD.ISO8859-6
877 +ar_SD.iso88596:                                        ar_SD.ISO8859-6
878 +ar_SD.ISO-8859-6:                              ar_SD.ISO8859-6
879 +ar_SD.ISO_8859-6:                              ar_SD.ISO8859-6
880  ar_SD.utf8:                                    ar_SD.UTF-8
881  ar_SY:                                         ar_SY.ISO8859-6
882 +ar_SY.iso88596:                                        ar_SY.ISO8859-6
883 +ar_SY.ISO-8859-6:                              ar_SY.ISO8859-6
884 +ar_SY.ISO_8859-6:                              ar_SY.ISO8859-6
885  ar_SY.utf8:                                    ar_SY.UTF-8
886  ar_TN:                                         ar_TN.ISO8859-6
887 +ar_TN.iso88596:                                        ar_TN.ISO8859-6
888 +ar_TN.ISO-8859-6:                              ar_TN.ISO8859-6
889 +ar_TN.ISO_8859-6:                              ar_TN.ISO8859-6
890  ar_TN.utf8:                                    ar_TN.UTF-8
891  ar_YE:                                         ar_YE.ISO8859-6
892 +ar_YE.iso88596:                                        ar_YE.ISO8859-6
893 +ar_YE.ISO-8859-6:                              ar_YE.ISO8859-6
894 +ar_YE.ISO_8859-6:                              ar_YE.ISO8859-6
895  ar_YE.utf8:                                    ar_YE.UTF-8
896 -az:                                            az_AZ.ISO8859-9E
897 -az_AZ:                                         az_AZ.ISO8859-9E
898 +az:                                            az_AZ.UTF-8
899 +az_AZ:                                         az_AZ.UTF-8
900  az_AZ.iso88599e:                               az_AZ.ISO8859-9E
901 -a3:                                            a3_AZKOI8-C
902 -a3_AZ:                                         a3_AZ.KOI8-C
903 -a3_AZ.koi8c:                                   a3_AZ.KOI8-C
904 +az_AZ.utf8:                                    az_AZ.UTF-8
905 +az_AZ.utf8@cyrillic:                           az_AZ.UTF-8
906 +az_AZ.koi8c:                                   az_AZ.KOI8-C
907 +az_AZ@cyrillic:                                        az_AZ.KOI8-C
908 +az_AZ.koi8c@cyrillic:                          az_AZ.KOI8-C
909 +a3:                                            az_AZ.KOI8-C
910 +a3_AZ:                                         az_AZ.KOI8-C
911 +a3_AZ.koi8c:                                   az_AZ.KOI8-C
912  be:                                            be_BY.CP1251
913 @@ -78,3 +156,2 @@
914  be_BY.utf8:                                    be_BY.UTF-8
915 -bg_BG.iso88595:                                        bg_BG.ISO8859-5
916  bg:                                            bg_BG.CP1251
917 @@ -88,2 +165,7 @@
918  be_BG.utf8:                                    be_BG.UTF-8
919 +bn:                                            bn_BD.UTF-8
920 +bn_BD:                                         bn_BD.UTF-8
921 +bn_BD.utf8:                                    bn_BD.UTF-8
922 +bn_IN:                                         bn_IN.UTF-8
923 +bn_IN.utf8:                                    bn_IN.UTF-8
924  br:                                            br_FR.ISO8859-1
925 @@ -91,5 +173,19 @@
926  br_FR.iso88591:                                        br_FR.ISO8859-1
927 +br_FR.ISO-8859-1:                              br_FR.ISO8859-1
928 +br_FR.ISO_8859-1:                              br_FR.ISO8859-1
929  br_FR.iso885914:                               br_FR.ISO8859-14
930  br_FR.iso885915:                               br_FR.ISO8859-15
931 +br_FR.iso885915@euro:                          br_FR.ISO8859-15
932 +br_FR.ISO-8859-15@euro:                                br_FR.ISO8859-15
933 +br_FR.ISO_8859-15@euro:                                br_FR.ISO8859-15
934  br_FR@euro:                                    br_FR.ISO8859-15
935 +br_FR.utf8:                                    br_FR.UTF-8
936 +bs:                                            bs_BA.ISO8859-2
937 +bs_BA:                                         bs_BA.ISO8859-2
938 +bs_BA.iso88592:                                        bs_BA.ISO8859-2
939 +bs_BA.ISO-8859-2:                              bs_BA.ISO8859-2
940 +bs_BA.ISO_8859-2:                              bs_BA.ISO8859-2
941 +bs_BA.utf8:                                    bs_BA.UTF-8
942 +byn_ER:                                                byn_ER.UTF-8
943 +byn_ER.utf8:                                   byn_ER.UTF-8
944  ca:                                            ca_ES.ISO8859-1
945 @@ -98,5 +194,10 @@
946  ca_ES.ISO-8859-1:                              ca_ES.ISO8859-1
947 +ca_ES.ISO_8859-1:                              ca_ES.ISO8859-1
948  ca_ES.iso885915:                               ca_ES.ISO8859-15
949 +ca_ES.iso885915@euro:                          ca_ES.ISO8859-15
950 +ca_ES.ISO-8859-15@euro:                                ca_ES.ISO8859-15
951 +ca_ES.ISO_8859-15@euro:                                ca_ES.ISO8859-15
952  ca_ES@euro:                                    ca_ES.ISO8859-15
953  ca_ES.utf8:                                    ca_ES.UTF-8
954 +ca_ES.utf8:                                    ca_ES.UTF-8
955  cs:                                            cs_CZ.ISO8859-2
956 @@ -109,10 +210,16 @@
957  cs_CZ.utf8:                                    cs_CZ.UTF-8
958 -XCOMM cz is old name for cs, should be deleted in the future:
959 -cz:                                            cs_CZ.ISO8859-2
960 -cz_CZ:                                         cs_CZ.ISO8859-2
961 -cy:                                            cy_GB.ISO8859-1
962 -cy_GB:                                         cy_GB.ISO8859-1
963 +csb:                                           csb_PL.UTF-8
964 +csb_PL:                                                csb_PL.UTF-8
965 +csb_PL.utf8:                                   csb_PL.UTF-8
966 +cy:                                            cy_GB.ISO8859-14
967 +cy_GB:                                         cy_GB.ISO8859-14
968  cy_GB.iso88591:                                        cy_GB.ISO8859-1
969  cy_GB.iso885914:                               cy_GB.ISO8859-14
970 +cy_GB.ISO-8859-14:                             cy_GB.ISO8859-14
971 +cy_GB.ISO_8859-14:                             cy_GB.ISO8859-14
972  cy_GB.iso885915:                               cy_GB.ISO8859-15
973 +cy_GB.utf8:                                    cy_GB.UTF-8
974 +XCOMM cz is old name for cs, should be deleted in the future:
975 +cz:                                            cs_CZ.ISO8859-2
976 +cz_CZ:                                         cs_CZ.ISO8859-2
977  da:                                            da_DK.ISO8859-1
978 @@ -123,2 +230,3 @@
979  da_DK.iso88591:                                        da_DK.ISO8859-1
980 +da_DK.utf8:                                    da_DK.UTF-8
981  da_DK.ISO-8859-1:                              da_DK.ISO8859-1
982 @@ -132,6 +240,11 @@
983  de_AT.iso88591:                                        de_AT.ISO8859-1
984 +de_AT.ISO-8859-1:                              de_AT.ISO8859-1
985  de_AT.ISO_8859-1:                              de_AT.ISO8859-1
986  de_AT.iso885915:                               de_AT.ISO8859-15
987 +de_AT.iso885915@euro:                          de_AT.ISO8859-15
988 +de_AT.ISO-8859-15@euro:                                de_AT.ISO8859-15
989 +de_AT.ISO_8859-15@euro:                                de_AT.ISO8859-15
990  de_AT@euro:                                    de_AT.ISO8859-15
991  de_AT.utf8:                                    de_AT.UTF-8
992 +de_AT.utf8:                                    de_AT.UTF-8
993  de_BE:                                         de_BE.ISO8859-1
994 @@ -143,3 +256,7 @@
995  de_BE.ISO-8859-15:                             de_BE.ISO8859-15
996 +de_BE.iso885915@euro:                          de_BE.ISO8859-15
997 +de_BE.ISO_8859-15@euro:                                de_BE.ISO8859-15
998 +de_BE.ISO-8859-15@euro:                                de_BE.ISO8859-15
999  de_BE@euro:                                    de_BE.ISO8859-15
1000 +de_BE.utf8:                                    de_BE.UTF-8
1001  de_CH:                                         de_CH.ISO8859-1
1002 @@ -152,2 +269,3 @@
1003  de_CH.utf8:                                    de_CH.UTF-8
1004 +de_CH.utf8:                                    de_CH.UTF-8
1005  de_DE:                                         de_DE.ISO8859-1
1006 @@ -163,4 +281,8 @@
1007  de_DE.8859-15@euro:                            de_DE.ISO8859-15
1008 +de_DE.iso885915@euro:                          de_DE.ISO8859-15
1009 +de_DE.ISO-8859-15@euro:                                de_DE.ISO8859-15
1010 +de_DE.ISO_8859-15@euro:                                de_DE.ISO8859-15
1011  de_DE@euro:                                    de_DE.ISO8859-15
1012  de_DE.utf8:                                    de_DE.UTF-8
1013 +de_DE.utf8:                                    de_DE.UTF-8
1014  de_LU:                                         de_LU.ISO8859-1
1015 @@ -172,2 +294,5 @@
1016  de_LU.ISO-8859-15:                             de_LU.ISO8859-15
1017 +de_LU.iso885915@euro:                          de_LU.ISO8859-15
1018 +de_LU.ISO_8859-15@euro:                                de_LU.ISO8859-15
1019 +de_LU.ISO-8859-15@euro:                                de_LU.ISO8859-15
1020  de_LU@euro:                                    de_LU.ISO8859-15
1021 @@ -176,6 +301,12 @@
1022  GER_DE.8859.in:                                        de_DE.ISO8859-1
1023 -ee:                                            ee_EE.ISO8859-4
1024 -ee_EE:                                         ee_EE.ISO8859-4
1025 -ee_EE.iso88594:                                        ee_EE.ISO8859-4
1026 +XCOMM ee* are bogus
1027 +ee:                                            et_EE.ISO8859-4
1028 +ee_EE:                                         et_EE.ISO8859-4
1029 +ee_EE.iso88594:                                        et_EE.ISO8859-4
1030  el:                                            el_GR.ISO8859-7
1031 +el_CY:                                         el_CY.ISO8859-7
1032 +el_CY.iso88597:                                        el_CY.ISO8859-7
1033 +el_CY.ISO-8859-7:                              el_CY.ISO8859-7
1034 +el_CY.ISO_8859-7:                              el_CY.ISO8859-7
1035 +el_CY.utf8:                                    el_CY.UTF-8
1036  el_GR:                                         el_GR.ISO8859-7
1037 @@ -183,3 +314,5 @@
1038  el_GR.ISO-8859-7:                              el_GR.ISO8859-7
1039 -el_GR@euro:                                    el_GR.ISO8859-15
1040 +el_GR.ISO_8859-7:                              el_GR.ISO8859-7
1041 +el_GR@euro:                                    el_GR.UTF-8
1042 +el_GR.utf8:                                    el_GR.UTF-8
1043  el_GR.utf8:                                    el_GR.UTF-8
1044 @@ -196,2 +329,6 @@
1045  en_BW:                                         en_BW.ISO8859-1
1046 +en_BW.iso88591:                                        en_BW.ISO8859-1
1047 +en_BW.ISO-8859-1:                              en_BW.ISO8859-1
1048 +en_BW.ISO_8859-1:                              en_BW.ISO8859-1
1049 +en_BW.utf8:                                    en_BW.UTF-8
1050  en_CA:                                         en_CA.ISO8859-1
1051 @@ -201,2 +338,7 @@
1052  en_CA.utf8:                                    en_CA.UTF-8
1053 +en_DK:                                         en_DK.ISO8859-1
1054 +en_DK.iso88591:                                        en_DK.ISO8859-1
1055 +en_DK.ISO-8859-1:                              en_DK.ISO8859-1
1056 +en_DK.ISO_8859-1:                              en_DK.ISO8859-1
1057 +en_DK.utf8:                                    en_DK.UTF-8
1058  en_GB:                                         en_GB.ISO8859-1
1059 @@ -210,2 +352,4 @@
1060  en_UK:                                         en_GB.ISO8859-1
1061 +en_UK.ISO8859-1:                               en_GB.ISO8859-1
1062 +en_UK.UTF-8:                                   en_GB.UTF-8
1063  ENG_GB.8859:                                   en_GB.ISO8859-1
1064 @@ -213,5 +357,14 @@
1065  en_HK:                                         en_HK.ISO8859-1
1066 +en_HK.iso88591:                                        en_HK.ISO8859-1
1067 +en_HK.ISO-8859-1:                              en_HK.ISO8859-1
1068 +en_HK.ISO_8859-1:                              en_HK.ISO8859-1
1069 +en_HK.utf8:                                    en_HK.UTF-8
1070  en_IE:                                         en_IE.ISO8859-1
1071  en_IE.iso88591:                                        en_IE.ISO8859-1
1072 +en_IE.ISO-8859-1:                              en_IE.ISO8859-1
1073 +en_IE.ISO_8859-1:                              en_IE.ISO8859-1
1074  en_IE.iso885915:                               en_IE.ISO8859-15
1075 +en_IE.iso885915@euro:                          en_IE.ISO8859-15
1076 +en_IE.ISO-8859-15@euro:                                en_IE.ISO8859-15
1077 +en_IE.ISO_8859-15@euro:                                en_IE.ISO8859-15
1078  en_IE@euro:                                    en_IE.ISO8859-15
1079 @@ -219,7 +372,18 @@
1080  en_IN:                                         en_IN.ISO8859-1
1081 +en_IN.utf8:                                    en_IN.UTF-8
1082  en_NZ:                                         en_NZ.ISO8859-1
1083  en_NZ.iso88591:                                        en_NZ.ISO8859-1
1084 +en_NZ.ISO-8859-1:                              en_NZ.ISO8859-1
1085 +en_NZ.ISO_8859-1:                              en_NZ.ISO8859-1
1086  en_NZ.utf8:                                    en_NZ.UTF-8
1087  en_PH:                                         en_PH.ISO8859-1
1088 +en_PH.iso88591:                                        en_PH.ISO8859-1
1089 +en_PH.ISO-8859-1:                              en_PH.ISO8859-1
1090 +en_PH.ISO_8859-1:                              en_PH.ISO8859-1
1091 +en_PH.utf8:                                    en_PH.UTF-8
1092  en_SG:                                         en_SG.ISO8859-1
1093 +en_SG.iso88591:                                        en_SG.ISO8859-1
1094 +en_SG.ISO-8859-1:                              en_SG.ISO8859-1
1095 +en_SG.ISO_8859-1:                              en_SG.ISO8859-1
1096 +en_SG.utf8:                                    en_SG.UTF-8
1097  en_US:                                         en_US.ISO8859-1
1098 @@ -236,11 +400,2 @@
1099  EN_US.UTF-8:                                   en_US.UTF-8
1100 -en_US.88591.en:                                        en_US.ISO8859-1
1101 -en_US.iso88591:                                        en_US.ISO8859-1
1102 -en_US.ISO-8859-1:                              en_US.ISO8859-1
1103 -en_US.ISO_8859-1:                              en_US.ISO8859-1
1104 -en_US.iso885915:                               en_US.ISO8859-15
1105 -en_US.8859-15:                                 en_US.ISO8859-15
1106 -en_US.ISO8859-15@euro:                         en_US.ISO8859-15
1107 -en_US.utf8:                                    en_US.UTF-8
1108 -EN_US.UTF-8:                                   en_US.UTF-8
1109  en_ZA:                                         en_ZA.ISO8859-1
1110 @@ -255,7 +410,13 @@
1111  en_ZW:                                         en_ZW.ISO8859-1
1112 +en_ZW.ISO-8859-1:                              en_ZW.ISO8859-1
1113 +en_ZW.ISO_8859-1:                              en_ZW.ISO8859-1
1114 +en_ZW.iso88591:                                        en_ZW.ISO8859-1
1115 +en_ZW.utf8:                                    en_ZW.UTF-8
1116  eo:                                            eo_XX.ISO8859-3
1117 -eo_EO:                                         eo_EO.ISO8859-3
1118 -eo_EO.ISO8859-3:                               eo_EO.ISO8859-3
1119 +eo_EO:                                         eo_XX.ISO8859-3
1120 +eo_EO.ISO8859-3:                               eo_XX.ISO8859-3
1121  eo_XX:                                         eo_XX.ISO8859-3
1122 -eo_XX.ISO8859-3:                               eo_XX.ISO8859-3
1123 +eo_XX.iso88593:                                        eo_XX.ISO8859-3
1124 +eo_XX.ISO-8859-3:                              eo_XX.ISO8859-3
1125 +eo_XX.ISO_8859-3:                              eo_XX.ISO8859-3
1126  es:                                            es_ES.ISO8859-1
1127 @@ -263,2 +424,4 @@
1128  es_AR.iso88591:                                        es_AR.ISO8859-1
1129 +es_AR.ISO-8859-1:                              es_AR.ISO8859-1
1130 +es_AR.ISO_8859-1:                              es_AR.ISO8859-1
1131  es_AR.utf8:                                    es_AR.UTF-8
1132 @@ -266,2 +429,4 @@
1133  es_BO.iso88591:                                        es_BO.ISO8859-1
1134 +es_BO.ISO-8859-1:                              es_BO.ISO8859-1
1135 +es_BO.ISO_8859-1:                              es_BO.ISO8859-1
1136  es_BO.utf8:                                    es_BO.UTF-8
1137 @@ -269,2 +434,4 @@
1138  es_CL.iso88591:                                        es_CL.ISO8859-1
1139 +es_CL.ISO-8859-1:                              es_CL.ISO8859-1
1140 +es_CL.ISO_8859-1:                              es_CL.ISO8859-1
1141  es_CL.utf8:                                    es_CL.UTF-8
1142 @@ -272,2 +439,4 @@
1143  es_CO.iso88591:                                        es_CO.ISO8859-1
1144 +es_CO.ISO-8859-1:                              es_CO.ISO8859-1
1145 +es_CO.ISO_8859-1:                              es_CO.ISO8859-1
1146  es_CO.utf8:                                    es_CO.UTF-8
1147 @@ -275,2 +444,4 @@
1148  es_CR.iso88591:                                        es_CR.ISO8859-1
1149 +es_CR.ISO-8859-1:                              es_CR.ISO8859-1
1150 +es_CR.ISO_8859-1:                              es_CR.ISO8859-1
1151  es_CR.utf8:                                    es_CR.UTF-8
1152 @@ -278,2 +449,4 @@
1153  es_DO.iso88591:                                        es_DO.ISO8859-1
1154 +es_DO.ISO-8859-1:                              es_DO.ISO8859-1
1155 +es_DO.ISO_8859-1:                              es_DO.ISO8859-1
1156  es_DO.utf8:                                    es_DO.UTF-8
1157 @@ -281,2 +454,4 @@
1158  es_EC.iso88591:                                        es_EC.ISO8859-1
1159 +es_EC.ISO-8859-1:                              es_EC.ISO8859-1
1160 +es_EC.ISO_8859-1:                              es_EC.ISO8859-1
1161  es_EC.utf8:                                    es_EC.UTF-8
1162 @@ -289,2 +464,5 @@
1163  es_ES.iso885915:                               es_ES.ISO8859-15
1164 +es_ES.iso885915@euro:                          es_ES.ISO8859-15
1165 +es_ES.ISO-88591-5@euro:                                es_ES.ISO8859-15
1166 +es_ES.ISO_88591-5@euro:                                es_ES.ISO8859-15
1167  es_ES@euro:                                    es_ES.ISO8859-15
1168 @@ -293,2 +471,4 @@
1169  es_GT.iso88591:                                        es_GT.ISO8859-1
1170 +es_GT.ISO-8859-1:                              es_GT.ISO8859-1
1171 +es_GT.ISO_8859-1:                              es_GT.ISO8859-1
1172  es_GT.utf8:                                    es_GT.UTF-8
1173 @@ -296,2 +476,4 @@
1174  es_HN.iso88591:                                        es_HN.ISO8859-1
1175 +es_HN.ISO-8859-1:                              es_HN.ISO8859-1
1176 +es_HN.ISO_8859-1:                              es_HN.ISO8859-1
1177  es_HN.utf8:                                    es_HN.UTF-8
1178 @@ -299,2 +481,4 @@
1179  es_MX.iso88591:                                        es_MX.ISO8859-1
1180 +es_MX.ISO-8859-1:                              es_MX.ISO8859-1
1181 +es_MX.ISO_8859-1:                              es_MX.ISO8859-1
1182  es_MX.utf8:                                    es_MX.UTF-8
1183 @@ -302,2 +486,4 @@
1184  es_NI.iso88591:                                        es_NI.ISO8859-1
1185 +es_NI.ISO-8859-1:                              es_NI.ISO8859-1
1186 +es_NI.ISO_8859-1:                              es_NI.ISO8859-1
1187  es_NI.utf8:                                    es_NI.UTF-8
1188 @@ -305,3 +491,4 @@
1189  es_PA.iso88591:                                        es_PA.ISO8859-1
1190 -es_PA.iso885915:                               es_PA.ISO8859-15
1191 +es_PA.ISO-8859-1:                              es_PA.ISO8859-1
1192 +es_PA.ISO_8859-1:                              es_PA.ISO8859-1
1193  es_PA.utf8:                                    es_PA.UTF-8
1194 @@ -309,3 +496,4 @@
1195  es_PE.iso88591:                                        es_PE.ISO8859-1
1196 -es_PE.iso885915:                               es_PE.ISO8859-15
1197 +es_PE.ISO-8859-1:                              es_PE.ISO8859-1
1198 +es_PE.ISO_8859-1:                              es_PE.ISO8859-1
1199  es_PE.utf8:                                    es_PE.UTF-8
1200 @@ -313,2 +501,4 @@
1201  es_PR.iso88591:                                        es_PR.ISO8859-1
1202 +es_PR.ISO-8859-1:                              es_PR.ISO8859-1
1203 +es_PR.ISO_8859-1:                              es_PR.ISO8859-1
1204  es_PR.utf8:                                    es_PR.UTF-8
1205 @@ -316,3 +506,4 @@
1206  es_PY.iso88591:                                        es_PY.ISO8859-1
1207 -es_PY.iso885915:                               es_PY.ISO8859-15
1208 +es_PY.ISO-8859-1:                              es_PY.ISO8859-1
1209 +es_PY.ISO_8859-1:                              es_PY.ISO8859-1
1210  es_PY.utf8:                                    es_PY.UTF-8
1211 @@ -320,8 +511,14 @@
1212  es_SV.iso88591:                                        es_SV.ISO8859-1
1213 -es_SV.iso885915:                               es_SV.ISO8859-15
1214 +es_SV.ISO-8859-1:                              es_SV.ISO8859-1
1215 +es_SV.ISO_8859-1:                              es_SV.ISO8859-1
1216  es_SV.utf8:                                    es_SV.UTF-8
1217  es_US:                                         es_US.ISO8859-1
1218 +es_US.iso88591:                                        es_US.ISO8859-1
1219 +es_US.ISO-8859-1:                              es_US.ISO8859-1
1220 +es_US.ISO_8859-1:                              es_US.ISO8859-1
1221 +es_US.utf8:                                    es_US.UTF-8
1222  es_UY:                                         es_UY.ISO8859-1
1223  es_UY.iso88591:                                        es_UY.ISO8859-1
1224 -es_UY.iso885915:                               es_UY.ISO8859-15
1225 +es_UY.ISO-8859-1:                              es_UY.ISO8859-1
1226 +es_UY.ISO_8859-1:                              es_UY.ISO8859-1
1227  es_UY.utf8:                                    es_UY.UTF-8
1228 @@ -329,3 +526,4 @@
1229  es_VE.iso88591:                                        es_VE.ISO8859-1
1230 -es_VE.iso885915:                               es_VE.ISO8859-15
1231 +es_VE.ISO-8859-1:                              es_VE.ISO8859-1
1232 +es_VE.ISO_8859-1:                              es_VE.ISO8859-1
1233  es_VE.utf8:                                    es_VE.UTF-8
1234 @@ -337,6 +535,8 @@
1235  XCOMM charset. EVS8:2000 specifies ISO8859-15 as base charset.
1236 -et:                                            et_EE.ISO8859-15
1237 -et_EE:                                         et_EE.ISO8859-15
1238 +XCOMM However we use ISO8859-1 for backward compatibility.
1239 +et:                                            et_EE.ISO8859-1
1240 +et_EE:                                         et_EE.ISO8859-1
1241  et_EE.iso88591:                                        et_EE.ISO8859-1
1242  et_EE.ISO-8859-1:                              et_EE.ISO8859-1
1243 +et_EE.ISO_8859-1:                              et_EE.ISO8859-1
1244  et_EE.iso88594:                                        et_EE.ISO8859-4
1245 @@ -344,2 +544,4 @@
1246  et_EE.iso885915:                               et_EE.ISO8859-15
1247 +et_EE.ISO-8859-15:                             et_EE.ISO8859-15
1248 +et_EE.ISO_8859-15:                             et_EE.ISO8859-15
1249  et_EE.utf8:                                    et_EE.UTF-8
1250 @@ -348,4 +550,10 @@
1251  eu_ES.iso88591:                                        eu_ES.ISO8859-1
1252 +eu_ES.ISO-8859-1:                              eu_ES.ISO8859-1
1253 +eu_ES.ISO_8859-1:                              eu_ES.ISO8859-1
1254  eu_ES.iso885915:                               eu_ES.ISO8859-15
1255 +eu_ES.iso885915@euro:                          eu_ES.ISO8859-15
1256 +eu_ES.ISO-8859-15@euro:                                eu_ES.ISO8859-15
1257 +eu_ES.ISO_8859-15@euro:                                eu_ES.ISO8859-15
1258  eu_ES@euro:                                    eu_ES.ISO8859-15
1259 +eu_ES.utf8:                                    eu_ES.UTF-8
1260  fa:                                            fa_IR.UTF-8
1261 @@ -354,4 +562,4 @@
1262  fa_IR.utf8:                                    fa_IR.UTF-8
1263 -fi:                                            fi_FI.ISO8859-15
1264 -fi_FI:                                         fi_FI.ISO8859-15
1265 +fi:                                            fi_FI.ISO8859-1
1266 +fi_FI:                                         fi_FI.ISO8859-1
1267  fi_FI.88591:                                   fi_FI.ISO8859-1
1268 @@ -362,2 +570,5 @@
1269  fi_FI.iso885915:                               fi_FI.ISO8859-15
1270 +fi_FI.iso885915@euro:                          fi_FI.ISO8859-15
1271 +fi_FI.ISO-8859-15@euro:                                fi_FI.ISO8859-15
1272 +fi_FI.ISO_8859-15@euro:                                fi_FI.ISO8859-15
1273  fi_FI@euro:                                    fi_FI.ISO8859-15
1274 @@ -365,2 +576,8 @@
1275  fi_FI.UTF-8@euro:                              fi_FI.UTF-8
1276 +fil:                                           fil_PH.ISO8859-1
1277 +fil_PH:                                                fil_PH.ISO8859-1
1278 +fil_PH.iso88591:                               fil_PH.ISO8859-1
1279 +fil_PH.ISO-8859-1:                             fil_PH.ISO8859-1
1280 +fil_PH.ISO_8859-1:                             fil_PH.ISO8859-1
1281 +fil_PH.utf8:                                   fil_PH.UTF-8
1282  fo:                                            fo_FO.ISO8859-1
1283 @@ -368,2 +585,4 @@
1284  fo_FO.iso88591:                                        fo_FO.ISO8859-1
1285 +fo_FO.ISO-8859-1:                              fo_FO.ISO8859-1
1286 +fo_FO.ISO_8859-1:                              fo_FO.ISO8859-1
1287  fo_FO.iso885915:                               fo_FO.ISO8859-15
1288 @@ -374,4 +593,9 @@
1289  fr_BE.88591.en:                                        fr_BE.ISO8859-1
1290 +fr_BE.iso88591:                                        fr_BE.ISO8859-1
1291 +fr_BE.ISO-8859-1:                              fr_BE.ISO8859-1
1292  fr_BE.ISO_8859-1:                              fr_BE.ISO8859-1
1293  fr_BE.iso885915:                               fr_BE.ISO8859-15
1294 +fr_BE.iso885915@euro:                          fr_BE.ISO8859-15
1295 +fr_BE.ISO-8859-15@euro:                                fr_BE.ISO8859-15
1296 +fr_BE.ISO_8859-15@euro:                                fr_BE.ISO8859-15
1297  fr_BE@euro:                                    fr_BE.ISO8859-15
1298 @@ -382,2 +606,3 @@
1299  fr_CA.iso88591:                                        fr_CA.ISO8859-1
1300 +fr_CA.ISO-8859-1:                              fr_CA.ISO8859-1
1301  fr_CA.ISO_8859-1:                              fr_CA.ISO8859-1
1302 @@ -388,2 +613,4 @@
1303  fr_CH.88591.en:                                        fr_CH.ISO8859-1
1304 +fr_CH.iso88591:                                        fr_CH.ISO8859-1
1305 +fr_CH.ISO-8859-1:                              fr_CH.ISO8859-1
1306  fr_CH.ISO_8859-1:                              fr_CH.ISO8859-1
1307 @@ -398,2 +625,5 @@
1308  fr_FR.iso885915:                               fr_FR.ISO8859-15
1309 +fr_FR.iso885915@euro:                          fr_FR.ISO8859-15
1310 +fr_FR.ISO-8859-15@euro:                                fr_FR.ISO8859-15
1311 +fr_FR.ISO_8859-15@euro:                                fr_FR.ISO8859-15
1312  fr_FR@euro:                                    fr_FR.ISO8859-15
1313 @@ -407,2 +637,5 @@
1314  fr_LU.iso885915:                               fr_LU.ISO8859-15
1315 +fr_LU.iso885915@euro:                          fr_LU.ISO8859-15
1316 +fr_LU.ISO-8859-15@euro:                                fr_LU.ISO8859-15
1317 +fr_LU.ISO_8859-15@euro:                                fr_LU.ISO8859-15
1318  fr_LU@euro:                                    fr_LU.ISO8859-15
1319 @@ -414,4 +647,9 @@
1320  ga_IE.iso88591:                                        ga_IE.ISO8859-1
1321 +ga_IE.ISO-8859-1:                              ga_IE.ISO8859-1
1322 +ga_IE.ISO_8859-1:                              ga_IE.ISO8859-1
1323  ga_IE.iso885914:                               ga_IE.ISO8859-14
1324  ga_IE.iso885915:                               ga_IE.ISO8859-15
1325 +ga_IE.iso885915@euro:                          ga_IE.ISO8859-15
1326 +ga_IE.ISO-8859-15@euro:                                ga_IE.ISO8859-15
1327 +ga_IE.ISO_8859-15@euro:                                ga_IE.ISO8859-15
1328  ga_IE@euro:                                    ga_IE.ISO8859-15
1329 @@ -421,4 +659,11 @@
1330  gd_GB.iso88591:                                        gd_GB.ISO8859-1
1331 +gd_GB.ISO-8859-1:                              gd_GB.ISO8859-1
1332 +gd_GB.ISO_8859-1:                              gd_GB.ISO8859-1
1333  gd_GB.iso885914:                               gd_GB.ISO8859-14
1334  gd_GB.iso885915:                               gd_GB.ISO8859-15
1335 +gd_GB.utf8:                                    gd_GB.UTF-8
1336 +gez_ER:                                                gez_ER.UTF-8
1337 +gez_ER@abegede:                                        gez_ER.UTF-8
1338 +gez_ER.utf8:                                   gez_ER.UTF-8
1339 +gez_ER.utf8@abegede:                           gez_ER.UTF-8
1340  gl:                                            gl_ES.ISO8859-1
1341 @@ -427,5 +672,12 @@
1342  gl_ES.ISO-8859-1:                              gl_ES.ISO8859-1
1343 +gl_ES.ISO_8859-1:                              gl_ES.ISO8859-1
1344  gl_ES.iso885915:                               gl_ES.ISO8859-15
1345 +gl_ES.iso885915@euro:                          gl_ES.ISO8859-15
1346 +gl_ES.ISO-8859-15@euro:                                gl_ES.ISO8859-15
1347 +gl_ES.ISO_8859-15@euro:                                gl_ES.ISO8859-15
1348  gl_ES@euro:                                    gl_ES.ISO8859-15
1349  gl_ES.utf8:                                    gl_ES.UTF-8
1350 +gu:                                            gu_IN.UTF-8
1351 +gu_IN:                                         gu_IN.UTF-8
1352 +gu_IN.utf8:                                    gu_IN.UTF-8
1353  gv:                                            gv_GB.ISO8859-1
1354 @@ -433,4 +685,7 @@
1355  gv_GB.iso88591:                                        gv_GB.ISO8859-1
1356 +gv_GB.ISO-8859-1:                              gv_GB.ISO8859-1
1357 +gv_GB.ISO_8859-1:                              gv_GB.ISO8859-1
1358  gv_GB.iso885914:                               gv_GB.ISO8859-14
1359  gv_GB.iso885915:                               gv_GB.ISO8859-15
1360 +gv_GB.utf8:                                    gv_GB.UTF-8
1361  he:                                            he_IL.ISO8859-8
1362 @@ -439,2 +694,4 @@
1363  he_IL.iso88598:                                        he_IL.ISO8859-8
1364 +he_IL.ISO-8859-8:                              he_IL.ISO8859-8
1365 +he_IL.ISO_8859-8:                              he_IL.ISO8859-8
1366  he_IL.cp1255:                                  he_IL.CP1255
1367 @@ -445,5 +702,5 @@
1368  HE_IL.UTF-8:                                   he_IL.UTF-8
1369 -hi:                                            hi_IN.ISCII-DEV
1370 -hi_IN:                                         hi_IN.ISCII-DEV
1371 -HI_IN:                                         hi_IN.ISCII-DEV
1372 +hi:                                            hi_IN.UTF-8
1373 +hi_IN:                                         hi_IN.UTF-8
1374 +HI_IN:                                         hi_IN.UTF-8
1375  hi_IN.isciidev:                                        hi_IN.ISCII-DEV
1376 @@ -457,2 +714,8 @@
1377  hr_HR.utf8:                                    hr_HR.UTF-8
1378 +hsb:                                           hsb_DE.ISO8859-2
1379 +hsb_DE:                                                hsb_DE.ISO8859-2
1380 +hsb_DE.iso88592:                               hsb_DE.ISO8859-2
1381 +hsb_DE.ISO-8859-2:                             hsb_DE.ISO8859-2
1382 +hsb_DE.ISO_8859-2:                             hsb_DE.ISO8859-2
1383 +hsb_DE.utf8:                                   hsb_DE.UTF-8
1384  hu:                                            hu_HU.ISO8859-2
1385 @@ -461,2 +724,17 @@
1386  hu_HU.ISO-8859-2:                              hu_HU.ISO8859-2
1387 +hu_HU.ISO_8859-2:                              hu_HU.ISO8859-2
1388 +hu_HU.iso885916:                               hu_HU.ISO8859-16
1389 +hu_HU.ISO-8859-16:                             hu_HU.ISO8859-16
1390 +hu_HU.ISO_8859-16:                             hu_HU.ISO8859-16
1391 +hu_HU.utf8:                                    hu_HU.UTF-8
1392 +hy:                                            hy_AM.UTF-8
1393 +hy_AM:                                         hy_AM.UTF-8
1394 +hy_AM.armscii8:                                        hy_AM.ARMSCII-8
1395 +hy_AM.utf8:                                    hy_AM.UTF-8
1396 +id:                                            id_ID.ISO8859-1
1397 +id_ID:                                         id_ID.ISO8859-1
1398 +id_ID.iso88591:                                        id_ID.ISO8859-1
1399 +id_ID.ISO-8859-1:                              id_ID.ISO8859-1
1400 +id_ID.ISO_8859-1:                              id_ID.ISO8859-1
1401 +id_ID.utf8:                                    id_ID.UTF-8
1402  XCOMM those lines should be deleted in a near future:
1403 @@ -474,2 +752,3 @@
1404  it_CH.iso88591:                                        it_CH.ISO8859-1
1405 +it_CH.ISO-8859-1:                              it_CH.ISO8859-1
1406  it_CH.ISO_8859-1:                              it_CH.ISO8859-1
1407 @@ -484,7 +763,10 @@
1408  it_IT.iso885915:                               it_IT.ISO8859-15
1409 +it_IT.iso885915@euro:                          it_IT.ISO8859-15
1410 +it_IT.ISO-8859-15@euro:                                it_IT.ISO8859-15
1411 +it_IT.ISO_8859-15@euro:                                it_IT.ISO8859-15
1412  it_IT@euro:                                    it_IT.ISO8859-15
1413  it_IT.utf8:                                    it_IT.UTF-8
1414 -iu:                                            iu_CA.NUNACOM-8
1415 -iu_CA:                                         iu_CA.NUNACOM-8
1416 -iu_CA.nunacom8:                                        iu_CA.NUNACOM-8
1417 +iu:                                            iu_CA.UTF-8
1418 +iu_CA:                                         iu_CA.UTF-8
1419 +iu_CA.utf8:                                    iu_CA.UTF-8
1420  XCOMM iw was the old iso code for hebrew (now he)
1421 @@ -497,4 +779,6 @@
1422  #ifndef __uxp__
1423 +ja:                                            ja_JP.eucJP
1424  ja_JP:                                         ja_JP.eucJP
1425  #else /* __uxp__ */
1426 +ja:                                            ja_JP.U90
1427  ja_JP:                                         ja_JP.U90
1428 @@ -503,6 +787,4 @@
1429  #endif /* __uxp__ */
1430 -ja:                                            ja_JP.eucJP
1431  ja.JIS:                                                ja_JP.JIS7
1432  ja.SJIS:                                       ja_JP.SJIS
1433 -ja_JP:                                         ja_JP.eucJP
1434  ja_JP.ujis:                                    ja_JP.eucJP
1435 @@ -511,2 +793,3 @@
1436  ja_JP.AJEC:                                    ja_JP.eucJP
1437 +ja_JP.eucjp:                                   ja_JP.eucJP
1438  ja_JP.EUC:                                     ja_JP.eucJP
1439 @@ -519,3 +802,2 @@
1440  ja_JP.mscode:                                  ja_JP.SJIS
1441 -ja_JP.SJIS:                                    ja_JP.SJIS
1442  ja_JP.sjis:                                    ja_JP.SJIS
1443 @@ -523,4 +805,4 @@
1444  JA_JP.utf8:                                    ja_JP.UTF-8
1445 -ka:                                            ka_GE.GEORGIAN-ACADEMY
1446 -ka_GE:                                         ka_GE.GEORGIAN-ACADEMY
1447 +ka:                                            ka_GE.GEORGIAN-PS
1448 +ka_GE:                                         ka_GE.GEORGIAN-PS
1449  ka_GE.georgianacademy:                         ka_GE.GEORGIAN-ACADEMY
1450 @@ -528,2 +810,7 @@
1451  ka_GE.georgianps:                              ka_GE.GEORGIAN-PS
1452 +ka_GE.utf8:                                    ka_GE.UTF-8
1453 +kk:                                            kk_KZ.PT154
1454 +kk_KZ                                          kk_KZ.PT154
1455 +kk_KZ.pt154                                    kk_KZ.PT154
1456 +kk_KZ.utf8                                     kk_KZ.UTF-8
1457  kl:                                            kl_GL.ISO8859-1
1458 @@ -531,4 +818,8 @@
1459  kl_GL.iso88591:                                        kl_GL.ISO8859-1
1460 -kl_GL.iso885915:                               kl_GL.ISO8859-15
1461 +kl_GL.ISO-8859-1:                              kl_GL.ISO8859-1
1462 +kl_GL.ISO_8859-1:                              kl_GL.ISO8859-1
1463  kl_GL.utf8:                                    kl_GL.UTF-8
1464 +kn:                                            kn_IN.UTF-8
1465 +kn_IN:                                         kn_IN.UTF-8
1466 +kn_IN.utf8:                                    kn_IN.UTF-8
1467  ko:                                            ko_KR.eucKR
1468 @@ -542,2 +833,5 @@
1469  KO_KR.UTF-8:                                   ko_KR.UTF-8
1470 +ku:                                            ku_TR.UTF-8
1471 +ku_TR:                                         ku_TR.UTF-8
1472 +ku_TR.utf8:                                    ku_TR.UTF-8
1473  kw:                                            kw_GB.ISO8859-1
1474 @@ -545,6 +839,37 @@
1475  kw_GB.iso88591:                                        kw_GB.ISO8859-1
1476 +kw_GB.ISO-8859-1:                              kw_GB.ISO8859-1
1477 +kw_GB.ISO_8859-1:                              kw_GB.ISO8859-1
1478  kw_GB.iso885914:                               kw_GB.ISO8859-14
1479  kw_GB.iso885915:                               kw_GB.ISO8859-15
1480 -lo:                                            lo_LA.MULELAO-1
1481 -lo_LA:                                         lo_LA.MULELAO-1
1482 +kw_GB.utf8:                                    kw_GB.UTF-8
1483 +ky:                                            ky_KG.UTF-8
1484 +ky_KG:                                         ky_KG.UTF-8
1485 +ky_KG.utf8:                                    ky_KG.UTF-8
1486 +lg:                                            lg_UG.ISO8859-10
1487 +lg_UG:                                         lg_UG.ISO8859-10
1488 +lg_UG.iso885910:                               lg_UG.ISO8859-10
1489 +lg_UG.ISO-8859-10:                             lg_UG.ISO8859-10
1490 +lg_UG.ISO_8859-10:                             lg_UG.ISO8859-10
1491 +lg_UG.utf8:                                    lg_UG.UTF-8
1492 +li:                                            li_BE.ISO8859-1
1493 +li_BE:                                         li_BE.ISO8859-1
1494 +li_BE.iso88591:                                        li_BE.ISO8859-1
1495 +li_BE.ISO-8859-1:                              li_BE.ISO8859-1
1496 +li_BE.ISO_8859-1:                              li_BE.ISO8859-1
1497 +li_BE.iso885915@euro:                          li_BE.ISO8859-15
1498 +li_BE.ISO-8859-15@euro:                                li_BE.ISO8859-15
1499 +li_BE.ISO_8859-15@euro:                                li_BE.ISO8859-15
1500 +li_BE@euro:                                    li_BE.ISO8859-15
1501 +li_BE.utf8:                                    li_BE.UTF-8
1502 +li_NL:                                         li_NL.ISO8859-1
1503 +li_NL.iso88591:                                        li_NL.ISO8859-1
1504 +li_NL.ISO-8859-1:                              li_NL.ISO8859-1
1505 +li_NL.ISO_8859-1:                              li_NL.ISO8859-1
1506 +li_NL.iso885915@euro:                          li_NL.ISO8859-15
1507 +li_NL.ISO-8859-15@euro:                                li_NL.ISO8859-15
1508 +li_NL.ISO_8859-15@euro:                                li_NL.ISO8859-15
1509 +li_NL@euro:                                    li_NL.ISO8859-15
1510 +li_NL.utf8:                                    li_NL.UTF-8
1511 +lo:                                            lo_LA.UTF-8
1512 +lo_LA:                                         lo_LA.UTF-8
1513  lo_LA.cp1133:                                  lo_LA.IBM-CP1133
1514 @@ -552,2 +877,3 @@
1515  lo_LA.mulelao1:                                        lo_LA.MULELAO-1
1516 +lo_LA.utf8:                                    lo_LA.UTF-8
1517  #if defined(VeryOldFreeBSD)
1518 @@ -567,2 +893,4 @@
1519  lt_LT.utf8:                                    lt_LT.UTF-8
1520 +lug:                                           lg_UG.ISO8859-10
1521 +lug_UG:                                                lg_UG.ISO8859-10
1522  lv:                                            lv_LV.ISO8859-13
1523 @@ -577,2 +905,5 @@
1524  mi_NZ.iso88591:                                        mi_NZ.ISO8859-1
1525 +mi_NZ.ISO-8859-1:                              mi_NZ.ISO8859-1
1526 +mi_NZ.ISO_8859-1:                              mi_NZ.ISO8859-1
1527 +mi_NZ.utf8:                                    mi_NZ.UTF-8
1528  mk:                                            mk_MK.ISO8859-5
1529 @@ -580,2 +911,4 @@
1530  mk_MK.iso88595:                                        mk_MK.ISO8859-5
1531 +mk_MK.ISO-8859-5:                              mk_MK.ISO8859-5
1532 +mk_MK.ISO_8859-5:                              mk_MK.ISO8859-5
1533  mk_MK.cp1251:                                  mk_MK.CP1251
1534 @@ -585,2 +918,10 @@
1535  mk_MK.utf8:                                    mk_MK.UTF-8
1536 +ml:                                            ml_IN.UTF-8
1537 +ml_IN:                                         ml_IN.UTF-8
1538 +ml_IN.utf8:                                    ml_IN.UTF-8
1539 +mn:                                            mn_MN.UTF-8
1540 +mn_MN:                                         mn_MN.UTF-8
1541 +mn_MN.utf8:                                    mn_MN.UTF-8
1542 +mr:                                            mr_IN.UTF-8
1543 +mr_IN:                                         mr_IN.UTF-8
1544  mr_IN.utf8:                                    mr_IN.UTF-8
1545 @@ -589,5 +930,11 @@
1546  ms_MY.iso88591:                                        ms_MY.ISO8859-1
1547 +ms_MY.ISO-8859-1:                              ms_MY.ISO8859-1
1548 +ms_MY.ISO_8859-1:                              ms_MY.ISO8859-1
1549 +ms_MY.utf8:                                    ms_MY.UTF-8
1550  mt:                                            mt_MT.ISO8859-3
1551  mt_MT:                                         mt_MT.ISO8859-3
1552 -mt_MT.ISO8859-3:                               mt_MT.ISO8859-3
1553 +mt_MT.iso88593:                                        mt_MT.ISO8859-3
1554 +mt_MT.ISO-8859-3:                              mt_MT.ISO8859-3
1555 +mt_MT.ISO_8859-3:                              mt_MT.ISO8859-3
1556 +mt_MT.utf8:                                    mt_MT.UTF-8
1557  nb:                                            nb_NO.ISO8859-1
1558 @@ -596,3 +943,23 @@
1559  nb_NO.ISO-8859-1:                              nb_NO.ISO8859-1
1560 +nb_NO.ISO_8859-1:                              nb_NO.ISO8859-1
1561  nb_NO.iso885915:                               nb_NO.ISO8859-15
1562 +nb_NO.utf8:                                    nb_NO.UTF-8
1563 +nds:                                           nds_DE.ISO8859-1
1564 +nds_DE:                                                nds_DE.ISO8859-1
1565 +nds_DE.iso88591:                               nds_DE.ISO8859-1
1566 +nds_DE.ISO-8859-1:                             nds_DE.ISO8859-1
1567 +nds_DE.ISO_8859-1:                             nds_DE.ISO8859-1
1568 +nds_DE.iso88591@traditional:                   nds_DE.ISO8859-1
1569 +nds_DE.ISO-8859-1@traditional:                 nds_DE.ISO8859-1
1570 +nds_DE.ISO_8859-1@traditional:                 nds_DE.ISO8859-1
1571 +nds_DE@traditional:                            nds_DE.ISO8859-1
1572 +nds_DE.iso885915:                              nds_DE.ISO8859-15
1573 +nds_DE.iso885915@euro:                         nds_DE.ISO8859-15
1574 +nds_DE.ISO-8859-15@euro:                       nds_DE.ISO8859-15
1575 +nds_DE.ISO_8859-15@euro:                       nds_DE.ISO8859-15
1576 +nds_DE@euro:                                   nds_DE.ISO8859-15
1577 +nds_DE.utf8:                                   nds_DE.UTF-8
1578 +ne:                                            ne_NP.UTF-8
1579 +ne_NP:                                         ne_NP.UTF-8
1580 +ne_NP.utf8:                                    ne_NP.UTF-8
1581  nl:                                            nl_NL.ISO8859-1
1582 @@ -602,4 +969,8 @@
1583  nl_BE.iso88591:                                        nl_BE.ISO8859-1
1584 +nl_BE.ISO-8859-1:                              nl_BE.ISO8859-1
1585  nl_BE.ISO_8859-1:                              nl_BE.ISO8859-1
1586  nl_BE.iso885915:                               nl_BE.ISO8859-15
1587 +nl_BE.iso885915@euro:                          nl_BE.ISO8859-15
1588 +nl_BE.ISO-8859-15@euro:                                nl_BE.ISO8859-15
1589 +nl_BE.ISO_8859-15@euro:                                nl_BE.ISO8859-15
1590  nl_BE@euro:                                    nl_BE.ISO8859-15
1591 @@ -613,2 +984,5 @@
1592  nl_NL.iso885915:                               nl_NL.ISO8859-15
1593 +nl_NL.iso885915@euro:                          nl_NL.ISO8859-15
1594 +nl_NL.ISO-8859-15@euro:                                nl_NL.ISO8859-15
1595 +nl_NL.ISO_8859-15@euro:                                nl_NL.ISO8859-15
1596  nl_NL@euro:                                    nl_NL.ISO8859-15
1597 @@ -619,17 +993,33 @@
1598  nn_NO.ISO_8859-1:                              nn_NO.ISO8859-1
1599 +nn_NO.ISO-8859-1:                              nn_NO.ISO8859-1
1600  nn_NO.iso885915:                               nn_NO.ISO8859-15
1601 -no:                                            no_NO.ISO8859-1
1602 -no_NO:                                         no_NO.ISO8859-1
1603 -no_NO.88591:                                   no_NO.ISO8859-1
1604 -no_NO.88591.en:                                        no_NO.ISO8859-1
1605 -no_NO.iso88591:                                        no_NO.ISO8859-1
1606 -no_NO.ISO-8859-1:                              no_NO.ISO8859-1
1607 -no_NO.iso885915:                               no_NO.ISO8859-15
1608 -no_NO.utf8:                                    no_NO.UTF-8
1609 -ny:                                            ny_NO.ISO8859-1
1610 -ny_NO:                                         ny_NO.ISO8859-1
1611 -ny_NO.88591:                                   ny_NO.ISO8859-1
1612 -ny_NO.ISO_8859-1:                              ny_NO.ISO8859-1
1613 -ny_NO.iso885915:                               ny_NO.ISO8859-15
1614 -no@nynorsk:                                    ny_NO.ISO8859-1
1615 +nn_NO.utf8:                                    nn_NO.UTF-8
1616 +no:                                            nb_NO.ISO8859-1
1617 +no_NO:                                         nb_NO.ISO8859-1
1618 +no_NO.88591:                                   nb_NO.ISO8859-1
1619 +no_NO.88591.en:                                        nb_NO.ISO8859-1
1620 +no_NO.iso88591:                                        nb_NO.ISO8859-1
1621 +no_NO.ISO-8859-1:                              nb_NO.ISO8859-1
1622 +no_NO.ISO8859-1:                               nb_NO.ISO8859-1
1623 +no_NO.iso885915:                               nb_NO.ISO8859-15
1624 +no_NO.utf8:                                    nb_NO.UTF-8
1625 +nr:                                            nr_ZA.ISO8859-10
1626 +nr_ZA:                                         nr_ZA.ISO8859-10
1627 +nr_ZA.iso88591:                                        nr_ZA.ISO8859-10
1628 +nr_ZA.ISO-8859-1:                              nr_ZA.ISO8859-10
1629 +nr_ZA.ISO_8859-1:                              nr_ZA.ISO8859-10
1630 +nr_ZA.utf8:                                    nr_ZA.UTF-8
1631 +nso:                                           nso_ZA.ISO8859-10
1632 +nso_ZA:                                                nso_ZA.ISO8859-10
1633 +nso_ZA.iso885910:                              nso_ZA.ISO8859-10
1634 +nso_ZA.ISO-8859-10:                            nso_ZA.ISO8859-10
1635 +nso_ZA.ISO_8859-10:                            nso_ZA.ISO8859-10
1636 +nso_ZA.utf8:                                   nso_ZA.UTF-8
1637 +ny:                                            nn_NO.ISO8859-1
1638 +ny_NO:                                         nn_NO.ISO8859-1
1639 +ny_NO.88591:                                   nn_NO.ISO8859-1
1640 +ny_NO.ISO_8859-1:                              nn_NO.ISO8859-1
1641 +ny_NO.ISO8859-1:                               nn_NO.ISO8859-1
1642 +ny_NO.iso885915:                               nn_NO.ISO8859-15
1643 +no@nynorsk:                                    nn_NO.ISO8859-1
1644  nynorsk:                                       nn_NO.ISO8859-1
1645 @@ -638,4 +1028,30 @@
1646  oc_FR.iso88591:                                        oc_FR.ISO8859-1
1647 +oc_FR.ISO-8859-1:                              oc_FR.ISO8859-1
1648 +oc_FR.ISO_8859-1:                              oc_FR.ISO8859-1
1649  oc_FR.iso885915:                               oc_FR.ISO8859-15
1650 +oc_FR.iso885915@euro:                          oc_FR.ISO8859-15
1651 +oc_FR.ISO-8859-15@euro:                                oc_FR.ISO8859-15
1652 +oc_FR.ISO_8859-15@euro:                                oc_FR.ISO8859-15
1653  oc_FR@euro:                                    oc_FR.ISO8859-15
1654 +oc_FR.utf8:                                    oc_FR.UTF-8
1655 +om:                                            om_ET.UTF-8
1656 +om_ET:                                         om_ET.UTF-8
1657 +om_ET.utf8:                                    om_ET.UTF-8
1658 +om_KE:                                         om_KE.ISO8859-1
1659 +om_KE.iso88591:                                        om_KE.ISO8859-1
1660 +om_KE.ISO-8859-1:                              om_KE.ISO8859-1
1661 +om_KE.ISO_8859-1:                              om_KE.ISO8859-1
1662 +om_KE.utf8:                                    om_KE.UTF-8
1663 +or:                                            or_IN.UTF-8
1664 +or_IN:                                         or_IN.UTF-8
1665 +or_IN.utf8:                                    or_IN.UTF-8
1666 +pa:                                            pa_IN.UTF-8
1667 +pa_IN:                                         pa_IN.UTF-8
1668 +pa_IN.utf8:                                    pa_IN.UTF-8
1669 +pap:                                           pap_AN.ISO8859-1
1670 +pap_AN:                                                pap_AN.ISO8859-1
1671 +pap_AN.iso88591:                               pap_AN.ISO8859-1
1672 +pap_AN.ISO-8859-1:                             pap_AN.ISO8859-1
1673 +pap_AN.ISO_8859-1:                             pap_AN.ISO8859-1
1674 +pap_AN.utf8:                                   pap_AN.UTF-8
1675  pd:                                            pd_US.ISO8859-1
1676 @@ -647,5 +1063,6 @@
1677  pd_US.iso885915:                               pd_US.ISO8859-15
1678 -ph:                                            ph_PH.ISO8859-1
1679 -ph_PH:                                         ph_PH.ISO8859-1
1680 -ph_PH.iso88591:                                        ph_PH.ISO8859-1
1681 +ph:                                            fil_PH.ISO8859-1
1682 +ph_PH:                                         fil_PH.ISO8859-1
1683 +ph_PH.iso88591:                                        fil_PH.ISO8859-1
1684 +ph_PH.ISO8859-1                                        fil_PH.ISO8859-1
1685  pl:                                            pl_PL.ISO8859-2
1686 @@ -654,6 +1071,11 @@
1687  pl_PL.ISO-8859-2:                              pl_PL.ISO8859-2
1688 +pl_PL.ISO_8859-2:                              pl_PL.ISO8859-2
1689 +pl_PL.iso885916:                               pl_PL.ISO8859-16
1690 +pl_PL.ISO-8859-16:                             pl_PL.ISO8859-16
1691 +pl_PL.ISO_8859-16:                             pl_PL.ISO8859-16
1692  pl_PL.utf8:                                    pl_PL.UTF-8
1693 -pp:                                            pp_AN.ISO8859-1
1694 -pp_AN:                                         pp_AN.ISO8859-1
1695 -pp_AN.iso88591:                                        pp_AN.ISO8859-1
1696 +pp:                                            pap_AN.ISO8859-1
1697 +pp_AN:                                         pap_AN.ISO8859-1
1698 +pp_AN.iso88591:                                        pap_AN.ISO8859-1
1699 +pp_AN.ISO8859-1                                        pap_AN.ISO8859-1
1700  pt:                                            pt_PT.ISO8859-1
1701 @@ -665,3 +1087,2 @@
1702  pt_BR.ISO_8859-1:                              pt_BR.ISO8859-1
1703 -pt_BR.iso885915:                               pt_BR.ISO8859-15
1704  pt_BR.utf8:                                    pt_BR.UTF-8
1705 @@ -674,2 +1095,5 @@
1706  pt_PT.iso885915:                               pt_PT.ISO8859-15
1707 +pt_PT.iso885915@euro:                          pt_PT.ISO8859-15
1708 +pt_PT.ISO-8859-15@euro:                                pt_PT.ISO8859-15
1709 +pt_PT.ISO_8859-15@euro:                                pt_PT.ISO8859-15
1710  pt_PT@euro:                                    pt_PT.ISO8859-15
1711 @@ -681,7 +1105,12 @@
1712  ro_RO.ISO-8859-2:                              ro_RO.ISO8859-2
1713 +ro_RO.ISO_8859-2:                              ro_RO.ISO8859-2
1714 +ro_RO.iso885916:                               ro_RO.ISO8859-16
1715 +ro_RO.ISO-8859-16:                             ro_RO.ISO8859-16
1716 +ro_RO.ISO_8859-16:                             ro_RO.ISO8859-16
1717  ro_RO.utf8:                                    ro_RO.UTF-8
1718 -ru:                                            ru_RU.KOI8-R
1719 -ru_RU:                                         ru_RU.KOI8-R
1720 +ru:                                            ru_RU.ISO8859-5
1721 +ru_RU:                                         ru_RU.ISO8859-5
1722  ru_RU.iso88595:                                        ru_RU.ISO8859-5
1723  ru_RU.ISO-8859-5:                              ru_RU.ISO8859-5
1724 +ru_RU.ISO_8859-5:                              ru_RU.ISO8859-5
1725  ru_RU.koi8r:                                   ru_RU.KOI8-R
1726 @@ -691,2 +1120,3 @@
1727  ru_RU.MICROSOFT-CP1251:                                ru_RU.CP1251
1728 +ru_RU.utf8:                                    ru_RU.UTF-8
1729  #if defined(INCLUDE_ru_SU)
1730 @@ -703,9 +1133,22 @@
1731  ru_UA.MICROSOFT-CP1251:                                ru_UA.CP1251
1732 +ru_UA.utf8:                                    ru_UA.UTF-8
1733 +rw:                                            rw_RW.ISO8859-1
1734 +rw_RW:                                         rw_RW.ISO8859-1
1735 +rw_RW.iso88591:                                        rw_RW.ISO8859-1
1736 +rw_RW.ISO-8859-1:                              rw_RW.ISO8859-1
1737 +rw_RW.ISO_8859-1:                              rw_RW.ISO8859-1
1738 +rw_RW.utf8:                                    rw_RW.UTF-8
1739  se_NO:                                         se_NO.UTF-8
1740  se_NO.utf8:                                    se_NO.UTF-8
1741 -sh:                                            sh_YU.ISO8859-2
1742 -sh_HR.iso88592:                                        sh_HR.ISO8859-2
1743 -sh_SP:                                         sh_YU.ISO8859-2
1744 -sh_YU:                                         sh_YU.ISO8859-2
1745 -sh_YU.utf8:                                    sh_YU.UTF-8
1746 +sh:                                            sr_CS.ISO8859-2
1747 +sh_HR.iso88592:                                        hr_HR.ISO8859-2
1748 +sh_SP:                                         sr_CS.ISO8859-2
1749 +sh_YU:                                         sr_CS.ISO8859-2
1750 +sh_YU.utf8:                                    sh_CS.UTF-8
1751 +si:                                            si_LK.UTF-8
1752 +si_LK:                                         si_LK.UTF-8
1753 +si_LK.utf8:                                    si_LK.UTF-8
1754 +sid:                                           sid_ET.UTF-8
1755 +sid_ET:                                                sid_ET.UTF-8
1756 +sid_ET.utf8:                                   sid_ET.UTF-8
1757  sk:                                            sk_SK.ISO8859-2
1758 @@ -713,2 +1156,3 @@
1759  sk_SK.iso88592:                                        sk_SK.ISO8859-2
1760 +sk_SK.ISO_8859-2:                              sk_SK.ISO8859-2
1761  sk_SK.ISO-8859-2:                              sk_SK.ISO8859-2
1762 @@ -719,25 +1163,77 @@
1763  sl_SI.ISO-8859-2:                              sl_SI.ISO8859-2
1764 +sl_SI.ISO_8859-2:                              sl_SI.ISO8859-2
1765 +sl_SI.iso885916:                               sl_SI.ISO8859-16
1766 +sl_SI.ISO-8859-16:                             sl_SI.ISO8859-16
1767 +sl_SI.ISO_8859-16:                             sl_SI.ISO8859-16
1768  sl_SI.utf8:                                    sl_SI.UTF-8
1769 -sp:                                            sp_YU.ISO8859-5
1770 -sp_YU:                                         sp_YU.ISO8859-5
1771 +so_DJ:                                         so_DJ.ISO8859-1
1772 +so_DJ.iso88591:                                        so_DJ.ISO8859-1
1773 +so_DJ.ISO-8859-1:                              so_DJ.ISO8859-1
1774 +so_DJ.ISO_8859-1:                              so_DJ.ISO8859-1
1775 +so_DJ.utf8:                                    so_DJ.UTF-8
1776 +so_ET:                                         so_ET.UTF-8
1777 +so_ET.utf8:                                    so_ET.UTF-8
1778 +so_KE:                                         so_KE.ISO8859-1
1779 +so_KE.iso88591:                                        so_KE.ISO8859-1
1780 +so_KE.ISO-8859-1:                              so_KE.ISO8859-1
1781 +so_KE.ISO_8859-1:                              so_KE.ISO8859-1
1782 +so_KE.utf8:                                    so_KE.UTF-8
1783 +so_SO:                                         so_SO.ISO8859-1
1784 +so_SO.iso88591:                                        so_SO.ISO8859-1
1785 +so_SO.ISO-8859-1:                              so_SO.ISO8859-1
1786 +so_SO.ISO_8859-1:                              so_SO.ISO8859-1
1787 +so_SO.utf8:                                    so_SO.UTF-8
1788 +sp:                                            sr_CS.ISO8859-5
1789 +sp_YU:                                         sr_CS.ISO8859-5
1790  sq:                                            sq_AL.ISO8859-2
1791 -sq_AL:                                         sq_AL.ISO8859-2
1792 +sq_AL:                                         sq_AL.ISO8859-1
1793 +sq_AL.iso88591:                                        sq_AL.ISO8859-1
1794 +sq_AL.ISO-8859-1:                              sq_AL.ISO8859-1
1795 +sq_AL.ISO_8859-1:                              sq_AL.ISO8859-1
1796  sq_AL.iso88592:                                        sq_AL.ISO8859-2
1797  sq_AL.utf8:                                    sq_AL.UTF-8
1798 -sr_SP:                                         sr_SP.ISO8859-2
1799 -sr:                                            sr_YU.ISO8859-5
1800 -sr_YU:                                         sr_YU.ISO8859-5
1801 -sr_YU.iso88592:                                        sr_YU.ISO8859-2
1802 -sr_YU.iso88595:                                        sr_YU.ISO8859-5
1803 -sr@cyrillic:                                   sr_YU.ISO8859-5
1804 -sr_YU@cyrillic:                                        sr_YU.ISO8859-5
1805 -sr_YU.iso88595@cyrillic:                       sr_YU.ISO8859-5
1806 -sr_YU.ISO8859-5@cyrillic:                      sr_YU.ISO8859-5
1807 -sr_YU.cp1251@cyrillic:                         sr_YU.CP1251
1808 -sr_YU.CP1251@cyrillic:                         sr_YU.CP1251
1809 -sr_YU.microsoftcp1251@cyrillic:                        sr_YU.CP1251
1810 -sr_YU.microsoft-cp1251@cyrillic:               sr_YU.CP1251
1811 -sr_YU.MICROSOFT-CP1251@cyrillic:               sr_YU.CP1251
1812 -sr_YU.utf8:                                    sr_YU.UTF-8
1813 -sr_YU.UTF-8@cyrillic:                          sr_YU.UTF-8
1814 +sr_SP:                                         sr_CS.ISO8859-2
1815 +sr:                                            sr_CS.ISO8859-5
1816 +sr_CS:                                         sr_CS.ISO8859-5
1817 +sr_CS.iso88592:                                        sr_CS.ISO8859-2
1818 +sr_CS.iso88592@Latn:                           sr_CS.ISO8859-2
1819 +sr_CS.ISO-8859-2@Latn:                         sr_CS.ISO8859-2
1820 +sr_CS.ISO_8859-2@Latn:                         sr_CS.ISO8859-2
1821 +sr@Latn:                                       sr_CS.ISO8859-2
1822 +sr_CS@Latn:                                    sr_CS.ISO8859-2
1823 +sr_CS.iso88595:                                        sr_CS.ISO8859-5
1824 +sr_CS.ISO-8859-5:                              sr_CS.ISO8859-5
1825 +sr_CS.ISO_8859-5:                              sr_CS.ISO8859-5
1826 +sr@ije:                                                sr_CS.ISO8859-5
1827 +sr_CS@ije:                                     sr_CS.ISO8859-5
1828 +sr_CS.iso88595@ije:                            sr_CS.ISO8859-5
1829 +sr_CS.ISO-8859-5@ije:                          sr_CS.ISO8859-5
1830 +sr_CS.ISO_8859-5@ije:                          sr_CS.ISO8859-5
1831 +sr_CS.utf8:                                    sr_CS.UTF-8
1832 +sr_YU:                                         sr_CS.ISO8859-5
1833 +sr_YU.iso88592:                                        sr_CS.ISO8859-2
1834 +sr_YU.iso88595:                                        sr_CS.ISO8859-5
1835 +sr@cyrillic:                                   sr_CS.ISO8859-5
1836 +sr_YU@cyrillic:                                        sr_CS.ISO8859-5
1837 +sr_YU.iso88595@cyrillic:                       sr_CS.ISO8859-5
1838 +sr_YU.ISO8859-5@cyrillic:                      sr_CS.ISO8859-5
1839 +sr_YU.cp1251@cyrillic:                         sr_CS.CP1251
1840 +sr_YU.CP1251@cyrillic:                         sr_CS.CP1251
1841 +sr_YU.microsoftcp1251@cyrillic:                        sr_CS.CP1251
1842 +sr_YU.microsoft-cp1251@cyrillic:               sr_CS.CP1251
1843 +sr_YU.MICROSOFT-CP1251@cyrillic:               sr_CS.CP1251
1844 +sr_YU.utf8:                                    sr_CS.UTF-8
1845 +sr_YU.UTF-8@cyrillic:                          sr_CS.UTF-8
1846 +ss:                                            ss_ZA.ISO8859-1
1847 +ss_ZA:                                         ss_ZA.ISO8859-1
1848 +ss_ZA.iso88591:                                        ss_ZA.ISO8859-1
1849 +ss_ZA.ISO-8859-1:                              ss_ZA.ISO8859-1
1850 +ss_ZA.ISO_8859-1:                              ss_ZA.ISO8859-1
1851 +ss_ZA.utf8:                                    ss_ZA.UTF-8
1852 +st:                                            st_ZA.ISO8859-1
1853 +st_ZA:                                         st_ZA.ISO8859-1
1854 +st_ZA.iso88591:                                        st_ZA.ISO8859-1
1855 +st_ZA.ISO-8859-1:                              st_ZA.ISO8859-1
1856 +st_ZA.ISO_8859-1:                              st_ZA.ISO8859-1
1857 +st_ZA.utf8:                                    st_ZA.UTF-8
1858  sv:                                            sv_SE.ISO8859-1
1859 @@ -746,2 +1242,5 @@
1860  sv_FI.iso885915:                               sv_FI.ISO8859-15
1861 +sv_FI.iso885915@euro:                          sv_FI.ISO8859-15
1862 +sv_FI.ISO-8859-15@euro:                                sv_FI.ISO8859-15
1863 +sv_FI.ISO_8859-15@euro:                                sv_FI.ISO8859-15
1864  sv_FI@euro:                                    sv_FI.ISO8859-15
1865 @@ -757,12 +1256,20 @@
1866  sv_SE.utf8:                                    sv_SE.UTF-8
1867 -ta:                                            ta_IN.TSCII-0
1868 -ta_IN:                                         ta_IN.TSCII-0
1869 +ta:                                            ta_IN.UTF-8
1870 +ta_IN:                                         ta_IN.UTF-8
1871  ta_IN.tscii:                                   ta_IN.TSCII-0
1872  ta_IN.tscii0:                                  ta_IN.TSCII-0
1873 -tg:                                            tg_TJ.KOI8-C
1874 -tg_TJ:                                         tg_TJ.KOI8-C
1875 +ta_IN.utf8:                                    ta_IN.UTF-8
1876 +te:                                            te_IN.UTF-8
1877 +te_IN:                                         te_IN.UTF-8
1878 +te_IN.utf8:                                    te_IN.UTF-8
1879 +tg:                                            tg_TJ.KOI8-T
1880 +tg_TJ:                                         tg_TJ.KOI8-T
1881  tg_TJ.koi8c:                                   tg_TJ.KOI8-C
1882 +tg_TJ.koi8t:                                   tg_TJ.KOI8-T
1883 +tg_TJ.utf8:                                    tg_TJ.UTF-8
1884  th:                                            th_TH.ISO8859-11
1885  th_TH:                                         th_TH.ISO8859-11
1886 +th_TH.iso885911:                               th_TH.ISO8859-11
1887  th_TH.ISO-8859-11:                             th_TH.ISO8859-11
1888 +th_TH.ISO_8859-11:                             th_TH.ISO8859-11
1889  th_TH.tis620:                                  th_TH.TIS620
1890 @@ -771,2 +1278,13 @@
1891  th_TH.utf8:                                    th_TH.UTF-8
1892 +ti:                                            ti_ER.UTF-8
1893 +ti_ER:                                         ti_ER.UTF-8
1894 +ti_ER.utf8:                                    ti_ER.UTF-8
1895 +ti_ET:                                         ti_ET.UTF-8
1896 +ti_ET.utf8:                                    ti_ET.UTF-8
1897 +tig:                                           tig_ER.UTF-8
1898 +tig_ER:                                                tig_ER.UTF-8
1899 +tig_ER.utf8:                                   tig_ER.UTF-8
1900 +tk:                                            tk_TM.UTF-8
1901 +tk_TM:                                         tk_TM.UTF-8
1902 +tk_TM.utf8:                                    tk_TM.UTF-8
1903  tl:                                            tl_PH.ISO8859-1
1904 @@ -774,3 +1292,17 @@
1905  tl_PH.iso88591:                                        tl_PH.ISO8859-1
1906 +tl_PH.ISO-8859-1:                              tl_PH.ISO8859-1
1907 +tl_PH.ISO_8859-1:                              tl_PH.ISO8859-1
1908 +tl_PH.utf8:                                    tl_PH.UTF-8
1909 +tn:                                            tn_ZA.ISO8859-10
1910 +tn_ZA:                                         tn_ZA.ISO8859-10
1911 +tn_ZA.iso885910:                               tn_ZA.ISO8859-10
1912 +tn_ZA.ISO-8859-10:                             tn_ZA.ISO8859-10
1913 +tn_ZA.ISO_8859-10:                             tn_ZA.ISO8859-10
1914 +tn_ZA.utf8:                                    tn_ZA.UTF-8
1915  tr:                                            tr_TR.ISO8859-9
1916 +tr_CY:                                         tr_CY.ISO8859-9
1917 +tr_CY.iso88599:                                        tr_CY.ISO8859-9
1918 +tr_CY.ISO-8859-9:                              tr_CY.ISO8859-9
1919 +tr_CY.ISO_8859-9:                              tr_CY.ISO8859-9
1920 +tr_CY.utf8:                                    tr_CY.UTF-8
1921  tr_TR:                                         tr_TR.ISO8859-9
1922 @@ -779,4 +1311,11 @@
1923  tr_TR.ISO-8859-9:                              tr_TR.ISO8859-9
1924 +tr_TR.ISO_8859-9:                              tr_TR.ISO8859-9
1925  tr_TR.utf8:                                    tr_TR.UTF-8
1926  TR_TR.utf8:                                    tr_TR.UTF-8
1927 +ts:                                            ts_ZA.ISO8859-1
1928 +ts_ZA:                                         ts_ZA.ISO8859-1
1929 +ts_ZA.iso88591:                                        ts_ZA.ISO8859-1
1930 +ts_ZA.ISO-8859-1:                              ts_ZA.ISO8859-1
1931 +ts_ZA.ISO_8859-1:                              ts_ZA.ISO8859-1
1932 +ts_ZA.utf8:                                    ts_ZA.UTF-8
1933  tt:                                            tt_RU.TATAR-CYR
1934 @@ -785,2 +1324,3 @@
1935  tt_RU.koi8c:                                   tt_RU.KOI8-C
1936 +tt_RU.utf8:                                    tt_RU.UTF-8
1937  uk:                                            uk_UA.KOI8-U
1938 @@ -788,2 +1328,4 @@
1939  uk_UA.iso88595:                                        uk_UA.ISO8859-5
1940 +uk_UA.ISO-8859-5:                              uk_UA.ISO8859-5
1941 +uk_UA.ISO_8859-5:                              uk_UA.ISO8859-5
1942  uk_UA.koi8u:                                   uk_UA.KOI8-U
1943 @@ -800,4 +1342,20 @@
1944  ur_PK.MICROSOFT-CP1256:                                ur_PK.CP1256
1945 +ur_PK.utf8:                                    ur_PK.UTF-8
1946  uz:                                            uz_UZ.UTF-8
1947  uz_UZ:                                         uz_UZ.UTF-8
1948 +uz_UZ.iso88591:                                        uz_UZ.ISO8859-1
1949 +uz_UZ.ISO-8859-1:                              uz_UZ.ISO8859-1
1950 +uz_UZ.ISO_8859-1:                              uz_UZ.ISO8859-1
1951 +uz_UZ.utf8:                                    uz_UZ.UTF-8
1952 +uz@Latn:                                       uz_UZ.ISO8859-1
1953 +uz_UZ@Latn:                                    uz_UZ.ISO8859-1
1954 +uz@cyrillic:                                   uz_UZ.UTF-8
1955 +uz_UZ@cyrillic:                                        uz_UZ.UTF-8
1956 +uz_UZ.utf8@cyrillic:                           uz_UZ.UTF-8
1957 +ve:                                            ve_ZA.UTF-8
1958 +ve_ZA:                                         ve_ZA.UTF-8
1959 +ve_ZA.utf-8:                                   ve_ZA.UTF-8
1960 +ven:                                           ve_ZA.UTF-8
1961 +ven_ZA:                                                ve_ZA.UTF-8
1962 +ven_ZA.utf-8:                                  ve_ZA.UTF-8
1963  vi:                                            vi_VN.TCVN
1964 @@ -808,2 +1366,3 @@
1965  vi_VN.tcvn5712:                                        vi_VN.TCVN
1966 +vi_VN.utf8:                                    vi_VN.UTF-8
1967  vi_VN.viscii:                                  vi_VN.VISCII
1968 @@ -815,4 +1374,16 @@
1969  wa_BE.iso88591:                                        wa_BE.ISO8859-1
1970 +wa_BE.ISO-8859-1:                              wa_BE.ISO8859-1
1971 +wa_BE.ISO_8859-1:                              wa_BE.ISO8859-1
1972  wa_BE.iso885915:                               wa_BE.ISO8859-15
1973 +wa_BE.iso885915@euro:                          wa_BE.ISO8859-15
1974 +wa_BE.ISO-8859-15@euro:                                wa_BE.ISO8859-15
1975 +wa_BE.ISO_8859-15@euro:                                wa_BE.ISO8859-15
1976  wa_BE@euro:                                    wa_BE.ISO8859-15
1977 +wa_BE.utf8:                                    wa_BE.UTF-8
1978 +xh:                                            xh_ZA.ISO8859-1
1979 +xh_ZA:                                         xh_ZA.ISO8859-1
1980 +xh_ZA.iso88591:                                        xh_ZA.ISO8859-1
1981 +xh_ZA.ISO-8859-1:                              xh_ZA.ISO8859-1
1982 +xh_ZA.ISO_8859-1:                              xh_ZA.ISO8859-1
1983 +xh_ZA.utf8:                                    xh_ZA.UTF-8
1984  yi:                                            yi_US.CP1255
1985 @@ -823,2 +1394,3 @@
1986  yi_US.MICROSOFT-CP1255:                                yi_US.CP1255
1987 +yi_US.utf8:                                    yi_US.UTF-8
1988  zh_CN:                                         zh_CN.gb2312
1989 @@ -833,4 +1405,6 @@
1990  zh_HK:                                         zh_HK.big5hkscs
1991 +zh_HK.big5-hkscs:                              zh_HK.big5hkscs
1992  zh_HK.Big5hkscs:                               zh_HK.big5hkscs
1993  zh_HK.Big5-hkscs:                              zh_HK.big5hkscs
1994 +zh_HK.Big5-HKSCS:                              zh_HK.big5hkscs
1995  zh_HK.Big5_hkscs:                              zh_HK.big5hkscs
1996 @@ -842,2 +1416,6 @@
1997  ZH_HK.UTF-8:                                   zh_CN.UTF-8
1998 +zh_SG:                                         zh_SG.gb2312
1999 +zh_SG.GB2312:                                  zh_SG.gb2312
2000 +zh_SG.GBK:                                     zh_SG.gbk
2001 +zh_SG.utf8:                                    zh_SG.UTF-8
2002  ZH_SG.UTF-8:                                   zh_SG.UTF-8
2003 @@ -849,2 +1427,8 @@
2004  ZH_TW.UTF-8:                                   zh_TW.UTF-8
2005 +zu:                                            zu_ZA.ISO8859-1
2006 +zu_ZA:                                         zu_ZA.ISO8859-1
2007 +zu_ZA.iso88591:                                        zu_ZA.ISO8859-1
2008 +zu_ZA.ISO-8859-1:                              zu_ZA.ISO8859-1
2009 +zu_ZA.ISO_8859-1:                              zu_ZA.ISO8859-1
2010 +zu_ZA.utf8:                                    zu_ZA.UTF-8
2011  
2012 --- X11-6.8.1/xc/nls/compose.dir.orig   2004-09-23 11:25:27.000000000 +0200
2013 +++ X11-6.8.1/xc/nls/compose.dir        2004-11-23 12:00:19.000000000 +0100
2014 @@ -9,4 +9,7 @@
2015  iso8859-1/Compose:             C
2016 +iso8859-1/Compose:             aa_DJ.ISO8859-1
2017  iso8859-1/Compose:             af_ZA.ISO8859-1
2018 +iso8859-15/Compose:            an_ES.ISO8859-15
2019  iso8859-6/Compose:             ar_AA.ISO8859-6
2020 +iso8859-6/Compose:             ar_AE.ISO8859-6
2021  iso8859-6/Compose:             ar_BH.ISO8859-6
2022 @@ -23,2 +26,4 @@
2023  iso8859-6/Compose:             ar_SA.ISO8859-6
2024 +iso8859-6/Compose:             ar_SD.ISO8859-6
2025 +iso8859-6/Compose:             ar_SY.ISO8859-6
2026  iso8859-6/Compose:             ar_TN.ISO8859-6
2027 @@ -26,6 +31,6 @@
2028  iso8859-9e/Compose:            az_AZ.ISO8859-9E
2029 -koi8-c/Compose:                        a3_AZ.KOI8-C
2030 -microsoft-cp1251/Compose:      be_BY.CP1251
2031 +koi8-c/Compose:                        az_AZ.KOI8-C
2032 +XCOMM microsoft-cp1251/Compose:        be_BY.CP1251
2033  iso8859-5/Compose:             bg_BG.ISO8859-5
2034 -microsoft-cp1251/Compose:      bg_BG.CP1251
2035 +XCOMM microsoft-cp1251/Compose:        bg_BG.CP1251
2036  iso8859-1/Compose:             br_FR.ISO8859-1
2037 @@ -33,2 +38,3 @@
2038  iso8859-15/Compose:            br_FR.ISO8859-15
2039 +iso8859-2/Compose:             bs_BA.ISO8859-2
2040  iso8859-1/Compose:             ca_ES.ISO8859-1
2041 @@ -43,2 +49,4 @@
2042  iso8859-15/Compose:            de_AT.ISO8859-15
2043 +iso8859-1/Compose:             de_BE.ISO8859-1
2044 +iso8859-15/Compose:            de_BE.ISO8859-15
2045  iso8859-1/Compose:             de_CH.ISO8859-1
2046 @@ -51,8 +59,14 @@
2047  iso8859-15/Compose:            de_LU.ISO8859-15
2048 +iso8859-7/Compose:             el_CY.ISO8859-7
2049  iso8859-7/Compose:             el_GR.ISO8859-7
2050  iso8859-1/Compose:             en_AU.ISO8859-1
2051 +iso8859-1/Compose:             en_BE.ISO8859-1
2052 +iso8859-15/Compose:            en_BE.ISO8859-15
2053 +iso8859-1/Compose:             en_BW.ISO8859-1
2054  iso8859-1/Compose:             en_BZ.ISO8859-1
2055  iso8859-1/Compose:             en_CA.ISO8859-1
2056 +iso8859-1/Compose:             en_DK.ISO8859-1
2057  iso8859-1/Compose:             en_GB.ISO8859-1
2058  iso8859-15/Compose:            en_GB.ISO8859-15
2059 +iso8859-1/Compose:             en_HK.ISO8859-1
2060  iso8859-1/Compose:             en_IE.ISO8859-1
2061 @@ -61,5 +75,5 @@
2062  iso8859-1/Compose:             en_NZ.ISO8859-1
2063 +iso8859-1/Compose:             en_PH.ISO8859-1
2064 +iso8859-1/Compose:             en_SG.ISO8859-1
2065  iso8859-1/Compose:             en_TT.ISO8859-1
2066 -iso8859-1/Compose:             en_UK.ISO8859-1
2067 -iso8859-15/Compose:            en_UK.ISO8859-15
2068  iso8859-1/Compose:             en_US.ISO8859-1
2069 @@ -68,2 +82,3 @@
2070  iso8859-15/Compose:            en_ZA.ISO8859-15
2071 +iso8859-1/Compose:             en_ZW.ISO8859-1
2072  iso8859-3/Compose:             eo_XX.ISO8859-3
2073 @@ -87,2 +102,3 @@
2074  iso8859-1/Compose:             es_SV.ISO8859-1
2075 +iso8859-1/Compose:             es_US.ISO8859-1
2076  iso8859-1/Compose:             es_UY.ISO8859-1
2077 @@ -98,2 +114,3 @@
2078  iso8859-15/Compose:            fi_FI.ISO8859-15
2079 +iso8859-1/Compose:             fil_PH.ISO8859-1
2080  iso8859-1/Compose:             fo_FO.ISO8859-1
2081 @@ -122,5 +139,6 @@
2082  iso8859-8/Compose:             he_IL.ISO8859-8
2083 -microsoft-cp1255/Compose:      he_IL.CP1255
2084 +XCOMM microsoft-cp1255/Compose:        he_IL.CP1255
2085  iscii-dev/Compose:             hi_IN.ISCII-DEV
2086  iso8859-2/Compose:             hr_HR.ISO8859-2
2087 +iso8859-2/Compose:             hsb_DE.ISO8859-2
2088  iso8859-2/Compose:             hu_HU.ISO8859-2
2089 @@ -140,4 +158,6 @@
2090  georgian-ps/Compose:           ka_GE.GEORGIAN-PS
2091 +XCOMM pt-154/Compose:                  kk_KZ.PT154
2092  iso8859-1/Compose:             kl_GL.ISO8859-1
2093  iso8859-15/Compose:            kl_GL.ISO8859-15
2094 +ko/Compose:                    ko_KR.eucKR
2095  iso8859-1/Compose:             kw_GB.ISO8859-1
2096 @@ -145,6 +165,9 @@
2097  iso8859-15/Compose:            kw_GB.ISO8859-15
2098 -ko/Compose:                    ko_KR.eucKR
2099 +iso8859-10/Compose:            lg_UG.ISO8859-10
2100 +iso8859-1/Compose:             li_BE.ISO8859-1
2101 +iso8859-15/Compose:            li_BE.ISO8859-15
2102 +iso8859-1/Compose:             li_NL.ISO8859-1
2103 +iso8859-15/Compose:            li_NL.ISO8859-15
2104  ibm-cp1133/Compose:            lo_LA.IBM-CP1133
2105  mulelao-1/Compose:             lo_LA.MULELAO-1
2106 -iso8859-1/Compose:             lt_LN.ISO8859-1
2107  iso8859-4/Compose:             lt_LT.ISO8859-4
2108 @@ -153,8 +176,11 @@
2109  iso8859-13/Compose:            lv_LV.ISO8859-13
2110 -iso8859-13/Compose:            mi_NZ.ISO8859-13
2111 +iso8859-1/Compose:             mi_NZ.ISO8859-1
2112  iso8859-5/Compose:             mk_MK.ISO8859-5
2113 -XCOMM mk_MK.UTF-8/Compose:             mk_MK.UTF-8
2114 -microsoft-cp1251/Compose:      mk_MK.CP1251
2115 +XCOMM microsoft-cp1251/Compose:        mk_MK.CP1251
2116  iso8859-1/Compose:             ms_MY.ISO8859-1
2117  iso8859-3/Compose:             mt_MT.ISO8859-3
2118 +iso8859-1/Compose:             nb_NO.ISO8859-1
2119 +iso8859-15/Compose:            nb_NO.ISO8859-15
2120 +iso8859-1/Compose:             nds_DE.ISO8859-1
2121 +iso8859-15/Compose:            nds_DE.ISO8859-15
2122  iso8859-1/Compose:             nl_BE.ISO8859-1
2123 @@ -163,17 +189,14 @@
2124  iso8859-15/Compose:            nl_NL.ISO8859-15
2125 -iso8859-1/Compose:             no_NO.ISO8859-1
2126 -iso8859-15/Compose:            no_NO.ISO8859-15
2127 -iso8859-1/Compose:             nb_NO.ISO8859-1
2128 -iso8859-15/Compose:            nb_NO.ISO8859-15
2129  iso8859-1/Compose:             nn_NO.ISO8859-1
2130  iso8859-15/Compose:            nn_NO.ISO8859-15
2131 -iso8859-1/Compose:             ny_NO.ISO8859-1
2132 -iso8859-15/Compose:            ny_NO.ISO8859-15
2133 +iso8859-10/Compose:            nr_ZA.ISO8859-10
2134 +iso8859-10/Compose:            nso_ZA.ISO8859-10
2135  iso8859-1/Compose:             oc_FR.ISO8859-1
2136  iso8859-15/Compose:            oc_FR.ISO8859-15
2137 +iso8859-1/Compose:             om_KE.ISO8859-1
2138 +iso8859-1/Compose:             pap_AN.ISO8859-1
2139  iso8859-1/Compose:             pd_DE.ISO8859-1
2140  iso8859-1/Compose:             pd_US.ISO8859-1
2141 -iso8859-1/Compose:             ph_PH.ISO8859-1
2142  iso8859-2/Compose:             pl_PL.ISO8859-2
2143 -iso8859-1/Compose:             pp_AN.ISO8859-1
2144 +iso8859-16/Compose:            pl_PL.ISO8859-16
2145  iso8859-1/Compose:             pt_BR.ISO8859-1
2146 @@ -183,7 +206,9 @@
2147  iso8859-2/Compose:             ro_RO.ISO8859-2
2148 +iso8859-16/Compose:            ro_RO.ISO8859-16
2149  koi8-r/Compose:                        ru_RU.KOI8-R
2150  iso8859-5/Compose:             ru_RU.ISO8859-5
2151 -microsoft-cp1251/Compose:      ru_RU.CP1251
2152 +XCOMM microsoft-cp1251/Compose:        ru_RU.CP1251
2153  koi8-u/Compose:                        ru_UA.KOI8-U
2154 -iso8859-2/Compose:             sh_YU.ISO8859-2
2155 +XCOMM microsoft-cp1251/Compose:        ru_UA.CP1251
2156 +iso8859-1/Compose:             rw_RW.ISO8859-1
2157  iso8859-2/Compose:             sk_SK.ISO8859-2
2158 @@ -191,7 +216,12 @@
2159  iso8859-2/Compose:             sl_SI.ISO8859-2
2160 -iso8859-5/Compose:             sp_YU.ISO8859-5
2161 +iso8859-16/Compose:            sl_SI.ISO8859-16
2162 +iso8859-1/Compose:             so_DJ.ISO8859-1
2163 +iso8859-1/Compose:             so_KE.ISO8859-1
2164 +iso8859-1/Compose:             so_SO.ISO8859-1
2165  iso8859-2/Compose:             sq_AL.ISO8859-2
2166 -iso8859-2/Compose:             sr_SP.ISO8859-2
2167 -iso8859-2/Compose:             sr_YU.ISO8859-2
2168 -iso8859-5/Compose:             sr_YU.ISO8859-5
2169 +iso8859-2/Compose:             sr_CS.ISO8859-2
2170 +iso8859-5/Compose:             sr_CS.ISO8859-5
2171 +XCOMM microsoft-cp1251/Compose:        sr_CS.CP1251
2172 +iso8859-1/Compose:             ss_ZA.ISO8859-1
2173 +iso8859-1/Compose:             st_ZA.ISO8859-1
2174  iso8859-1/Compose:             sv_FI.ISO8859-1
2175 @@ -202,4 +232,8 @@
2176  koi8-c/Compose:                        tg_TJ.KOI8-C
2177 +XCOMM koi8-t/Compose:                  tg_TJ.KOI8-T
2178  iso8859-1/Compose:             tl_PH.ISO8859-1
2179 +iso8859-10/Compose:            tn_ZA.ISO8859-10
2180 +iso8859-9/Compose:             tr_CY.ISO8859-9
2181  iso8859-9/Compose:             tr_TR.ISO8859-9
2182 +iso8859-1/Compose:             ts_ZA.ISO8859-1
2183  tatar-cyr/Compose:             tt_RU.TATAR-CYR
2184 @@ -207,3 +241,6 @@
2185  koi8-u/Compose:                        uk_UA.KOI8-U
2186 -microsoft-cp1256/Compose:      ur_PK.CP1256
2187 +iso8859-5/Compose:             uk_UA.ISO8859-5
2188 +XCOMM microsoft-cp1251/Compose:        uk_UA.CP1251
2189 +XCOMM microsoft-cp1256/Compose:        ur_PK.CP1256
2190 +iso8859-1/Compose:             uz_UZ.ISO8859-1
2191  vi_VN.viscii/Compose:          vi_VN.VISCII
2192 @@ -211,13 +248,22 @@
2193  iso8859-1/Compose:             wa_BE.ISO8859-1
2194 -microsoft-cp1255/Compose:      yi_US.CP1256
2195 +iso8859-15/Compose:            wa_BE.ISO8859-15
2196 +iso8859-1/Compose:             xh_ZA.ISO8859-1
2197 +XCOMM microsoft-cp1255/Compose:        yi_US.CP1256
2198  zh_CN/Compose:                 zh_CN.eucCN
2199 -zh_CN/Compose:                 zh_CN.GB2312
2200 -zh_CN.gbk/Compose:             zh_CN.GBK
2201 +zh_CN/Compose:                 zh_CN.gb2312
2202 +zh_CN.gbk/Compose:             zh_CN.gbk
2203 +zh_CN/Compose:                 zh_SG.gb2312
2204  zh_TW.big5/Compose:            zh_TW.big5
2205 -zh_TW.big5/Compose:            zh_TW.Big5
2206  zh_TW/Compose:                 zh_TW.eucTW
2207 +iso8859-1/Compose:             zu_ZA.ISO8859-1
2208  XCOMM
2209  XCOMM
2210 +en_US.UTF-8/Compose:           aa_DJ.UTF-8
2211 +en_US.UTF-8/Compose:           aa_ER.UTF-8
2212 +en_US.UTF-8/Compose:           aa_ET.UTF-8
2213  en_US.UTF-8/Compose:           af_ZA.UTF-8
2214 +en_US.UTF-8/Compose:           am_ET.UTF-8
2215 +en_US.UTF-8/Compose:           an_ES.UTF-8
2216  en_US.UTF-8/Compose:           ar_AA.UTF-8
2217 +en_US.UTF-8/Compose:           ar_AE.UTF-8
2218  en_US.UTF-8/Compose:           ar_BH.UTF-8
2219 @@ -225,2 +271,3 @@
2220  en_US.UTF-8/Compose:           ar_EG.UTF-8
2221 +en_US.UTF-8/Compose:           ar_IN.UTF-8
2222  en_US.UTF-8/Compose:           ar_IQ.UTF-8
2223 @@ -234,2 +281,4 @@
2224  en_US.UTF-8/Compose:           ar_SA.UTF-8
2225 +en_US.UTF-8/Compose:           ar_SD.UTF-8
2226 +en_US.UTF-8/Compose:           ar_SY.UTF-8
2227  en_US.UTF-8/Compose:           ar_TN.UTF-8
2228 @@ -237,10 +286,13 @@
2229  en_US.UTF-8/Compose:           az_AZ.UTF-8
2230 -en_US.UTF-8/Compose:           a3_AZ.UTF-8
2231  en_US.UTF-8/Compose:           be_BY.UTF-8
2232  en_US.UTF-8/Compose:           bg_BG.UTF-8
2233 +en_US.UTF-8/Compose:           bn_BD.UTF-8
2234 +en_US.UTF-8/Compose:           bn_IN.UTF-8
2235  en_US.UTF-8/Compose:           br_FR.UTF-8
2236 +en_US.UTF-8/Compose:           bs_BA.UTF-8
2237 +en_US.UTF-8/Compose:           byn_ER.UTF-8
2238  en_US.UTF-8/Compose:           ca_ES.UTF-8
2239  en_US.UTF-8/Compose:           cs_CZ.UTF-8
2240 +en_US.UTF-8/Compose:           csb_PL.UTF-8
2241  en_US.UTF-8/Compose:           cy_GB.UTF-8
2242 -en_US.UTF-8/Compose:           cz_CZ.UTF-8
2243  en_US.UTF-8/Compose:           da_DK.UTF-8
2244 @@ -252,14 +304,22 @@
2245  en_US.UTF-8/Compose:           de_LU.UTF-8
2246 +el_GR.UTF-8/Compose:           el_CY.UTF-8
2247  el_GR.UTF-8/Compose:           el_GR.UTF-8
2248  en_US.UTF-8/Compose:           en_AU.UTF-8
2249 +en_US.UTF-8/Compose:           en_BE.UTF-8
2250 +en_US.UTF-8/Compose:           en_BW.UTF-8
2251  en_US.UTF-8/Compose:           en_BZ.UTF-8
2252  en_US.UTF-8/Compose:           en_CA.UTF-8
2253 +en_US.UTF-8/Compose:           en_DK.UTF-8
2254  en_US.UTF-8/Compose:           en_GB.UTF-8
2255 +en_US.UTF-8/Compose:           en_HK.UTF-8
2256  en_US.UTF-8/Compose:           en_IE.UTF-8
2257 +en_US.UTF-8/Compose:           en_IN.UTF-8
2258  en_US.UTF-8/Compose:           en_JM.UTF-8
2259  en_US.UTF-8/Compose:           en_NZ.UTF-8
2260 +en_US.UTF-8/Compose:           en_PH.UTF-8
2261 +en_US.UTF-8/Compose:           en_SG.UTF-8
2262  en_US.UTF-8/Compose:           en_TT.UTF-8
2263 -en_US.UTF-8/Compose:           en_UK.UTF-8
2264  en_US.UTF-8/Compose:           en_US.UTF-8
2265  en_US.UTF-8/Compose:           en_ZA.UTF-8
2266 +en_US.UTF-8/Compose:           en_ZW.UTF-8
2267  en_US.UTF-8/Compose:           eo_XX.UTF-8
2268 @@ -282,2 +342,3 @@
2269  en_US.UTF-8/Compose:           es_SV.UTF-8
2270 +en_US.UTF-8/Compose:           es_US.UTF-8
2271  en_US.UTF-8/Compose:           es_UY.UTF-8
2272 @@ -288,2 +349,3 @@
2273  en_US.UTF-8/Compose:           fi_FI.UTF-8
2274 +en_US.UTF-8/Compose:           fil_PH.UTF-8
2275  en_US.UTF-8/Compose:           fo_FO.UTF-8
2276 @@ -296,3 +358,5 @@
2277  en_US.UTF-8/Compose:           gd_GB.UTF-8
2278 +en_US.UTF-8/Compose:           gez_ER.UTF-8
2279  en_US.UTF-8/Compose:           gl_ES.UTF-8
2280 +en_US.UTF-8/Compose:           gu_IN.UTF-8
2281  en_US.UTF-8/Compose:           gv_GB.UTF-8
2282 @@ -301,2 +365,3 @@
2283  en_US.UTF-8/Compose:           hr_HR.UTF-8
2284 +en_US.UTF-8/Compose:           hsb_DE.UTF-8
2285  en_US.UTF-8/Compose:           hu_HU.UTF-8
2286 @@ -309,4 +374,10 @@
2287  en_US.UTF-8/Compose:           ka_GE.UTF-8
2288 +en_US.UTF-8/Compose:           kk_KZ.UTF-8
2289  en_US.UTF-8/Compose:           kl_GL.UTF-8
2290 +en_US.UTF-8/Compose:           kn_IN.UTF-8
2291  en_US.UTF-8/Compose:           kw_GB.UTF-8
2292 +en_US.UTF-8/Compose:           ky_KG.UTF-8
2293 +en_US.UTF-8/Compose:           lg_UG.UTF-8
2294 +en_US.UTF-8/Compose:           li_BE.UTF-8
2295 +en_US.UTF-8/Compose:           li_NL.UTF-8
2296  en_US.UTF-8/Compose:           lo_LA.UTF-8
2297 @@ -315,15 +386,26 @@
2298  en_US.UTF-8/Compose:           mi_NZ.UTF-8
2299 +XCOMM mk_MK.UTF-8/Compose:             mk_MK.UTF-8
2300  en_US.UTF-8/Compose:           mk_MK.UTF-8
2301 +en_US.UTF-8/Compose:           ml_IN.UTF-8
2302 +en_US.UTF-8/Compose:           mn_MN.UTF-8
2303 +en_US.UTF-8/Compose:           mr_IN.UTF-8
2304  en_US.UTF-8/Compose:           ms_MY.UTF-8
2305 +en_US.UTF-8/Compose:           mt_MT.UTF-8
2306 +en_US.UTF-8/Compose:           nb_NO.UTF-8
2307 +en_US.UTF-8/Compose:           nds_DE.UTF-8
2308 +en_US.UTF-8/Compose:           ne_NP.UTF-8
2309  en_US.UTF-8/Compose:           nl_BE.UTF-8
2310  en_US.UTF-8/Compose:           nl_NL.UTF-8
2311 -en_US.UTF-8/Compose:           no_NO.UTF-8
2312 -en_US.UTF-8/Compose:           nb_NO.UTF-8
2313 -en_US.UTF-8/Compose:           ny_NO.UTF-8
2314 +en_US.UTF-8/Compose:           nn_NO.UTF-8
2315 +en_US.UTF-8/Compose:           nr_ZA.UTF-8
2316 +en_US.UTF-8/Compose:           nso_ZA.UTF-8
2317  en_US.UTF-8/Compose:           oc_FR.UTF-8
2318 +en_US.UTF-8/Compose:           om_ET.UTF-8
2319 +en_US.UTF-8/Compose:           om_KE.UTF-8
2320 +en_US.UTF-8/Compose:           or_IN.UTF-8
2321 +en_US.UTF-8/Compose:           pa_IN.UTF-8
2322 +en_US.UTF-8/Compose:           pap_AN.UTF-8
2323  en_US.UTF-8/Compose:           pd_DE.UTF-8
2324  en_US.UTF-8/Compose:           pd_US.UTF-8
2325 -en_US.UTF-8/Compose:           ph_PH.UTF-8
2326  en_US.UTF-8/Compose:           pl_PL.UTF-8
2327 -en_US.UTF-8/Compose:           pp_AN.UTF-8
2328  en_US.UTF-8/Compose:           pt_BR.UTF-8
2329 @@ -333,6 +415,16 @@
2330  en_US.UTF-8/Compose:           ru_UA.UTF-8
2331 +en_US.UTF-8/Compose:           rw_RW.UTF-8
2332 +en_US.UTF-8/Compose:           se_NO.UTF-8
2333 +en_US.UTF-8/Compose:           si_LK.UTF-8
2334 +en_US.UTF-8/Compose:           sid_ET.UTF-8
2335  en_US.UTF-8/Compose:           sk_SK.UTF-8
2336  en_US.UTF-8/Compose:           sl_SI.UTF-8
2337 +en_US.UTF-8/Compose:           so_DJ.UTF-8
2338 +en_US.UTF-8/Compose:           so_ET.UTF-8
2339 +en_US.UTF-8/Compose:           so_KE.UTF-8
2340 +en_US.UTF-8/Compose:           so_SO.UTF-8
2341  en_US.UTF-8/Compose:           sq_AL.UTF-8
2342 -en_US.UTF-8/Compose:           sr_YU.UTF-8
2343 +en_US.UTF-8/Compose:           sr_CS.UTF-8
2344 +en_US.UTF-8/Compose:           ss_ZA.UTF-8
2345 +en_US.UTF-8/Compose:           st_ZA.UTF-8
2346  en_US.UTF-8/Compose:           sv_FI.UTF-8
2347 @@ -340,6 +432,14 @@
2348  en_US.UTF-8/Compose:           ta_IN.UTF-8
2349 +en_US.UTF-8/Compose:           te_IN.UTF-8
2350  en_US.UTF-8/Compose:           tg_TJ.UTF-8
2351  en_US.UTF-8/Compose:           th_TH.UTF-8
2352 +en_US.UTF-8/Compose:           ti_ER.UTF-8
2353 +en_US.UTF-8/Compose:           ti_ET.UTF-8
2354 +en_US.UTF-8/Compose:           tig_ER.UTF-8
2355 +en_US.UTF-8/Compose:           tk_TM.UTF-8
2356  en_US.UTF-8/Compose:           tl_PH.UTF-8
2357 +en_US.UTF-8/Compose:           tn_ZA.UTF-8
2358 +en_US.UTF-8/Compose:           tr_CY.UTF-8
2359  en_US.UTF-8/Compose:           tr_TR.UTF-8
2360 +en_US.UTF-8/Compose:           ts_ZA.UTF-8
2361  en_US.UTF-8/Compose:           tt_RU.UTF-8
2362 @@ -348,4 +448,7 @@
2363  en_US.UTF-8/Compose:           uz_UZ.UTF-8
2364 +en_US.UTF-8/Compose:           ve_ZA.UTF-8
2365  en_US.UTF-8/Compose:           vi_VN.UTF-8
2366  en_US.UTF-8/Compose:           wa_BE.UTF-8
2367 +en_US.UTF-8/Compose:           xh_ZA.UTF-8
2368  en_US.UTF-8/Compose:           yi_US.UTF-8
2369 +en_US.UTF-8/Compose:           zu_ZA.UTF-8
2370 --- X11-6.8.1/xc/nls/XLC_LOCALE/Imakefile~      2004-11-23 13:42:45.000000000 +0100
2371 +++ X11-6.8.1/xc/nls/XLC_LOCALE/Imakefile       2004-11-23 13:42:45.000000000 +0100
2372 @@ -55,6 +55,7 @@
2373  LTarget(iso8859-13)
2374  LTarget(iso8859-14)
2375  LTarget(iso8859-15)
2376 +LTarget(iso8859-16)
2377  LTarget(iso8859-9e)
2378  LTarget(ja)
2379  LTarget(ja.JIS)
2380 --- X11-6.8.1/xc/nls/XI18N_OBJS/Imakefile~      2004-11-23 13:42:29.000000000 +0100
2381 +++ X11-6.8.1/xc/nls/XI18N_OBJS/Imakefile       2004-11-23 13:42:29.000000000 +0100
2382 @@ -43,6 +43,7 @@
2383  XI18NTarget(iso8859-13)
2384  XI18NTarget(iso8859-14)
2385  XI18NTarget(iso8859-15)
2386 +XI18NTarget(iso8859-16)
2387  XI18NTarget(iso8859-9e)
2388  XI18NTarget(ja)
2389  XI18NTarget(ja.JIS)
2390 --- X11-6.8.1/xc/nls/Compose/Imakefile~ 2004-11-23 13:42:14.000000000 +0100
2391 +++ X11-6.8.1/xc/nls/Compose/Imakefile  2004-11-23 13:42:14.000000000 +0100
2392 @@ -47,6 +47,7 @@
2393  ComposeTarget(iso8859-13)
2394  ComposeTarget(iso8859-14)
2395  ComposeTarget(iso8859-15)
2396 +ComposeTarget(iso8859-16)
2397  ComposeTarget(iso8859-9e)
2398  ComposeTarget(ja)
2399  ComposeTarget(ja.JIS)
This page took 0.254029 seconds and 4 git commands to generate.