koi8-u \
ko_KR.UTF-8 \
microsoft-cp1251 \
---- libX11-1.0.2/nls/compose.dir.pre.orig 2006-06-22 23:25:32.000000000 +0200
-+++ libX11-1.0.2/nls/compose.dir.pre 2006-06-29 19:36:25.745377750 +0200
+--- libX11-1.1.4/nls/compose.dir.pre.orig 2008-03-06 21:45:06.000000000 +0100
++++ libX11-1.1.4/nls/compose.dir.pre 2008-03-07 23:21:34.487595975 +0100
@@ -7,8 +7,11 @@
XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
XCOMM
iso8859-1/Compose: br_FR.ISO8859-1
iso8859-14/Compose: br_FR.ISO8859-14
iso8859-15/Compose: br_FR.ISO8859-15
-@@ -42,6 +47,8 @@
+@@ -48,6 +53,8 @@
iso8859-15/Compose: da_DK.ISO8859-15
iso8859-1/Compose: de_AT.ISO8859-1
iso8859-15/Compose: de_AT.ISO8859-15
iso8859-1/Compose: de_CH.ISO8859-1
iso8859-15/Compose: de_CH.ISO8859-15
iso8859-1/Compose: de_DE.ISO8859-1
-@@ -50,23 +57,30 @@
+@@ -56,23 +63,30 @@
iso8859-15/Compose: de_LI.ISO8859-15
iso8859-1/Compose: de_LU.ISO8859-1
iso8859-15/Compose: de_LU.ISO8859-15
iso8859-3/Compose: eo_XX.ISO8859-3
iso8859-1/Compose: es_AR.ISO8859-1
iso8859-1/Compose: es_BO.ISO8859-1
-@@ -86,6 +100,7 @@
+@@ -92,6 +106,7 @@
iso8859-1/Compose: es_PR.ISO8859-1
iso8859-1/Compose: es_PY.ISO8859-1
iso8859-1/Compose: es_SV.ISO8859-1
iso8859-1/Compose: es_UY.ISO8859-1
iso8859-1/Compose: es_VE.ISO8859-1
iso8859-1/Compose: et_EE.ISO8859-1
-@@ -97,6 +112,7 @@
+@@ -103,6 +118,7 @@
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
iso8859-1/Compose: fo_FO.ISO8859-1
iso8859-15/Compose: fo_FO.ISO8859-15
iso8859-1/Compose: fr_BE.ISO8859-1
-@@ -121,9 +137,10 @@
+@@ -127,9 +143,10 @@
iso8859-14/Compose: gv_GB.ISO8859-14
iso8859-15/Compose: gv_GB.ISO8859-15
iso8859-8/Compose: he_IL.ISO8859-8
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
-@@ -139,12 +156,18 @@
+@@ -145,12 +162,18 @@
ja.JIS/Compose: ja_JP.JIS7
georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
iso8859-1/Compose: lt_LN.ISO8859-1
-@@ -152,54 +175,57 @@
+@@ -158,54 +181,57 @@
iso8859-13/Compose: lt_LT.ISO8859-13
iso8859-4/Compose: lv_LV.ISO8859-4
iso8859-13/Compose: lv_LV.ISO8859-13
iso8859-1/Compose: ss_ZA.ISO8859-1
iso8859-1/Compose: st_ZA.ISO8859-1
iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -207,39 +233,52 @@
+@@ -213,39 +239,52 @@
iso8859-1/Compose: sv_SE.ISO8859-1
iso8859-15/Compose: sv_SE.ISO8859-15
tscii-0/Compose: ta_IN.TSCII-0
en_US.UTF-8/Compose: ar_IQ.UTF-8
en_US.UTF-8/Compose: ar_JO.UTF-8
en_US.UTF-8/Compose: ar_KW.UTF-8
-@@ -249,19 +288,22 @@
+@@ -255,22 +294,25 @@
en_US.UTF-8/Compose: ar_OM.UTF-8
en_US.UTF-8/Compose: ar_QA.UTF-8
en_US.UTF-8/Compose: ar_SA.UTF-8
en_US.UTF-8/Compose: br_FR.UTF-8
+en_US.UTF-8/Compose: bs_BA.UTF-8
+en_US.UTF-8/Compose: byn_ER.UTF-8
+ en_US.UTF-8/Compose: ca_AD.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
+ en_US.UTF-8/Compose: ca_FR.UTF-8
+ en_US.UTF-8/Compose: ca_IT.UTF-8
en_US.UTF-8/Compose: cs_CZ.UTF-8
+en_US.UTF-8/Compose: csb_PL.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
en_US.UTF-8/Compose: da_DK.UTF-8
en_US.UTF-8/Compose: de_AT.UTF-8
en_US.UTF-8/Compose: de_BE.UTF-8
-@@ -269,18 +311,26 @@
+@@ -278,18 +320,26 @@
en_US.UTF-8/Compose: de_DE.UTF-8
en_US.UTF-8/Compose: de_LI.UTF-8
en_US.UTF-8/Compose: de_LU.UTF-8
en_US.UTF-8/Compose: eo_XX.UTF-8
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
-@@ -299,12 +349,14 @@
+@@ -308,12 +358,14 @@
en_US.UTF-8/Compose: es_PR.UTF-8
en_US.UTF-8/Compose: es_PY.UTF-8
en_US.UTF-8/Compose: es_SV.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
en_US.UTF-8/Compose: fr_BE.UTF-8
en_US.UTF-8/Compose: fr_CA.UTF-8
-@@ -313,12 +365,14 @@
+@@ -322,12 +374,14 @@
en_US.UTF-8/Compose: fr_LU.UTF-8
en_US.UTF-8/Compose: ga_IE.UTF-8
en_US.UTF-8/Compose: gd_GB.UTF-8
en_US.UTF-8/Compose: hu_HU.UTF-8
en_US.UTF-8/Compose: hy_AM.UTF-8
en_US.UTF-8/Compose: id_ID.UTF-8
-@@ -328,51 +382,75 @@
+@@ -337,51 +391,75 @@
en_US.UTF-8/Compose: iu_CA.UTF-8
en_US.UTF-8/Compose: ja_JP.UTF-8
en_US.UTF-8/Compose: ka_GE.UTF-8
en_US.UTF-8/Compose: tr_TR.UTF-8
en_US.UTF-8/Compose: ts_ZA.UTF-8
en_US.UTF-8/Compose: tt_RU.UTF-8
-@@ -382,8 +460,7 @@
+@@ -391,8 +469,7 @@
en_US.UTF-8/Compose: ve_ZA.UTF-8
en_US.UTF-8/Compose: vi_VN.UTF-8
en_US.UTF-8/Compose: wa_BE.UTF-8
en_US.UTF-8/Compose: zh_TW.UTF-8
en_US.UTF-8/Compose: zu_ZA.UTF-8
-en_US.UTF-8/Compose: bs_BA.UTF-8
---- libX11-1.0.99.1/nls/locale.alias.pre.orig 2006-10-04 19:42:02.000000000 +0200
-+++ libX11-1.0.99.1/nls/locale.alias.pre 2006-10-14 12:01:16.450543250 +0200
+--- libX11-1.1.4/nls/locale.alias.pre.orig 2008-03-06 21:45:06.000000000 +0100
++++ libX11-1.1.4/nls/locale.alias.pre 2008-03-07 23:24:28.773527964 +0100
@@ -17,17 +17,34 @@
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
be: be_BY.CP1251
be_BY: be_BY.CP1251
be_BY.cp1251: be_BY.CP1251
-@@ -123,37 +163,49 @@
+@@ -123,28 +163,36 @@
bg_BG.microsoftcp1251: bg_BG.CP1251
bg_BG.microsoft-cp1251: bg_BG.CP1251
bg_BG.MICROSOFT-CP1251: bg_BG.CP1251
bs_BA.ISO_8859-2: bs_BA.ISO8859-2
+bs_BA.utf8: bs_BA.UTF-8
ca: ca_ES.ISO8859-1
- ca_ES: ca_ES.ISO8859-1
+ ca_AD: ca_AD.ISO8859-1
+ ca_AD@euro: ca_AD.ISO8859-15
+@@ -159,11 +207,15 @@
ca_ES@euro: ca_ES.ISO8859-15
ca_ES.iso88591: ca_ES.ISO8859-1
ca_ES.ISO-8859-1: ca_ES.ISO8859-1
+ca_ES.ISO_8859-15: ca_ES.ISO8859-15
ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
+ca_ES.ISO_8859-15@euro: ca_ES.ISO8859-15
-+ca_ES.utf8: ca_ES.UTF-8
ca_ES.UTF-8@euro: ca_ES.UTF-8
- cs: cs_CZ.ISO8859-2
- cs_CS: cs_CZ.ISO8859-2
-@@ -164,19 +216,26 @@
++ca_ES.utf8: ca_ES.UTF-8
+ ca_FR: ca_FR.ISO8859-1
+ ca_FR@euro: ca_FR.ISO8859-15
+ ca_FR.iso88591: ca_FR.ISO8859-1
+@@ -191,19 +243,26 @@
cs_CZ.ISO-8859-2: cs_CZ.ISO8859-2
cs_CZ.ISO_8859-2: cs_CZ.ISO8859-2
cs_CZ.utf8: cs_CZ.UTF-8
da: da_DK.ISO8859-1
da_DK: da_DK.ISO8859-1
DA_DK: da_DK.ISO8859-1
-@@ -198,18 +257,23 @@
+@@ -225,18 +284,23 @@
de_AT.ISO_8859-1: de_AT.ISO8859-1
de_AT.iso885915: de_AT.ISO8859-15
de_AT.ISO-8859-15: de_AT.ISO8859-15
de_BE.UTF-8@euro: de_BE.UTF-8
de_CH: de_CH.ISO8859-1
de_CH.iso88591: de_CH.ISO8859-1
-@@ -231,7 +295,9 @@
+@@ -258,7 +322,9 @@
de_DE.ISO_8859-15: de_DE.ISO8859-15
de_DE.8859-15: de_DE.ISO8859-15
de_DE.8859-15@euro: de_DE.ISO8859-15
de_DE.UTF-8@euro: de_DE.UTF-8
de_DE.utf8: de_DE.UTF-8
de_LU: de_LU.ISO8859-1
-@@ -239,22 +305,31 @@
+@@ -266,22 +332,31 @@
de_LU.iso88591: de_LU.ISO8859-1
de_LU.ISO_8859-1: de_LU.ISO8859-1
de_LU.ISO-8859-1: de_LU.ISO8859-1
el_GR.utf8: el_GR.UTF-8
en: en_US.ISO8859-1
en.ISO-8859-1: en_US.ISO8859-1
-@@ -269,11 +344,18 @@
+@@ -296,11 +371,18 @@
en_BW: en_BW.ISO8859-1
en_BW.iso88591: en_BW.ISO8859-1
en_BW.ISO-8859-1: en_BW.ISO8859-1
en_GB: en_GB.ISO8859-1
en_GB.88591: en_GB.ISO8859-1
en_GB.88591.en: en_GB.ISO8859-1
-@@ -284,31 +366,45 @@
+@@ -311,31 +393,45 @@
en_GB.ISO-8859-15: en_GB.ISO8859-15
en_GB.utf8: en_GB.UTF-8
en_UK: en_GB.ISO8859-1
en_US: en_US.ISO8859-1
EN_US: en_US.ISO8859-1
en_US.88591: en_US.ISO8859-1
-@@ -322,15 +418,6 @@
+@@ -349,15 +445,6 @@
en_US.ISO8859-15@euro: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
EN_US.UTF-8: en_US.UTF-8
en_ZA: en_ZA.ISO8859-1
en_ZA.88591: en_ZA.ISO8859-1
en_ZA.88591.en: en_ZA.ISO8859-1
-@@ -343,104 +430,128 @@
+@@ -370,104 +457,128 @@
en_ZW: en_ZW.ISO8859-1
en_ZW.iso88591: en_ZW.ISO8859-1
en_ZW.ISO-8859-1: en_ZW.ISO8859-1
es_VE.utf8: es_VE.UTF-8
#if defined(SVR4) && defined(sun)
XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
-@@ -448,47 +559,64 @@
+@@ -475,47 +586,64 @@
#endif
XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
fo_FO.iso885915: fo_FO.ISO8859-15
fo_FO.ISO-8859-15: fo_FO.ISO8859-15
fo_FO.utf8: fo_FO.UTF-8
-@@ -496,11 +624,15 @@
+@@ -523,11 +651,15 @@
fr_BE: fr_BE.ISO8859-1
fr_BE.88591: fr_BE.ISO8859-1
fr_BE.88591.en: fr_BE.ISO8859-1
fr_BE@euro: fr_BE.ISO8859-15
fr_BE.utf8: fr_BE.UTF-8
fr_BE.UTF-8@euro: fr_BE.UTF-8
-@@ -516,11 +648,15 @@
+@@ -543,11 +675,15 @@
fr_CH: fr_CH.ISO8859-1
fr_CH.88591: fr_CH.ISO8859-1
fr_CH.88591.en: fr_CH.ISO8859-1
fr_FR: fr_FR.ISO8859-1
fr_FR.88591: fr_FR.ISO8859-1
fr_FR.88591.en: fr_FR.ISO8859-1
-@@ -529,10 +665,12 @@
+@@ -556,10 +692,12 @@
fr_FR.ISO_8859-1: fr_FR.ISO8859-1
fr_FR.iso885915: fr_FR.ISO8859-15
fr_FR.ISO-8859-15: fr_FR.ISO8859-15
fr_LU: fr_LU.ISO8859-1
fr_LU.88591: fr_LU.ISO8859-1
fr_LU.88591.en: fr_LU.ISO8859-1
-@@ -541,7 +679,6 @@
+@@ -568,7 +706,6 @@
fr_LU.ISO_8859-1: fr_LU.ISO8859-1
fr_LU.iso885915: fr_LU.ISO8859-15
fr_LU.ISO-8859-15: fr_LU.ISO8859-15
fr_LU@euro: fr_LU.ISO8859-15
fr_LU.UTF-8@euro: fr_LU.UTF-8
fr_LU.utf8: fr_LU.UTF-8
-@@ -551,11 +688,16 @@
+@@ -578,11 +715,16 @@
ga_IE: ga_IE.ISO8859-1
ga_IE.iso88591: ga_IE.ISO8859-1
ga_IE.ISO-8859-1: ga_IE.ISO8859-1
ga_IE@euro: ga_IE.ISO8859-15
ga_IE.UTF-8@euro: ga_IE.UTF-8
ga_IE.utf8: ga_IE.UTF-8
-@@ -563,44 +705,62 @@
+@@ -590,44 +732,62 @@
gd_GB: gd_GB.ISO8859-1
gd_GB.iso88591: gd_GB.ISO8859-1
gd_GB.ISO-8859-1: gd_GB.ISO8859-1
hi_IN.isciidev: hi_IN.ISCII-DEV
hi_IN.utf8: hi_IN.UTF-8
HI_IN.UTF-8: hi_IN.UTF-8
-@@ -610,10 +770,31 @@
+@@ -637,10 +797,31 @@
hr_HR.ISO-8859-2: hr_HR.ISO8859-2
hr_HR.ISO_8859-2: hr_HR.ISO8859-2
hr_HR.utf8: hr_HR.UTF-8
XCOMM in was the old ISO code for Indonesian (now id). These lines should be
XCOMM deleted in the future.
in: id_ID.ISO8859-1
-@@ -629,8 +810,8 @@
+@@ -656,8 +837,8 @@
it: it_IT.ISO8859-1
it_CH: it_CH.ISO8859-1
it_CH.iso88591: it_CH.ISO8859-1
it_CH.iso885915: it_CH.ISO8859-15
it_CH.utf8: it_CH.UTF-8
it_IT: it_IT.ISO8859-1
-@@ -641,13 +822,16 @@
+@@ -668,13 +849,16 @@
it_IT.ISO_8859-1: it_IT.ISO8859-1
it_IT.iso885915: it_IT.ISO8859-15
it_IT.ISO-8859-15: it_IT.ISO8859-15
XCOMM iw was the old ISO code for Hebrew (now he). These lines should be
XCOMM deleted in the future.
iw: he_IL.ISO8859-8
-@@ -656,20 +840,20 @@
+@@ -683,20 +867,20 @@
iw_IL.iso88598: he_IL.ISO8859-8
iw_IL.ISO-8859-8: he_IL.ISO8859-8
#ifndef __uxp__
ja_JP.EUC: ja_JP.eucJP
ja_JP.EUC-JP: ja_JP.eucJP
ja_JP.EUC_JP: ja_JP.eucJP
-@@ -678,24 +862,28 @@
+@@ -705,24 +889,28 @@
ja_JP.JIS: ja_JP.JIS7
ja_JP.jis7: ja_JP.JIS7
ja_JP.mscode: ja_JP.SJIS
ko: ko_KR.eucKR
ko_KR: ko_KR.eucKR
KO_KR: ko_KR.eucKR
-@@ -705,23 +893,56 @@
+@@ -732,23 +920,56 @@
ko_KR.euckr: ko_KR.eucKR
ko_KR.utf8: ko_KR.UTF-8
KO_KR.UTF-8: ko_KR.UTF-8
#if defined(VeryOldFreeBSD)
XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
-@@ -738,6 +959,8 @@
+@@ -765,6 +986,8 @@
lt_LT.ISO-8859-13: lt_LT.ISO8859-13
lt_LT.ISO_8859-13: lt_LT.ISO8859-13
lt_LT.utf8: lt_LT.UTF-8
lv: lv_LV.ISO8859-13
lv_LV: lv_LV.ISO8859-13
lv_LV.iso88594: lv_LV.ISO8859-4
-@@ -749,34 +972,68 @@
+@@ -776,34 +999,68 @@
mi: mi_NZ.ISO8859-1
mi_NZ: mi_NZ.ISO8859-1
mi_NZ.iso88591: mi_NZ.ISO8859-1
nl: nl_NL.ISO8859-1
nl_BE: nl_BE.ISO8859-1
nl_BE.88591: nl_BE.ISO8859-1
-@@ -785,8 +1042,10 @@
+@@ -812,8 +1069,10 @@
nl_BE.ISO-8859-1: nl_BE.ISO8859-1
nl_BE.ISO_8859-1: nl_BE.ISO8859-1
nl_BE.iso885915: nl_BE.ISO8859-15
nl_BE@euro: nl_BE.ISO8859-15
nl_BE.utf8: nl_BE.UTF-8
nl_BE.UTF-8@euro: nl_BE.UTF-8
-@@ -794,11 +1053,13 @@
+@@ -821,11 +1080,13 @@
nl_NL.88591: nl_NL.ISO8859-1
nl_NL.88591.en: nl_NL.ISO8859-1
nl_NL.iso88591: nl_NL.ISO8859-1
nl_NL@euro: nl_NL.ISO8859-15
nl_NL.utf8: nl_NL.UTF-8
nl_NL.UTF-8@euro: nl_NL.UTF-8
-@@ -809,42 +1070,79 @@
+@@ -836,42 +1097,79 @@
nn_NO.ISO_8859-1: nn_NO.ISO8859-1
nn_NO.iso885915: nn_NO.ISO8859-15
nn_NO.ISO-8859-15: nn_NO.ISO8859-15
pd: pd_US.ISO8859-1
pd_DE: pd_DE.ISO8859-1
pd_US: pd_US.ISO8859-1
-@@ -852,17 +1150,23 @@
+@@ -879,17 +1177,23 @@
pd_US.iso88591: pd_US.ISO8859-1
pd_DE.iso885915: pd_DE.ISO8859-15
pd_US.iso885915: pd_US.ISO8859-15
pt: pt_PT.ISO8859-1
pt_BR: pt_BR.ISO8859-1
pt_BR.88591: pt_BR.ISO8859-1
-@@ -870,7 +1174,6 @@
+@@ -897,7 +1201,6 @@
pt_BR.iso88591: pt_BR.ISO8859-1
pt_BR.ISO-8859-1: pt_BR.ISO8859-1
pt_BR.ISO_8859-1: pt_BR.ISO8859-1
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -879,8 +1182,10 @@
+@@ -906,8 +1209,10 @@
pt_PT.ISO-8859-1: pt_PT.ISO8859-1
pt_PT.ISO_8859-1: pt_PT.ISO8859-1
pt_PT.iso885915: pt_PT.ISO8859-15
pt_PT@euro: pt_PT.ISO8859-15
pt_PT.utf8: pt_PT.UTF-8
pt_PT.UTF-8@euro: pt_PT.UTF-8
-@@ -888,16 +1193,22 @@
+@@ -915,16 +1220,22 @@
ro_RO: ro_RO.ISO8859-2
ro_RO.iso88592: ro_RO.ISO8859-2
ro_RO.ISO-8859-2: ro_RO.ISO8859-2
#if defined(INCLUDE_ru_SU)
XCOMM ru_SU is redundant now
ru_SU: ru_RU.KOI8-R
-@@ -910,10 +1221,12 @@
+@@ -937,10 +1248,12 @@
ru_UA.microsoftcp1251: ru_UA.CP1251
ru_UA.microsoft-cp1251: ru_UA.CP1251
ru_UA.MICROSOFT-CP1251: ru_UA.CP1251
rw_RW.utf8: rw_RW.UTF-8
se_NO: se_NO.UTF-8
se_NO.utf8: se_NO.UTF-8
-@@ -927,25 +1240,52 @@
+@@ -954,25 +1267,52 @@
sh_YU.utf8: sr_CS.UTF-8
si: si_LK.UTF-8
si_LK: si_LK.UTF-8
sq_AL.utf8: sq_AL.UTF-8
XCOMM SP is not an ISO 639 country code, but in Cyrillic, "R" looks like "P".
XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
-@@ -955,8 +1295,10 @@
+@@ -982,8 +1322,10 @@
sr_YU: sr_CS.ISO8859-5
sr_YU.iso88592: sr_CS.ISO8859-2
sr_YU.ISO-8859-2: sr_CS.ISO8859-2
sr@cyrillic: sr_CS.ISO8859-5
sr_YU@cyrillic: sr_CS.ISO8859-5
sr_YU.iso88595@cyrillic: sr_CS.ISO8859-5
-@@ -969,32 +1311,50 @@
+@@ -996,32 +1338,50 @@
sr_YU.MICROSOFT-CP1251@cyrillic: sr_CS.CP1251
sr_YU.utf8: sr_CS.UTF-8
sr_YU.UTF-8@cyrillic: sr_CS.UTF-8
sv_FI@euro: sv_FI.ISO8859-15
sv_FI.UTF-8@euro: sv_FI.UTF-8
sv_FI.utf8: sv_FI.UTF-8
-@@ -1008,49 +1368,85 @@
+@@ -1035,49 +1395,85 @@
sv_SE.ISO-8859-15: sv_SE.ISO8859-15
sv_SE@euro: sv_SE.ISO8859-15
sv_SE.utf8: sv_SE.UTF-8
uk_UA.koi8u: uk_UA.KOI8-U
uk_UA.cp1251: uk_UA.CP1251
uk_UA.microsoftcp1251: uk_UA.CP1251
-@@ -1066,35 +1462,53 @@
+@@ -1093,35 +1489,53 @@
ur_PK.microsoftcp1256: ur_PK.CP1256
ur_PK.microsoft-cp1256: ur_PK.CP1256
ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
xh_ZA.utf8: xh_ZA.UTF-8
yi: yi_US.CP1255
yi_US: yi_US.CP1255
-@@ -1102,6 +1516,7 @@
+@@ -1129,6 +1543,7 @@
yi_US.microsoftcp1255: yi_US.CP1255
yi_US.microsoft-cp1255: yi_US.CP1255
yi_US.MICROSOFT-CP1255: yi_US.CP1255
zh_CN: zh_CN.gb2312
zh_CN.Big5: zh_TW.big5
zh_CN.EUC: zh_CN.eucCN
-@@ -1113,8 +1528,10 @@
+@@ -1140,8 +1555,10 @@
zh_CN.utf8: zh_CN.UTF-8
ZH_CN.UTF-8: zh_CN.UTF-8
zh_HK: zh_HK.big5hkscs
zh_HK.Big5_hkscs: zh_HK.big5hkscs
zh_HK.Big5HKSCS: zh_HK.big5hkscs
zh_HK.BIG5-HKSCS: zh_HK.big5hkscs
-@@ -1122,6 +1539,10 @@
+@@ -1149,6 +1566,10 @@
zh_HK.Big5: zh_HK.big5
zh_HK.utf8: zh_HK.UTF-8
ZH_HK.UTF-8: zh_HK.UTF-8
ZH_SG.UTF-8: zh_SG.UTF-8
zh_TW: zh_TW.big5
zh_TW.Big5: zh_TW.big5
-@@ -1131,9 +1552,11 @@
+@@ -1158,9 +1579,11 @@
zh_TW.EUC-TW: zh_TW.eucTW
zh_TW.utf8: zh_TW.UTF-8
ZH_TW.UTF-8: zh_TW.UTF-8
zu_ZA.utf8: zu_ZA.UTF-8
XCOMM The following locale names are used in SCO 3.0
---- libX11-1.0.99.1/nls/locale.dir.pre.orig 2006-10-04 19:42:02.000000000 +0200
-+++ libX11-1.0.99.1/nls/locale.dir.pre 2006-10-14 11:58:23.559738250 +0200
+--- libX11-1.1.4/nls/locale.dir.pre.orig 2008-03-06 21:45:06.000000000 +0100
++++ libX11-1.1.4/nls/locale.dir.pre 2008-03-07 23:25:54.322403116 +0100
@@ -9,8 +9,11 @@
XCOMM
iso8859-5/XLC_LOCALE: be_BY.ISO8859-5
microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
-@@ -38,13 +41,13 @@
+@@ -38,6 +41,7 @@
iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
+iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
+ iso8859-1/XLC_LOCALE: ca_AD.ISO8859-1
+ iso8859-15/XLC_LOCALE: ca_AD.ISO8859-15
iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1
- iso8859-15/XLC_LOCALE: ca_ES.ISO8859-15
- iso8859-2/XLC_LOCALE: cs_CZ.ISO8859-2
+@@ -50,7 +54,6 @@
iso8859-1/XLC_LOCALE: cy_GB.ISO8859-1
iso8859-14/XLC_LOCALE: cy_GB.ISO8859-14
iso8859-15/XLC_LOCALE: cy_GB.ISO8859-15
iso8859-1/XLC_LOCALE: da_DK.ISO8859-1
iso8859-15/XLC_LOCALE: da_DK.ISO8859-15
iso8859-1/XLC_LOCALE: de_AT.ISO8859-1
-@@ -58,13 +61,14 @@
+@@ -64,13 +67,14 @@
iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
iso8859-1/XLC_LOCALE: de_LU.ISO8859-1
iso8859-15/XLC_LOCALE: de_LU.ISO8859-15
iso8859-1/XLC_LOCALE: en_GB.ISO8859-1
iso8859-15/XLC_LOCALE: en_GB.ISO8859-15
iso8859-1/XLC_LOCALE: en_HK.ISO8859-1
-@@ -76,8 +80,6 @@
+@@ -82,8 +86,6 @@
iso8859-1/XLC_LOCALE: en_PH.ISO8859-1
iso8859-1/XLC_LOCALE: en_SG.ISO8859-1
iso8859-1/XLC_LOCALE: en_TT.ISO8859-1
iso8859-1/XLC_LOCALE: en_US.ISO8859-1
iso8859-15/XLC_LOCALE: en_US.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
-@@ -114,6 +116,7 @@
+@@ -120,6 +122,7 @@
isiri-3342/XLC_LOCALE: fa_IR.ISIRI-3342
iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1
iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15
iso8859-1/XLC_LOCALE: fo_FO.ISO8859-1
iso8859-15/XLC_LOCALE: fo_FO.ISO8859-15
iso8859-1/XLC_LOCALE: fr_BE.ISO8859-1
-@@ -141,7 +144,9 @@
+@@ -147,7 +150,9 @@
microsoft-cp1255/XLC_LOCALE: he_IL.CP1255
iscii-dev/XLC_LOCALE: hi_IN.ISCII-DEV
iso8859-2/XLC_LOCALE: hr_HR.ISO8859-2
armscii-8/XLC_LOCALE: hy_AM.ARMSCII-8
iso8859-1/XLC_LOCALE: id_ID.ISO8859-1
iso8859-1/XLC_LOCALE: is_IS.ISO8859-1
-@@ -154,62 +159,71 @@
+@@ -160,62 +165,71 @@
ja.JIS/XLC_LOCALE: ja_JP.JIS7
georgian-academy/XLC_LOCALE: ka_GE.GEORGIAN-ACADEMY
georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS
iso8859-1/XLC_LOCALE: ss_ZA.ISO8859-1
iso8859-1/XLC_LOCALE: st_ZA.ISO8859-1
iso8859-1/XLC_LOCALE: sv_FI.ISO8859-1
-@@ -217,19 +231,22 @@
+@@ -223,19 +237,22 @@
iso8859-1/XLC_LOCALE: sv_SE.ISO8859-1
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
vi_VN.tcvn/XLC_LOCALE: vi_VN.TCVN
vi_VN.viscii/XLC_LOCALE: vi_VN.VISCII
iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1
-@@ -241,21 +258,23 @@
+@@ -247,21 +264,23 @@
zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030
zh_HK.big5/XLC_LOCALE: zh_HK.big5
en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
-@@ -272,16 +291,17 @@
+@@ -278,19 +297,20 @@
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
en_US.UTF-8/XLC_LOCALE: as_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
+en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
+en_US.UTF-8/XLC_LOCALE: byn_ER.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
+en_US.UTF-8/XLC_LOCALE: csb_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8
en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8
en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8
-@@ -289,19 +309,26 @@
+@@ -298,19 +318,26 @@
en_US.UTF-8/XLC_LOCALE: de_DE.UTF-8
en_US.UTF-8/XLC_LOCALE: de_LI.UTF-8
en_US.UTF-8/XLC_LOCALE: de_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8
en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8
-@@ -321,12 +348,14 @@
+@@ -330,12 +357,14 @@
en_US.UTF-8/XLC_LOCALE: es_PR.UTF-8
en_US.UTF-8/XLC_LOCALE: es_PY.UTF-8
en_US.UTF-8/XLC_LOCALE: es_SV.UTF-8
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
en_US.UTF-8/XLC_LOCALE: fr_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: fr_CA.UTF-8
-@@ -335,12 +364,14 @@
+@@ -344,12 +373,14 @@
en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: hu_HU.UTF-8
en_US.UTF-8/XLC_LOCALE: hy_AM.UTF-8
en_US.UTF-8/XLC_LOCALE: id_ID.UTF-8
-@@ -350,35 +381,42 @@
+@@ -359,35 +390,42 @@
en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8
en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
-@@ -386,13 +424,17 @@
+@@ -395,13 +433,17 @@
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
-@@ -403,8 +445,11 @@
+@@ -412,8 +454,11 @@
th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8
projects / packages / xorg-lib-libX11.git / commitdiff