aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls/compose.dir.pre
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/nls/compose.dir.pre
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/nls/compose.dir.pre')
-rw-r--r--libX11/nls/compose.dir.pre30
1 files changed, 27 insertions, 3 deletions
diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre
index c9a35dcf5..2ef0bbb48 100644
--- a/libX11/nls/compose.dir.pre
+++ b/libX11/nls/compose.dir.pre
@@ -199,11 +199,9 @@ iso8859-2/Compose: sh_YU.ISO8859-2
iso8859-2/Compose: sk_SK.ISO8859-2
iso8859-2/Compose: sl_CS.ISO8859-2
iso8859-2/Compose: sl_SI.ISO8859-2
-iso8859-5/Compose: sp_YU.ISO8859-5
iso8859-2/Compose: sq_AL.ISO8859-2
iso8859-2/Compose: sr_CS.ISO8859-2
iso8859-5/Compose: sr_CS.ISO8859-5
-iso8859-2/Compose: sr_SP.ISO8859-2
iso8859-2/Compose: sr_YU.ISO8859-2
iso8859-5/Compose: sr_YU.ISO8859-5
iso8859-1/Compose: ss_ZA.ISO8859-1
@@ -246,6 +244,7 @@ en_US.UTF-8/Compose: ar_AA.UTF-8
en_US.UTF-8/Compose: ar_BH.UTF-8
en_US.UTF-8/Compose: ar_DZ.UTF-8
en_US.UTF-8/Compose: ar_EG.UTF-8
+en_US.UTF-8/Compose: ar_IN.UTF-8
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
@@ -257,6 +256,7 @@ en_US.UTF-8/Compose: ar_QA.UTF-8
en_US.UTF-8/Compose: ar_SA.UTF-8
en_US.UTF-8/Compose: ar_TN.UTF-8
en_US.UTF-8/Compose: ar_YE.UTF-8
+en_US.UTF-8/Compose: bo_IN.UTF-8
en_US.UTF-8/Compose: bs_BA.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
en_US.UTF-8/Compose: a3_AZ.UTF-8
@@ -278,6 +278,7 @@ en_US.UTF-8/Compose: de_CH.UTF-8
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
+el_GR.UTF-8/Compose: el_CY.UTF-8
el_GR.UTF-8/Compose: el_GR.UTF-8
en_US.UTF-8/Compose: en_AU.UTF-8
en_US.UTF-8/Compose: en_BZ.UTF-8
@@ -285,6 +286,7 @@ en_US.UTF-8/Compose: en_CA.UTF-8
en_US.UTF-8/Compose: en_GB.UTF-8
en_US.UTF-8/Compose: en_IE.UTF-8
en_US.UTF-8/Compose: en_JM.UTF-8
+en_US.UTF-8/Compose: en_MT.UTF-8
en_US.UTF-8/Compose: en_NZ.UTF-8
en_US.UTF-8/Compose: en_TT.UTF-8
en_US.UTF-8/Compose: en_UK.UTF-8
@@ -308,12 +310,13 @@ en_US.UTF-8/Compose: es_PE.UTF-8
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: es_US.UTF-8
en_US.UTF-8/Compose: es_UY.UTF-8
en_US.UTF-8/Compose: es_VE.UTF-8
en_US.UTF-8/Compose: et_EE.UTF-8
en_US.UTF-8/Compose: eu_ES.UTF-8
en_US.UTF-8/Compose: fa_IR.UTF-8
-en_US.UTF-8/Compose: fi_FI.UTF-8
+fi_FI.UTF-8/Compose: fi_FI.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
@@ -327,6 +330,7 @@ en_US.UTF-8/Compose: gu_IN.UTF-8
en_US.UTF-8/Compose: gv_GB.UTF-8
en_US.UTF-8/Compose: he_IL.UTF-8
en_US.UTF-8/Compose: hi_IN.UTF-8
+en_US.UTF-8/Compose: hne_IN.UTF-8
en_US.UTF-8/Compose: hr_HR.UTF-8
en_US.UTF-8/Compose: hu_HU.UTF-8
en_US.UTF-8/Compose: hy_AM.UTF-8
@@ -338,24 +342,35 @@ 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: kl_GL.UTF-8
+en_US.UTF-8/Compose: kk_KZ.UTF-8
+en_US.UTF-8/Compose: kn_IN.UTF-8
en_US.UTF-8/Compose: ko_KR.UTF-8
+en_US.UTF-8/Compose: ks_IN.UTF-8
+en_US.UTF-8/Compose: ks_IN@devanagari.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
en_US.UTF-8/Compose: lo_LA.UTF-8
en_US.UTF-8/Compose: lt_LT.UTF-8
en_US.UTF-8/Compose: lv_LV.UTF-8
+en_US.UTF-8/Compose: mai_IN.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
+en_US.UTF-8/Compose: ml_IN.UTF-8
+en_US.UTF-8/Compose: mr_IN.UTF-8
en_US.UTF-8/Compose: ms_MY.UTF-8
+en_US.UTF-8/Compose: mt_MT.UTF-8
en_US.UTF-8/Compose: nl_BE.UTF-8
en_US.UTF-8/Compose: nl_NL.UTF-8
+en_US.UTF-8/Compose: nn_NO.UTF-8
en_US.UTF-8/Compose: no_NO.UTF-8
en_US.UTF-8/Compose: nb_NO.UTF-8
en_US.UTF-8/Compose: nr_ZA.UTF-8
en_US.UTF-8/Compose: nso_ZA.UTF-8
en_US.UTF-8/Compose: ny_NO.UTF-8
en_US.UTF-8/Compose: oc_FR.UTF-8
+en_US.UTF-8/Compose: or_IN.UTF-8
en_US.UTF-8/Compose: pa_IN.UTF-8
+en_US.UTF-8/Compose: pa_PK.UTF-8
en_US.UTF-8/Compose: pd_DE.UTF-8
en_US.UTF-8/Compose: pd_US.UTF-8
en_US.UTF-8/Compose: ph_PH.UTF-8
@@ -367,17 +382,24 @@ en_US.UTF-8/Compose: ro_RO.UTF-8
en_US.UTF-8/Compose: ru_RU.UTF-8
en_US.UTF-8/Compose: ru_UA.UTF-8
en_US.UTF-8/Compose: rw_RW.UTF-8
+en_US.UTF-8/Compose: sa_IN.UTF-8
+en_US.UTF-8/Compose: sd_IN.UTF-8
+en_US.UTF-8/Compose: sd_IN@devanagari.UTF-8
+en_US.UTF-8/Compose: sh_BA.UTF-8
en_US.UTF-8/Compose: si_LK.UTF-8
en_US.UTF-8/Compose: sk_SK.UTF-8
en_US.UTF-8/Compose: sl_SI.UTF-8
en_US.UTF-8/Compose: sq_AL.UTF-8
en_US.UTF-8/Compose: sr_CS.UTF-8
+en_US.UTF-8/Compose: sr_ME.UTF-8
+en_US.UTF-8/Compose: sr_RS.UTF-8
en_US.UTF-8/Compose: sr_YU.UTF-8
en_US.UTF-8/Compose: ss_ZA.UTF-8
en_US.UTF-8/Compose: st_ZA.UTF-8
en_US.UTF-8/Compose: sv_FI.UTF-8
en_US.UTF-8/Compose: sv_SE.UTF-8
en_US.UTF-8/Compose: ta_IN.UTF-8
+en_US.UTF-8/Compose: te_IN.UTF-8
en_US.UTF-8/Compose: tg_TJ.UTF-8
en_US.UTF-8/Compose: th_TH.UTF-8
en_US.UTF-8/Compose: tl_PH.UTF-8
@@ -396,3 +418,5 @@ en_US.UTF-8/Compose: xh_ZA.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
+en_US.UTF-8/Compose: ne_NP.UTF-8
+