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