aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-08-19 09:07:37 +0200
committermarha <marha@users.sourceforge.net>2013-08-19 09:07:37 +0200
commit2d042f719910c5aa1ba9f4a47b21009c729c345e (patch)
tree2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/xkeyboard-config/rules
parentc3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff)
parent854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff)
downloadvcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz
vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2
vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013 Conflicts: fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in6
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in89
2 files changed, 75 insertions, 20 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 4647bec16..4b3c6234e 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -301,7 +301,7 @@
</variant>
<variant>
<configItem>
- <name>type6</name>
+ <name>sun_type6</name>
<_description>Polish (Sun Type 6/7)</_description>
</configItem>
</variant>
@@ -333,7 +333,7 @@
</variant>
<variant>
<configItem>
- <name>type6</name>
+ <name>sun_type6</name>
<_description>Romanian (Sun Type 6/7)</_description>
</configItem>
</variant>
@@ -381,7 +381,7 @@
</variant>
<variant>
<configItem>
- <name>type6</name>
+ <name>sun_type6</name>
<_description>Russian (Sun Type 6/7)</_description>
</configItem>
</variant>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 450154bb5..51c4ca59e 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1414,7 +1414,7 @@
<variant>
<configItem>
<name>olpc2</name>
- <_description>English (layout toggle on multiply/divide key)</_description>
+ <_description>English (the divide/multiply keys toggle the layout)</_description>
</configItem>
</variant>
<variant>
@@ -1724,7 +1724,7 @@
<variant>
<configItem>
<name>oss_latin9</name>
- <_description>Belgian (alternative, latin-9 only)</_description>
+ <_description>Belgian (alternative, Latin-9 only)</_description>
</configItem>
</variant>
<variant>
@@ -1882,6 +1882,17 @@
</variant>
<variant>
<configItem>
+ <name>kan-kagapa</name>
+ <!-- Keyboard indicator for Kannada layouts -->
+ <_shortDescription>kn</_shortDescription>
+ <_description>Kannada (KaGaPa phonetic)</_description>
+ <languageList>
+ <iso639Id>kan</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>mal</name>
<!-- Keyboard indicator for Malayalam layouts -->
<_shortDescription>ml</_shortDescription>
@@ -1990,6 +2001,17 @@
</variant>
<variant>
<configItem>
+ <name>tel-kagapa</name>
+ <!-- Keyboard indicator for Telugu layouts -->
+ <_shortDescription>te</_shortDescription>
+ <_description>Telugu (KaGaPa phonetic)</_description>
+ <languageList>
+ <iso639Id>tel</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>urd-phonetic</name>
<!-- Keyboard indicator for Urdu layouts -->
<_shortDescription>ur</_shortDescription>
@@ -2045,6 +2067,39 @@
</variant>
<variant>
<configItem>
+ <name>hin-kagapa</name>
+ <!-- Keyboard indicator for Hindi layouts -->
+ <_shortDescription>hi</_shortDescription>
+ <_description>Hindi (KaGaPa phonetic)</_description>
+ <languageList>
+ <iso639Id>hin</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>san-kagapa</name>
+ <!-- Keyboard indicator for Sanskrit layouts -->
+ <_shortDescription>sa</_shortDescription>
+ <_description>Sanskrit (KaGaPa phonetic)</_description>
+ <languageList>
+ <iso639Id>san</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>mar-kagapa</name>
+ <!-- Keyboard indicator for Marathi layouts -->
+ <_shortDescription>mr</_shortDescription>
+ <_description>Marathi (KaGaPa phonetic)</_description>
+ <languageList>
+ <iso639Id>mar</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>eng</name>
<!-- Keyboard indicator for English layouts -->
<_shortDescription>en</_shortDescription>
@@ -2125,7 +2180,7 @@
<variant>
<configItem>
<name>nativo-us</name>
- <_description>Portuguese (Brazil, nativo for USA keyboards)</_description>
+ <_description>Portuguese (Brazil, nativo for US keyboards)</_description>
</configItem>
</variant>
<variant>
@@ -2880,7 +2935,7 @@
<variant>
<configItem>
<name>oss_latin9</name>
- <_description>French (alternative, latin-9 only)</_description>
+ <_description>French (alternative, Latin-9 only)</_description>
</configItem>
</variant>
<variant>
@@ -2922,7 +2977,7 @@
<variant>
<configItem>
<name>bepo_latin9</name>
- <_description>French (Bepo, ergonomic, Dvorak way, latin-9 only)</_description>
+ <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</_description>
</configItem>
</variant>
<variant>
@@ -4087,7 +4142,7 @@
<variant>
<configItem>
<name>nativo-us</name>
- <_description>Portuguese (Nativo for USA keyboards)</_description>
+ <_description>Portuguese (Nativo for US keyboards)</_description>
</configItem>
</variant>
<variant>
@@ -5869,7 +5924,7 @@
<option>
<configItem>
<name>lv3:ralt_switch_multikey</name>
- <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description>
+ <_description>Right Alt, Shift+Right Alt key is Compose</_description>
</configItem>
</option>
<option>
@@ -6086,7 +6141,7 @@
<option>
<configItem>
<name>kpdl:dotoss_latin9</name>
- <_description>Four-level key with dot, latin-9 restriction</_description>
+ <_description>Four-level key with dot, Latin-9 only</_description>
</configItem>
</option>
<option>
@@ -6112,7 +6167,7 @@
<option>
<configItem>
<name>kpdl:semi</name>
- <_description>Semi-colon on third level</_description>
+ <_description>Semicolon on third level</_description>
</configItem>
</option>
</group>
@@ -6193,7 +6248,7 @@
<option>
<configItem>
<name>caps:shiftlock</name>
- <_description>Caps Lock toggles Shift so all keys are affected</_description>
+ <_description>Caps Lock toggles ShiftLock (affects all keys)</_description>
</configItem>
</option>
<option>
@@ -6447,25 +6502,25 @@
<option>
<configItem>
<name>shift:both_capslock</name>
- <_description>Both Shift-Keys together toggle Caps Lock</_description>
+ <_description>Both Shift keys together toggle Caps Lock</_description>
</configItem>
</option>
<option>
<configItem>
<name>shift:both_capslock_cancel</name>
- <_description>Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates</_description>
+ <_description>Both Shift keys together activate Caps Lock, one Shift key deactivates</_description>
</configItem>
</option>
<option>
<configItem>
<name>shift:both_shiftlock</name>
- <_description>Both Shift-Keys together toggle ShiftLock</_description>
+ <_description>Both Shift keys together toggle ShiftLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:pointerkeys</name>
- <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+ <_description>Shift + NumLock toggles PointerKeys</_description>
</configItem>
</option>
<option>
@@ -6710,18 +6765,18 @@
<group allowMultipleSelection="false">
<configItem>
<name>esperanto</name>
- <_description>Adding Esperanto circumflexes (supersigno)</_description>
+ <_description>Adding Esperanto supersigned letters</_description>
</configItem>
<option>
<configItem>
<name>esperanto:qwerty</name>
- <_description>To the corresponding key in a Qwerty keyboard.</_description>
+ <_description>To the corresponding key in a Qwerty layout</_description>
</configItem>
</option>
<option>
<configItem>
<name>esperanto:dvorak</name>
- <_description>To the corresponding key in a Dvorak keyboard.</_description>
+ <_description>To the corresponding key in a Dvorak layout</_description>
</configItem>
</option>
</group>