aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
Diffstat (limited to 'libX11')
-rw-r--r--libX11/nls/compose.dir.pre4
-rw-r--r--libX11/nls/en_US.UTF-8/Compose.pre3
-rw-r--r--libX11/nls/locale.alias.pre10
-rw-r--r--libX11/nls/locale.dir.pre6
4 files changed, 12 insertions, 11 deletions
diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre
index e52a5c568..268c90a48 100644
--- a/libX11/nls/compose.dir.pre
+++ b/libX11/nls/compose.dir.pre
@@ -389,7 +389,7 @@ km_KH.UTF-8/Compose: km_KH.UTF-8
en_US.UTF-8/Compose: kn_IN.UTF-8
ko_KR.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: ks_IN.UTF-8@devanagari
en_US.UTF-8/Compose: ku_TR.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
@@ -429,7 +429,7 @@ 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: sd_IN.UTF-8@devanagari
en_US.UTF-8/Compose: se_NO.UTF-8
en_US.UTF-8/Compose: sh_BA.UTF-8
en_US.UTF-8/Compose: sh_YU.UTF-8
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index 972e111b9..2041757c9 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -276,6 +276,7 @@ XCOMM Other symbols
<Multi_key> <colon> <parenright> : "☺" U263A # WHITE SMILING FACE
<Multi_key> <colon> <parenleft> : "☹" U2639 # WHITE FROWNING FACE
+<Multi_key> <backslash> <o> <slash> : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION
<Multi_key> <F> <U> : "🖕" U1F595 # REVERSED HAND WITH MIDDLE FINGER EXTENDED
<Multi_key> <L> <L> <A> <P> : "🖖" U1F596 # RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
@@ -5840,8 +5841,6 @@ XCOMM
<dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <backslash> <o> <slash> : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION
-
XCOMM APL support Geoff Streeter 2012-01-04
XCOMM APL was initially an overstruck language. The original APL terminal was an IBM golfball
diff --git a/libX11/nls/locale.alias.pre b/libX11/nls/locale.alias.pre
index 1319492fb..63d224612 100644
--- a/libX11/nls/locale.alias.pre
+++ b/libX11/nls/locale.alias.pre
@@ -750,8 +750,8 @@ KO_KR.UTF-8: ko_KR.UTF-8
ks: ks_IN.UTF-8
ks_IN: ks_IN.UTF-8
ks_IN.utf8: ks_IN.UTF-8
-ks_IN@devanagari: ks_IN@devanagari.UTF-8
-ks_IN@devanagari.utf8: ks_IN@devanagari.UTF-8
+ks_IN@devanagari: ks_IN.UTF-8@devanagari
+ks_IN.utf8@devanagari: ks_IN.UTF-8@devanagari
kw: kw_GB.ISO8859-1
kw_GB: kw_GB.ISO8859-1
kw_GB.iso88591: kw_GB.ISO8859-1
@@ -982,9 +982,9 @@ rw_RW.ISO-8859-1: rw_RW.ISO8859-1
rw_RW.utf8: rw_RW.UTF-8
sd: sd_IN.UTF-8
sd_IN.utf8: sd_IN.UTF-8
-sd@devanagari: sd_IN@devanagari.UTF-8
-sd_IN@devanagari: sd_IN@devanagari.UTF-8
-sd_IN@devanagari.utf8: sd_IN@devanagari.UTF-8
+sd@devanagari: sd_INUTF-8@devanagari
+sd_IN@devanagari: sd_INUTF-8@devanagari
+sd_IN.utf8@devanagari: sd_INUTF-8@devanagari
se_NO: se_NO.UTF-8
se_NO.utf8: se_NO.UTF-8
XCOMM sh was the old ISO code for Serbo-Croatian (now individual sr and hr).
diff --git a/libX11/nls/locale.dir.pre b/libX11/nls/locale.dir.pre
index ab1bacec6..8570ba336 100644
--- a/libX11/nls/locale.dir.pre
+++ b/libX11/nls/locale.dir.pre
@@ -292,6 +292,7 @@ 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: be_BY.UTF-8
+en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8@latin
en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
@@ -389,7 +390,7 @@ en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8
en_US.UTF-8/XLC_LOCALE: km_KH.UTF-8
en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8
-en_US.UTF-8/XLC_LOCALE: ks_IN@devanagari.UTF-8
+en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8@devanagari
ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
en_US.UTF-8/XLC_LOCALE: ku_TR.UTF-8
en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
@@ -429,7 +430,7 @@ 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: sa_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8
-en_US.UTF-8/XLC_LOCALE: sd_IN@devanagari.UTF-8
+en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8@devanagari
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: sh_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
@@ -440,6 +441,7 @@ en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_ME.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_RS.UTF-8
+en_US.UTF-8/XLC_LOCALE: sr_RS.UTF-8@latin
en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8
en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8