diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-18 07:55:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-18 07:55:12 +0000 |
| commit | 32a666fa1f26defd3b4e508b75f1acf6e2900a40 (patch) | |
| tree | 9735440d047c660e4966060a3020e2cae419d77c /xorg-server/xkeyboard-config/rules | |
| parent | ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (diff) | |
| parent | 35484135119fcf55fe1cbb1fcdd0e035f581fcfb (diff) | |
| download | vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.gz vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.bz2 vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.zip | |
merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 44 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 12 |
2 files changed, 42 insertions, 14 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 8240e27b2..74adfde49 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -6,7 +6,7 @@ <layout>
<configItem>
<name>apl</name>
- <_shortDescription>APL</_shortDescription>
+ <_shortDescription>apl</_shortDescription>
<_description>APL Keyboard Symbols</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
</configItem>
@@ -39,7 +39,7 @@ <layout>
<configItem>
<name>ir</name>
- <_shortDescription>Iran</_shortDescription>
+ <_shortDescription>fa</_shortDescription>
<_description>Persian</_description>
<languageList><iso639Id>per</iso639Id></languageList>
</configItem>
@@ -56,15 +56,15 @@ <layout>
<configItem>
<name>lt</name>
- <_shortDescription>Ltu</_shortDescription>
+ <_shortDescription>lt</_shortDescription>
<_description>Lithuanian</_description>
<languageList><iso639Id>lit</iso639Id></languageList>
</configItem>
<variantList>
<variant>
<configItem>
- <name>dvorak</name>
- <_description>Lithuanian (Dvorak)</_description>
+ <name>us_dvorak</name>
+ <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description>
</configItem>
</variant>
</variantList>
@@ -184,7 +184,7 @@ <layout>
<configItem>
<name>ro</name>
- <_shortDescription>Rou</_shortDescription>
+ <_shortDescription>ro</_shortDescription>
<_description>Romanian</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
</configItem>
@@ -200,7 +200,7 @@ <layout>
<configItem>
<name>rs</name>
- <_shortDescription>Srb</_shortDescription>
+ <_shortDescription>sr</_shortDescription>
<_description>Serbian</_description>
<languageList><iso639Id>srp</iso639Id></languageList>
</configItem>
@@ -216,7 +216,7 @@ <layout>
<configItem>
<name>ru</name>
- <_shortDescription>Rus</_shortDescription>
+ <_shortDescription>ru</_shortDescription>
<_description>Russian</_description>
</configItem>
<variantList>
@@ -227,6 +227,34 @@ <languageList><iso639Id>chu</iso639Id></languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>ruu</name>
+ <_shortDescription>ru</_shortDescription>
+ <_description>Russian (with UKR and BEL layout)</_description>
+ <languageList><iso639Id>rus</iso639Id>
+ <iso639Id>ukr</iso639Id>
+ <iso639Id>bel</iso639Id></languageList>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>am</name>
+ <_shortDescription>hy</_shortDescription>
+ <_description>Armenian</_description>
+ <languageList>
+ <iso639Id>hye</iso639Id>
+ </languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>olpc-phonetic</name>
+ <_description>Armenian (alternative phonetic for OLPC)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
</layoutList>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 3ec111747..0b180311e 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1384,7 +1384,7 @@ <layout>
<configItem>
<name>af</name>
- <_shortDescription>Afg</_shortDescription>
+ <_shortDescription>fa</_shortDescription>
<_description>Afghani</_description>
</configItem>
<variantList>
@@ -2581,7 +2581,7 @@ <layout>
<configItem>
<name>iq</name>
- <_shortDescription>irq</_shortDescription>
+ <_shortDescription>ar</_shortDescription>
<_description>Iraqi</_description>
<languageList><iso639Id>ara</iso639Id>
<iso639Id>kur</iso639Id></languageList>
@@ -3581,7 +3581,7 @@ <layout>
<configItem>
<name>me</name>
- <_shortDescription>srp</_shortDescription>
+ <_shortDescription>sr</_shortDescription>
<_description>Montenegrin</_description>
<languageList>
<iso639Id>srp</iso639Id>
@@ -4310,7 +4310,7 @@ <layout>
<configItem>
<name>ch</name>
- <_shortDescription>che</_shortDescription>
+ <_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
<languageList><iso639Id>ger</iso639Id>
<iso639Id>gsw</iso639Id></languageList>
@@ -4613,7 +4613,7 @@ <layout>
<configItem>
<name>tw</name>
- <_shortDescription>twn</_shortDescription>
+ <_shortDescription>zh</_shortDescription>
<_description>Taiwanese</_description>
<languageList>
<iso639Id>trv</iso639Id>
@@ -4708,7 +4708,7 @@ <layout>
<configItem>
<name>gb</name>
- <_shortDescription>GBr</_shortDescription>
+ <_shortDescription>en</_shortDescription>
<_description>English (UK)</_description>
<languageList>
<iso639Id>eng</iso639Id>
|