aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-30 08:46:36 +0200
committermarha <marha@users.sourceforge.net>2011-09-30 08:46:36 +0200
commit73d82f7ac0d1add2697128c2e26c2432ffe172a5 (patch)
treec6436b57a2191c57320396c37449109ebad745ec /xorg-server/xkeyboard-config
parent4a9e1f51655e03da1507dabce7c4c3960e7ca607 (diff)
parent60adbfdea1ee754341d64454274e7aa83bae8971 (diff)
downloadvcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.gz
vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.bz2
vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: openssl/Makefile
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 062fe1d72..4ee879bb5 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1715,7 +1715,7 @@
<configItem>
<name>ben</name>
<_shortDescription>bn</_shortDescription>
- <_description>Bengali</_description>
+ <_description>Bengali (India)</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@@ -1725,7 +1725,7 @@
<configItem>
<name>ben_probhat</name>
<_shortDescription>bn</_shortDescription>
- <_description>Bengali (Probhat)</_description>
+ <_description>Bengali (India, Probhat)</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@@ -1734,28 +1734,28 @@
<variant>
<configItem>
<name>ben_baishakhi</name>
- <_description>Bengali (Baishakhi)</_description>
+ <_description>Bengali (India, Baishakhi)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
- <_description>Bengali (Bornona)</_description>
+ <_description>Bengali (India, Bornona)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
- <_description>Bengali (Uni Gitanjali)</_description>
+ <_description>Bengali (India, Uni Gitanjali)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
- <_description>Bengali (Baishakhi Inscript)</_description>
+ <_description>Bengali (India, Baishakhi Inscript)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
@@ -2235,7 +2235,7 @@
<variant>
<configItem>
<name>dvorak</name>
- <_description>English (Cameroon Dvorak)</_description>
+ <_description>Cameroon Multilingual (Dvorak)</_description>
</configItem>
</variant>
</variantList>