aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.xml.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-21 09:05:28 +0100
committermarha <marha@users.sourceforge.net>2012-11-21 09:05:28 +0100
commit7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796 (patch)
tree0d078a56d8bcd7ffa319c9d6926aef3db5a7052b /xorg-server/xkeyboard-config/rules/base.xml.in
parent589f5feba1e7968b7318b02f4f2bdea81937f0e1 (diff)
parent38eb7612c4b39dd69df4baf4450ba512e888effa (diff)
downloadvcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.gz
vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.bz2
vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Git update 21 nov 2012
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.xml.in')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 313f4884d..5f0618166 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1296,7 +1296,7 @@
<variant>
<configItem>
<name>dvorak-intl</name>
- <_description>English (Dvorak international with dead keys)</_description>
+ <_description>English (Dvorak, international with dead keys)</_description>
</configItem>
</variant>
<variant>
@@ -1375,9 +1375,15 @@
<variant>
<configItem>
<name>workman</name>
- <_description>English (US, Workman)</_description>
+ <_description>English (Workman)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>workman-intl</name>
+ <_description>English (Workman, international with dead keys)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -4235,7 +4241,7 @@
<name>rs</name>
<!-- Keyboard indicator for Serbian layouts -->
<_shortDescription>sr</_shortDescription>
- <_description>Serbian (Cyrillic)</_description>
+ <_description>Serbian</_description>
<languageList>
<iso639Id>srp</iso639Id>
</languageList>
@@ -5511,7 +5517,7 @@
<configItem>
<name>gag</name>
<_shortDescription>gag</_shortDescription>
- <_description>Gagauz</_description>
+ <_description>Moldavian (Gagauz)</_description>
<languageList><iso639Id>gag</iso639Id></languageList>
</configItem>
</variant>