From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 7 Feb 2014 23:28:38 +0100 Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Update to openssl1.0.1f xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2 libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743 libX11 commit aacf95dacc7c598e7297894580d4d655593813b2 xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3 --- .../xkeyboard-config/rules/base.extras.xml.in | 55 ++++++++++++++----- xorg-server/xkeyboard-config/rules/base.xml.in | 61 ++++++++++++++++++---- 2 files changed, 91 insertions(+), 25 deletions(-) (limited to 'xorg-server/xkeyboard-config/rules') diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index dd3251b6e..dd7339390 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -14,43 +14,43 @@ dyalog - dlg - APL keyboard symbols (Dyalog) + <_shortDescription>dlg + <_description>APL keyboard symbols (Dyalog) sax - sax - APL keyboard symbols (sax) + <_shortDescription>sax + <_description>APL keyboard symbols (sax) unified - ufd - APL keyboard symbols (unified) + <_shortDescription>ufd + <_description>APL keyboard symbols (unified) apl2 - apl2 - APL keyboard symbols (IBM APL2) + <_shortDescription>apl2 + <_description>APL keyboard symbols (IBM APL2) aplplusII - aplII - APL keyboard symbols (Manugistics APL*PLUS II) + <_shortDescription>aplII + <_description>APL keyboard symbols (Manugistics APL*PLUS II) aplx - aplx - APL keyboard symbols (APLX unified) + <_shortDescription>aplx + <_description>APL keyboard symbols (APLX unified) @@ -264,7 +264,7 @@ cz_sk_de - Czech Slovak and German (US) + <_description>Czech Slovak and German (US) eng cze slo @@ -371,7 +371,7 @@ chu - Church Slavonic + <_description>Church Slavonic chu @@ -776,6 +776,33 @@ + + + eu + + <_shortDescription>eu + <_description>EurKEY (US based layout with european letters) + + cat + dan + eng + est + fao + fin + ger + gre + gsw + ita + lav + lit + nld + nor + por + spa + swe + + + diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index eb9586680..198b3a7be 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1839,7 +1839,7 @@ eeyek - Manipuri (Eeyek) + <_description>Manipuri (Eeyek) mni @@ -1925,7 +1925,7 @@ mal_enhanced <_shortDescription>ml - <_description>Malayalam (enhanced Inscript with Rupee Sign) + <_description>Malayalam (enhanced Inscript, with rupee sign) mal @@ -2110,7 +2110,7 @@ eng <_shortDescription>en - <_description>English (India, with RupeeSign) + <_description>English (India, with rupee sign) eng @@ -2132,13 +2132,13 @@ alternatequotes - <_description>Bosnian (use guillemets for quotes) + <_description>Bosnian (with guillemets for quotes) unicode - <_description>Bosnian (use Bosnian digraphs) + <_description>Bosnian (with Bosnian digraphs) @@ -2559,13 +2559,13 @@ alternatequotes - <_description>Croatian (use guillemets for quotes) + <_description>Croatian (with guillemets for quotes) unicode - <_description>Croatian (use Croatian digraphs) + <_description>Croatian (with Croatian digraphs) @@ -2642,6 +2642,12 @@ <_description>Danish (eliminate dead keys) + + + winkeys + <_description>Danish (Winkeys) + + mac @@ -2749,7 +2755,7 @@ pes_keypad - <_description>Persian (with Persian Keypad) + <_description>Persian (with Persian keypad) @@ -2896,6 +2902,12 @@ <_description>Finnish (classic, eliminate dead keys) + + + winkeys + <_description>Finnish (Winkeys) + + smi @@ -3277,6 +3289,15 @@ <_description>German (qwerty) + + + tr + <_description>Turkish (Germany) + + tr + + + ru @@ -3545,6 +3566,12 @@ <_description>Italian (eliminate dead keys) + + + winkeys + <_description>Italian (Winkeys) + + mac @@ -3982,6 +4009,12 @@ <_description>Norwegian (eliminate dead keys) + + + winkeys + <_description>Norwegian (Winkeys) + + dvorak @@ -4079,7 +4112,7 @@ szl - Silesian + <_description>Silesian szl @@ -4443,7 +4476,7 @@ alternatequotes - <_description>Slovenian (use guillemets for quotes) + <_description>Slovenian (with guillemets for quotes) @@ -4502,6 +4535,12 @@ <_description>Spanish (eliminate dead keys) + + + winkeys + <_description>Spanish (Winkeys) + + deadtilde @@ -6343,7 +6382,7 @@