diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-24 07:51:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-24 07:51:24 +0000 |
| commit | 81aeaf653a832c4054d9a40b1cc796911521a739 (patch) | |
| tree | cf49e5efe23001c76bee6fb625e26801bd7edff0 /xorg-server/xkeyboard-config/rules | |
| parent | b63d68318fdce5002f42a818f3dd3dff126ec2c2 (diff) | |
| parent | b39f063f74bf0163eaf34db03134f226d18142ec (diff) | |
| download | vcxsrv-81aeaf653a832c4054d9a40b1cc796911521a739.tar.gz vcxsrv-81aeaf653a832c4054d9a40b1cc796911521a739.tar.bz2 vcxsrv-81aeaf653a832c4054d9a40b1cc796911521a739.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 34 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 4 |
2 files changed, 27 insertions, 11 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index f72e4cf95..188855ab4 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -23,7 +23,7 @@ <variant>
<configItem>
<name>ave</name>
- <_description>Iran Avestan</_description>
+ <_description>Iran - Avestan</_description>
<languageList><iso639Id>ave</iso639Id></languageList>
</configItem>
</variant>
@@ -31,6 +31,22 @@ </layout>
<layout>
<configItem>
+ <name>lt</name>
+ <_shortDescription>Ltu</_shortDescription>
+ <_description>Lithuania</_description>
+ <languageList><iso639Id>lit</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>dvorak</name>
+ <_description>Lithuania - Dvorak</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
<name>us</name>
<_shortDescription>USA</_shortDescription>
<_description>USA</_description>
@@ -40,26 +56,26 @@ <variant>
<configItem>
<name>intl-unicode</name>
- <_description>USA International (AltGr Unicode combining)</_description>
+ <_description>USA - International (AltGr Unicode combining)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>alt-intl-unicode</name>
- <_description>USA International (AltGr Unicode combining, alternative)</_description>
+ <_description>USA - International (AltGr Unicode combining, alternative)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>ats</name>
- <_description>USA Atsina</_description>
+ <_description>USA - Atsina</_description>
<!-- No ISO code in ISO639-2, only draft ISO693-3 -->
</configItem>
</variant>
<variant>
<configItem>
<name>crd</name>
- <_description>USA Couer D'alene Salish</_description>
+ <_description>USA - Couer D'alene Salish</_description>
<languageList><iso639Id>crd</iso639Id></languageList>
</configItem>
</variant>
@@ -76,7 +92,7 @@ <variant>
<configItem>
<name>ergonomic</name>
- <_description>Ergonomic Touchtype</_description>
+ <_description>Romania - Ergonomic Touchtype</_description>
</configItem>
</variant>
</variantList>
@@ -84,7 +100,7 @@ <layout>
<configItem>
<name>rs</name>
- <_shortDescription>SRB</_shortDescription>
+ <_shortDescription>Srb</_shortDescription>
<_description>Serbia</_description>
<languageList><iso639Id>srp</iso639Id></languageList>
</configItem>
@@ -92,7 +108,7 @@ <variant>
<configItem>
<name>combiningkeys</name>
- <_description>Serbia Combining accents instead of dead keys</_description>
+ <_description>Serbia - Combining accents instead of dead keys</_description>
</configItem>
</variant>
</variantList>
@@ -107,7 +123,7 @@ <variant>
<configItem>
<name>chu</name>
- <description>Russia Church Slavonic</description>
+ <description>Russia - Church Slavonic</description>
<languageList><iso639Id>chu</iso639Id></languageList>
</configItem>
</variant>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 1a3d528d1..e4c79fe77 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1778,7 +1778,7 @@ <variant>
<configItem>
<name>mal_enhanced</name>
- <_description>India - Malayalam enhanced INSCRIPT with Rupee Sign</_description>
+ <_description>India - Malayalam enhanced Inscript with Rupee Sign</_description>
<languageList><iso639Id>mal</iso639Id></languageList>
</configItem>
</variant>
@@ -3925,7 +3925,7 @@ <layout>
<configItem>
<name>rs</name>
- <_shortDescription>SRB</_shortDescription>
+ <_shortDescription>Srb</_shortDescription>
<_description>Serbia</_description>
<languageList>
<iso639Id>srp</iso639Id>
|