aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-01 20:12:35 +0200
committermarha <marha@users.sourceforge.net>2014-10-01 20:12:35 +0200
commit19b4b68b35a047a83bd291ee8debac1adb0e946c (patch)
treed4d4520622ecf73fa0d076dc0bf517a1189b7d9f /xorg-server/xkeyboard-config/rules
parent4e080e0165d18887e2a0fccd7f30cf20fd04b178 (diff)
parent438af0c7d4bf60b408b259c88205ff2193195466 (diff)
downloadvcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.gz
vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.bz2
vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/macros.h xorg-server/dix/registry.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xwin/Makefile.am xorg-server/hw/xwin/glx/.gitignore xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/windisplay.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprefs.c
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in292
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in269
2 files changed, 325 insertions, 236 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 2bda88ba7..2e1e89d6b 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -8,7 +8,9 @@
<name>apl</name>
<_shortDescription>apl</_shortDescription>
<_description>APL keyboard symbols</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -60,7 +62,9 @@
<name>ca</name>
<_shortDescription>fr</_shortDescription>
<_description>French (Canada)</_description>
- <languageList><iso639Id>fra</iso639Id></languageList>
+ <languageList>
+ <iso639Id>fra</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -133,14 +137,18 @@
<name>ir</name>
<_shortDescription>fa</_shortDescription>
<_description>Persian</_description>
- <languageList><iso639Id>per</iso639Id></languageList>
+ <languageList>
+ <iso639Id>per</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>ave</name>
<_description>Avestan</_description>
- <languageList><iso639Id>ave</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ave</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -150,7 +158,9 @@
<name>lt</name>
<_shortDescription>lt</_shortDescription>
<_description>Lithuanian</_description>
- <languageList><iso639Id>lit</iso639Id></languageList>
+ <languageList>
+ <iso639Id>lit</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -210,7 +220,7 @@
<variant>
<configItem>
<name>minuskeydvorakprogr</name>
- <_description>Latvian (programmer US Dvorak, minus variant)</_description>
+ <_description>Latvian (programmer US Dvorak, minus variant)</_description>
</configItem>
</variant>
<variant>
@@ -238,7 +248,9 @@
<name>us</name>
<_shortDescription>en</_shortDescription>
<_description>English (US)</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -264,17 +276,21 @@
<configItem>
<name>crd</name>
<_description>Coeur d'Alene Salish</_description>
- <languageList><iso639Id>crd</iso639Id></languageList>
+ <languageList>
+ <iso639Id>crd</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>cz_sk_de</name>
<_description>Czech Slovak and German (US)</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>cze</iso639Id>
- <iso639Id>slo</iso639Id>
- <iso639Id>ger</iso639Id> </languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>cze</iso639Id>
+ <iso639Id>slo</iso639Id>
+ <iso639Id>ger</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -296,7 +312,9 @@
<name>pl</name>
<_shortDescription>pl</_shortDescription>
<_description>Polish</_description>
- <languageList><iso639Id>pol</iso639Id></languageList>
+ <languageList>
+ <iso639Id>pol</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -324,7 +342,9 @@
<name>ro</name>
<_shortDescription>ro</_shortDescription>
<_description>Romanian</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -356,7 +376,9 @@
<name>rs</name>
<_shortDescription>sr</_shortDescription>
<_description>Serbian</_description>
- <languageList><iso639Id>srp</iso639Id></languageList>
+ <languageList>
+ <iso639Id>srp</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -378,7 +400,9 @@
<configItem>
<name>chu</name>
<_description>Church Slavonic</_description>
- <languageList><iso639Id>chu</iso639Id></languageList>
+ <languageList>
+ <iso639Id>chu</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -386,9 +410,11 @@
<name>ruu</name>
<_shortDescription>ru</_shortDescription>
<_description>Russian (with Ukrainian-Belorussian layout)</_description>
- <languageList><iso639Id>rus</iso639Id>
- <iso639Id>ukr</iso639Id>
- <iso639Id>bel</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rus</iso639Id>
+ <iso639Id>ukr</iso639Id>
+ <iso639Id>bel</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -417,19 +443,23 @@
</variant>
</variantList>
</layout>
- <layout>
+ <layout>
<configItem>
<name>il</name>
<_shortDescription>he</_shortDescription>
<_description>Hebrew</_description>
- <languageList><iso639Id>heb</iso639Id></languageList>
+ <languageList>
+ <iso639Id>heb</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>biblicalSIL</name>
<_description>Hebrew (Biblical, SIL phonetic)</_description>
- <languageList><iso639Id>heb</iso639Id></languageList>
+ <languageList>
+ <iso639Id>heb</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -439,173 +469,173 @@
<name>ara</name>
<_shortDescription>ar</_shortDescription>
<_description>Arabic</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Arabic (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>be</name>
<_shortDescription>be</_shortDescription>
<_description>Belgian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Belgian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>br</name>
<_shortDescription>pt</_shortDescription>
<_description>Portuguese (Brazil)</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Portuguese (Brazil, Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>cz</name>
<_shortDescription>cs</_shortDescription>
<_description>Czech</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Czech (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>dk</name>
<_shortDescription>da</_shortDescription>
<_description>Danish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Danish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>nl</name>
<_shortDescription>nl</_shortDescription>
<_description>Dutch</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Dutch (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>ee</name>
<_shortDescription>et</_shortDescription>
<_description>Estonian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Estonian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>fi</name>
<_shortDescription>fi</_shortDescription>
<_description>Finnish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Finnish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>fr</name>
<_shortDescription>fr</_shortDescription>
<_description>French</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>French (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>gr</name>
<_shortDescription>gr</_shortDescription>
<_description>Greek</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Greek (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>it</name>
<_shortDescription>it</_shortDescription>
<_description>Italian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Italian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>jp</name>
<_shortDescription>ja</_shortDescription>
<_description>Japanese</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
@@ -624,68 +654,68 @@
<_description>Japanese (Sun Type 7 - sun compatible)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>no</name>
<_shortDescription>no</_shortDescription>
<_description>Norwegian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Norwegian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>pt</name>
<_shortDescription>pt</_shortDescription>
<_description>Portuguese</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Portuguese (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>sk</name>
<_shortDescription>sk</_shortDescription>
<_description>Slovak</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Slovak (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>es</name>
<_shortDescription>es</_shortDescription>
<_description>Spanish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Spanish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>se</name>
@@ -712,8 +742,8 @@
<name>ch</name>
<_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6_de</name>
@@ -726,93 +756,93 @@
<_description>French (Switzerland, Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>tr</name>
<_shortDescription>tr</_shortDescription>
<_description>Turkish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Turkish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>ua</name>
<_shortDescription>uk</_shortDescription>
<_description>Ukrainian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Ukrainian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>gb</name>
<_shortDescription>en</_shortDescription>
<_description>English (UK)</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>English (UK, Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>kr</name>
<_shortDescription>ko</_shortDescription>
<_description>Korean</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Korean (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
- <layout>
- <configItem>
- <name>eu</name>
- <!-- Keyboard indicator for European layouts -->
- <_shortDescription>eu</_shortDescription>
- <_description>EurKEY (US based layout with european letters)</_description>
- <languageList>
- <iso639Id>cat</iso639Id>
- <iso639Id>dan</iso639Id>
- <iso639Id>eng</iso639Id>
- <iso639Id>est</iso639Id>
- <iso639Id>fao</iso639Id>
- <iso639Id>fin</iso639Id>
- <iso639Id>ger</iso639Id>
- <iso639Id>gre</iso639Id>
- <iso639Id>gsw</iso639Id>
- <iso639Id>ita</iso639Id>
- <iso639Id>lav</iso639Id>
- <iso639Id>lit</iso639Id>
- <iso639Id>nld</iso639Id>
- <iso639Id>nor</iso639Id>
- <iso639Id>por</iso639Id>
- <iso639Id>spa</iso639Id>
- <iso639Id>swe</iso639Id>
- </languageList>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>eu</name>
+ <!-- Keyboard indicator for European layouts -->
+ <_shortDescription>eu</_shortDescription>
+ <_description>EurKEY (US based layout with european letters)</_description>
+ <languageList>
+ <iso639Id>cat</iso639Id>
+ <iso639Id>dan</iso639Id>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>est</iso639Id>
+ <iso639Id>fao</iso639Id>
+ <iso639Id>fin</iso639Id>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>gre</iso639Id>
+ <iso639Id>gsw</iso639Id>
+ <iso639Id>ita</iso639Id>
+ <iso639Id>lav</iso639Id>
+ <iso639Id>lit</iso639Id>
+ <iso639Id>nld</iso639Id>
+ <iso639Id>nor</iso639Id>
+ <iso639Id>por</iso639Id>
+ <iso639Id>spa</iso639Id>
+ <iso639Id>swe</iso639Id>
+ </languageList>
</configItem>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index a7aa5de29..3fd0ce427 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -856,21 +856,21 @@
</model>
<model>
<configItem>
- <name>microsoftmult</name>
+ <name>microsoftmult</name>
<_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
</model>
<model>
<configItem>
- <name>microsoftelite</name>
+ <name>microsoftelite</name>
<_description>Microsoft Natural Keyboard Elite</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
</model>
<model>
<configItem>
- <name>microsoftccurve2k</name>
+ <name>microsoftccurve2k</name>
<_description>Microsoft Comfort Curve Keyboard 2000</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
@@ -1406,9 +1406,11 @@
<configItem>
<name>altgr-intl</name>
<_description>English (international AltGr dead keys)</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>fra</iso639Id>
- <iso639Id>ger</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>fra</iso639Id>
+ <iso639Id>ger</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -1421,11 +1423,13 @@
<configItem>
<name>hbs</name>
<_description>Serbo-Croatian (US)</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>bos</iso639Id>
- <iso639Id>hbs</iso639Id>
- <iso639Id>hrv</iso639Id>
- <iso639Id>srp</iso639Id> </languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>bos</iso639Id>
+ <iso639Id>hbs</iso639Id>
+ <iso639Id>hrv</iso639Id>
+ <iso639Id>srp</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -1717,9 +1721,11 @@
<!-- Keyboard indicator for Belgian layouts -->
<_shortDescription>be</_shortDescription>
<_description>Belgian</_description>
- <languageList><iso639Id>ger</iso639Id>
- <iso639Id>nld</iso639Id>
- <iso639Id>fra</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>nld</iso639Id>
+ <iso639Id>fra</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -1819,35 +1825,45 @@
<configItem>
<name>ben_baishakhi</name>
<_description>Bangla (India, Baishakhi)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
<_description>Bangla (India, Bornona)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
- </configItem>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
+ </configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
<_description>Bangla (India, Uni Gitanjali)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
<_description>Bangla (India, Baishakhi Inscript)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>eeyek</name>
<_description>Manipuri (Eeyek)</_description>
- <languageList><iso639Id>mni</iso639Id></languageList>
+ <languageList>
+ <iso639Id>mni</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -1933,7 +1949,9 @@
<!-- Keyboard indicator for Malayalam layouts -->
<_shortDescription>ml</_shortDescription>
<_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
- <languageList><iso639Id>mal</iso639Id></languageList>
+ <languageList>
+ <iso639Id>mal</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -2326,14 +2344,18 @@
<!-- Keyboard indicator for Cameroon layouts -->
<_shortDescription>cm</_shortDescription>
<_description>English (Cameroon)</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>french</name>
<_description>French (Cameroon)</_description>
- <languageList><iso639Id>fra</iso639Id></languageList>
+ <languageList>
+ <iso639Id>fra</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -2817,8 +2839,10 @@
<!-- Keyboard indicator for Iraqi layouts -->
<_shortDescription>ar</_shortDescription>
<_description>Iraqi</_description>
- <languageList><iso639Id>ara</iso639Id>
- <iso639Id>kur</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ara</iso639Id>
+ <iso639Id>kur</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -2919,7 +2943,9 @@
<configItem>
<name>smi</name>
<_description>Northern Saami (Finland)</_description>
- <languageList><iso639Id>sme</iso639Id></languageList>
+ <languageList>
+ <iso639Id>sme</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -3232,14 +3258,18 @@
<configItem>
<name>ro</name>
<_description>Romanian (Germany)</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ro_nodeadkeys</name>
<_description>Romanian (Germany, eliminate dead keys)</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -3705,16 +3735,20 @@
<!-- Keyboard indicator for Russian layouts -->
<_shortDescription>ru</_shortDescription>
<_description>Russian (Kazakhstan, with Kazakh)</_description>
- <languageList><iso639Id>kaz</iso639Id>
- <iso639Id>rus</iso639Id></languageList>
+ <languageList>
+ <iso639Id>kaz</iso639Id>
+ <iso639Id>rus</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>kazrus</name>
<_description>Kazakh (with Russian)</_description>
- <languageList><iso639Id>kaz</iso639Id>
- <iso639Id>rus</iso639Id></languageList>
+ <languageList>
+ <iso639Id>kaz</iso639Id>
+ <iso639Id>rus</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -3734,7 +3768,8 @@
<configItem>
<name>stea</name>
<_description>Lao (STEA proposed standard layout)</_description>
- <languageList><iso639Id>lao</iso639Id>
+ <languageList>
+ <iso639Id>lao</iso639Id>
</languageList>
</configItem>
</variant>
@@ -4064,7 +4099,7 @@
<_description>Norwegian (Macintosh, eliminate dead keys)</_description>
</configItem>
</variant>
- <variant>
+ <variant>
<configItem>
<name>colemak</name>
<_description>Norwegian (Colemak)</_description>
@@ -4126,7 +4161,9 @@
<configItem>
<name>szl</name>
<_description>Silesian</_description>
- <languageList><iso639Id>szl</iso639Id></languageList>
+ <languageList>
+ <iso639Id>szl</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -4387,8 +4424,10 @@
<configItem>
<name>srp</name>
<_description>Serbian (Russia)</_description>
- <languageList><iso639Id>rus</iso639Id>
- <iso639Id>srp</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rus</iso639Id>
+ <iso639Id>srp</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -4668,7 +4707,9 @@
<configItem>
<name>swl</name>
<_description>Swedish Sign Language</_description>
- <languageList><iso639Id>swl</iso639Id></languageList>
+ <languageList>
+ <iso639Id>swl</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -4679,8 +4720,10 @@
<!-- Keyboard indicator for German layouts -->
<_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
- <languageList><iso639Id>ger</iso639Id>
- <iso639Id>gsw</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>gsw</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -5578,33 +5621,37 @@
<!-- Keyboard indicator for Filipino layouts -->
<_shortDescription>ph</_shortDescription>
<_description>Filipino</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>qwerty-bay</name>
<_description>Filipino (QWERTY Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5617,16 +5664,18 @@
<configItem>
<name>capewell-dvorak-bay</name>
<_description>Filipino (Capewell-Dvorak Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5639,16 +5688,18 @@
<configItem>
<name>capewell-qwerf2k6-bay</name>
<_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5661,16 +5712,18 @@
<configItem>
<name>colemak-bay</name>
<_description>Filipino (Colemak Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5683,16 +5736,18 @@
<configItem>
<name>dvorak-bay</name>
<_description>Filipino (Dvorak Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -5702,7 +5757,9 @@
<name>md</name>
<_shortDescription>md</_shortDescription>
<_description>Moldavian</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -5710,7 +5767,9 @@
<name>gag</name>
<_shortDescription>gag</_shortDescription>
<_description>Moldavian (Gagauz)</_description>
- <languageList><iso639Id>gag</iso639Id></languageList>
+ <languageList>
+ <iso639Id>gag</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -5848,7 +5907,7 @@
<name>grp:rctrl_rshift_toggle</name>
<_description>Right Ctrl+Right Shift</_description>
</configItem>
- </option>
+ </option>
<option>
<configItem>
<name>grp:ctrl_alt_toggle</name>
@@ -6263,7 +6322,7 @@
</option>
</group>
<group allowMultipleSelection="false">
- <!-- Caps Lock tweaks.
+ <!-- Caps Lock tweaks.
"Internal" capitalization means capitalization using some internal tables.
Otherwise "as Shift" - means using next group. -->
<configItem>