From 0b9b391c5a7acb31e5d8061169649043a38d6d0e Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 28 Mar 2011 10:22:02 +0000
Subject: xserver xkeyboard-config mesa git update 28 Mar 2011

---
 xorg-server/xkeyboard-config/rules/base.xml.in | 1228 +++++++++++++-----------
 1 file changed, 658 insertions(+), 570 deletions(-)

(limited to 'xorg-server/xkeyboard-config/rules')

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 2d3df0126..429eadd12 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1243,8 +1243,8 @@
     <layout>
       <configItem>
         <name>us</name>
-        <_shortDescription>USA</_shortDescription>
-        <_description>USA</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (US)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -1253,7 +1253,8 @@
         <variant>
           <configItem>
             <name>chr</name>
-            <_description>USA - Cherokee</_description>
+            <_shortDescription>chr</_shortDescription>
+            <_description>Cherokee</_description>
             <languageList>
               <iso639Id>chr</iso639Id>
             </languageList>
@@ -1262,73 +1263,74 @@
         <variant>
           <configItem>
             <name>euro</name>
-            <_description>USA - With EuroSign on 5</_description>
+            <_description>English (US, with euro on 5)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>USA - International (with dead keys)</_description>
+            <_description>English (US, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt-intl</name>
-            <_description>USA - Alternative international</_description>
+            <_description>English (US, alternative international)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>USA - Colemak</_description>
+            <_description>English (Colemak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>USA - Dvorak</_description>
+            <_description>English (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>USA - Dvorak international (with dead keys)</_description>
+            <_description>English (Dvorak international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-alt-intl</name>
-            <_description>USA - Dvorak alternative international (no dead keys)</_description>
+            <_description>English (Dvorak alternative international no dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-l</name>
-            <_description>USA - Left handed Dvorak</_description>
+            <_description>English (left handed Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-r</name>
-            <_description>USA - Right handed Dvorak</_description>
+            <_description>English (right handed Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-classic</name>
-            <_description>USA - Classic Dvorak</_description>
+            <_description>English (classic Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>USA - Programmer Dvorak</_description>
+            <_description>English (programmer Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>USA - Russian phonetic</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (US, phonetic)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -1337,13 +1339,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>USA - Macintosh</_description>
+            <_description>English (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>altgr-intl</name>
-            <_description>USA - International (AltGr dead keys)</_description>
+            <_description>English (international AltGr dead keys)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>fra</iso639Id>
                           <iso639Id>ger</iso639Id></languageList>
@@ -1352,13 +1354,13 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>USA - Layout toggle on multiply/divide key</_description>
+            <_description>English (layout toggle on multiply/divide key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hbs</name>
-            <_description>USA - Serbo-Croatian</_description>
+            <_description>Serbo-Croatian (US)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>bos</iso639Id>
                           <iso639Id>hbs</iso639Id>
@@ -1371,8 +1373,8 @@
     <layout>
       <configItem>
         <name>ad</name>
-        <_shortDescription>And</_shortDescription>
-        <_description>Andorra</_description>
+        <_shortDescription>ca</_shortDescription>
+        <_description>Catalan</_description>
         <languageList>
           <iso639Id>cat</iso639Id>
         </languageList>
@@ -1383,13 +1385,14 @@
       <configItem>
         <name>af</name>
         <_shortDescription>Afg</_shortDescription>
-        <_description>Afghanistan</_description>
+        <_description>Afghani</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ps</name>
-            <_description>Afghanistan - Pashto</_description>
+            <_shortDescription>ps</_shortDescription>
+            <_description>Pashto</_description>
             <languageList>
               <iso639Id>pus</iso639Id>
             </languageList>
@@ -1398,7 +1401,8 @@
         <variant>
           <configItem>
             <name>uz</name>
-            <_description>Afghanistan - Southern Uzbek</_description>
+            <_shortDescription>uz</_shortDescription>
+            <_description>Uzbek (Afghanistan)</_description>
             <languageList>
               <iso639Id>uzb</iso639Id>
             </languageList>
@@ -1407,7 +1411,8 @@
         <variant>
           <configItem>
             <name>olpc-ps</name>
-            <_description>Afghanistan - OLPC Pashto</_description>
+            <_shortDescription>ps</_shortDescription>
+            <_description>Pashto (Afghanistan, OLPC)</_description>
             <languageList>
               <iso639Id>pus</iso639Id>
             </languageList>
@@ -1416,13 +1421,15 @@
         <variant>
           <configItem>
             <name>fa-olpc</name>
-            <_description>Afghanistan - OLPC Dari</_description>
+            <_shortDescription>fa</_shortDescription>
+            <_description>Persian (Afghanistan, Dari OLPC)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uz-olpc</name>
-            <_description>Afghanistan - OLPC Southern Uzbek</_description>
+            <_shortDescription>uz</_shortDescription>
+            <_description>Uzbek (Afghanistan, OLPC)</_description>
             <languageList>
               <iso639Id>uzb</iso639Id>
             </languageList>
@@ -1433,7 +1440,7 @@
     <layout>
       <configItem>
         <name>ara</name>
-        <_shortDescription>Ara</_shortDescription>
+        <_shortDescription>ar</_shortDescription>
         <_description>Arabic</_description>
         <countryList>
           <iso3166Id>AE</iso3166Id>
@@ -1464,37 +1471,37 @@
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>Arabic - azerty</_description>
+            <_description>Arabic (azerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>azerty_digits</name>
-            <_description>Arabic - azerty/digits</_description>
+            <_description>Arabic (azerty/digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>digits</name>
-            <_description>Arabic - digits</_description>
+            <_description>Arabic (digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Arabic - qwerty</_description>
+            <_description>Arabic (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_digits</name>
-            <_description>Arabic - qwerty/digits</_description>
+            <_description>Arabic (qwerty/digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>buckwalter</name>
-            <_description>Arabic - Buckwalter</_description>
+            <_description>Arabic (Buckwalter)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1502,8 +1509,8 @@
     <layout>
       <configItem>
         <name>al</name>
-        <_shortDescription>Alb</_shortDescription>
-        <_description>Albania</_description>
+        <_shortDescription>sq</_shortDescription>
+        <_description>Albanian</_description>
         <languageList>
           <iso639Id>alb</iso639Id>
         </languageList>
@@ -1513,8 +1520,8 @@
     <layout>
       <configItem>
         <name>am</name>
-        <_shortDescription>Arm</_shortDescription>
-        <_description>Armenia</_description>
+        <_shortDescription>hy</_shortDescription>
+        <_description>Armenian</_description>
         <languageList>
           <iso639Id>hye</iso639Id>
         </languageList>
@@ -1523,31 +1530,31 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Armenia - Phonetic</_description>
+            <_description>Armenian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic-alt</name>
-            <_description>Armenia - Alternative Phonetic</_description>
+            <_description>Armenian (alternative phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern</name>
-            <_description>Armenia - Eastern</_description>
+            <_description>Armenian (eastern)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>western</name>
-            <_description>Armenia - Western</_description>
+            <_description>Armenian (western)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern-alt</name>
-            <_description>Armenia - Alternative Eastern</_description>
+            <_description>Armenian (alternative eastern)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1555,8 +1562,8 @@
     <layout>
       <configItem>
         <name>at</name>
-        <_shortDescription>Aut</_shortDescription>
-        <_description>Austria</_description>
+        <_shortDescription>de</_shortDescription>
+        <_description>German (Austria)</_description>
         <languageList>
           <iso639Id>ger</iso639Id>
         </languageList>
@@ -1565,19 +1572,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Austria - Eliminate dead keys</_description>
+            <_description>German (Austria, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Austria - Sun dead keys</_description>
+            <_description>German (Austria, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Austria - Macintosh</_description>
+            <_description>German (Austria, Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1585,8 +1592,8 @@
     <layout>
       <configItem>
         <name>az</name>
-        <_shortDescription>Aze</_shortDescription>
-        <_description>Azerbaijan</_description>
+        <_shortDescription>az</_shortDescription>
+        <_description>Azerbaijani</_description>
         <languageList>
           <iso639Id>aze</iso639Id>
         </languageList>
@@ -1595,7 +1602,7 @@
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Azerbaijan - Cyrillic</_description>
+            <_description>Azerbaijan (Cyrillic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1603,8 +1610,8 @@
     <layout>
       <configItem>
         <name>by</name>
-        <_shortDescription>Blr</_shortDescription>
-        <_description>Belarus</_description>
+        <_shortDescription>be</_shortDescription>
+        <_description>Belarusian</_description>
         <languageList>
           <iso639Id>bel</iso639Id>
         </languageList>
@@ -1613,13 +1620,13 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Belarus - Legacy</_description>
+            <_description>Belarusian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Belarus - Latin</_description>
+            <_description>Belarusian (Latin)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1627,8 +1634,8 @@
     <layout>
       <configItem>
         <name>be</name>
-        <_shortDescription>Bel</_shortDescription>
-        <_description>Belgium</_description>
+        <_shortDescription>be</_shortDescription>
+        <_description>Belgian</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>nld</iso639Id>
                       <iso639Id>fra</iso639Id></languageList>
@@ -1637,43 +1644,43 @@
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>Belgium - Alternative</_description>
+            <_description>Belgian (alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Belgium - Alternative, latin-9 only</_description>
+            <_description>Belgian (alternative, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>Belgium - Alternative, Sun dead keys</_description>
+            <_description>Belgian (alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>iso-alternate</name>
-            <_description>Belgium - ISO Alternate</_description>
+            <_description>Belgian (ISO alternate)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Belgium - Eliminate dead keys</_description>
+            <_description>Belgian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Belgium - Sun dead keys</_description>
+            <_description>Belgian (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>wang</name>
-            <_description>Belgium - Wang model 724 azerty</_description>
+            <_description>Belgian (Wang model 724 azerty)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1681,8 +1688,8 @@
     <layout>
       <configItem>
         <name>bd</name>
-        <_shortDescription>Bgd</_shortDescription>
-        <_description>Bangladesh</_description>
+        <_shortDescription>bn</_shortDescription>
+        <_description>Bengali</_description>
         <languageList>
           <iso639Id>ben</iso639Id>
         </languageList>
@@ -1691,7 +1698,7 @@
         <variant>
           <configItem>
             <name>probhat</name>
-            <_description>Bangladesh - Probhat</_description>
+            <_description>Bengali (Probhat)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1699,14 +1706,15 @@
     <layout>
       <configItem>
         <name>in</name>
-        <_shortDescription>Ind</_shortDescription>
-        <_description>India</_description>
+        <_shortDescription>in</_shortDescription>
+        <_description>Indian</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ben</name>
-            <_description>India - Bengali</_description>
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bengali</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1715,7 +1723,8 @@
         <variant>
           <configItem>
             <name>ben_probhat</name>
-            <_description>India - Bengali Probhat</_description>
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bengali (Probhat)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1724,7 +1733,8 @@
         <variant>
           <configItem>
             <name>guj</name>
-            <_description>India - Gujarati</_description>
+            <_shortDescription>gu</_shortDescription>
+            <_description>Gujarati</_description>
             <languageList>
               <iso639Id>guj</iso639Id>
             </languageList>
@@ -1733,7 +1743,8 @@
         <variant>
           <configItem>
             <name>guru</name>
-            <_description>India - Gurmukhi</_description>
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi)</_description>
             <languageList>
               <iso639Id>pan</iso639Id>
             </languageList>
@@ -1742,7 +1753,8 @@
         <variant>
           <configItem>
             <name>jhelum</name>
-            <_description>India - Gurmukhi Jhelum</_description>
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi Jhelum)</_description>
             <languageList>
               <iso639Id>pan</iso639Id>
             </languageList>
@@ -1751,7 +1763,8 @@
         <variant>
           <configItem>
             <name>kan</name>
-            <_description>India - Kannada</_description>
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada</_description>
             <languageList>
               <iso639Id>kan</iso639Id>
             </languageList>
@@ -1760,7 +1773,8 @@
         <variant>
           <configItem>
             <name>mal</name>
-            <_description>India - Malayalam</_description>
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam</_description>
             <languageList>
               <iso639Id>mal</iso639Id>
             </languageList>
@@ -1769,7 +1783,8 @@
         <variant>
           <configItem>
             <name>mal_lalitha</name>
-            <_description>India - Malayalam Lalitha</_description>
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (Lalitha)</_description>
             <languageList>
               <iso639Id>mal</iso639Id>
             </languageList>
@@ -1777,15 +1792,17 @@
         </variant>
         <variant>
           <configItem>
-             <name>mal_enhanced</name>
-             <_description>India - Malayalam enhanced Inscript with Rupee Sign</_description>
-             <languageList><iso639Id>mal</iso639Id></languageList>
+            <name>mal_enhanced</name>
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
           </configItem>
          </variant>
          <variant>
            <configItem>
             <name>ori</name>
-            <_description>India - Oriya</_description>
+            <_shortDescription>or</_shortDescription>
+            <_description> Oriya</_description>
             <languageList>
               <iso639Id>ori</iso639Id>
             </languageList>
@@ -1794,7 +1811,8 @@
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>India - Tamil Unicode</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Unicode)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1803,7 +1821,8 @@
         <variant>
           <configItem>
             <name>tam_keyboard_with_numerals</name>
-            <_description>India - Tamil Keyboard with Numerals</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (keyboard with numerals)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1812,7 +1831,8 @@
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>India - Tamil TAB Typewriter</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TAB typewriter)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1821,7 +1841,8 @@
         <variant>
           <configItem>
             <name>tam_TSCII</name>
-            <_description>India - Tamil TSCII Typewriter</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TSCII typewriter)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1830,7 +1851,8 @@
         <variant>
           <configItem>
             <name>tam</name>
-            <_description>India - Tamil</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1839,7 +1861,8 @@
         <variant>
           <configItem>
             <name>tel</name>
-            <_description>India - Telugu</_description>
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu</_description>
             <languageList>
               <iso639Id>tel</iso639Id>
             </languageList>
@@ -1848,7 +1871,8 @@
         <variant>
           <configItem>
             <name>urd-phonetic</name>
-            <_description>India - Urdu, Phonetic</_description>
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (phonetic)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -1857,7 +1881,8 @@
         <variant>
           <configItem>
             <name>urd-phonetic3</name>
-            <_description>India - Urdu, Alternative phonetic</_description>
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (alternative phonetic)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -1866,7 +1891,8 @@
         <variant>
           <configItem>
             <name>urd-winkeys</name>
-            <_description>India - Urdu, Winkeys</_description>
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (WinKeys)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -1875,7 +1901,8 @@
         <variant>
           <configItem>
             <name>bolnagri</name>
-            <_description>India - Hindi Bolnagri</_description>
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Bolnagri)</_description>
             <languageList>
               <iso639Id>hin</iso639Id>
             </languageList>
@@ -1884,7 +1911,8 @@
         <variant>
           <configItem>
             <name>hin-wx</name>
-            <_description>India - Hindi Wx</_description>
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Wx)</_description>
             <languageList>
               <iso639Id>hin</iso639Id>
             </languageList>
@@ -1893,7 +1921,8 @@
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>India - English with RupeeSign</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (India, with RupeeSign)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
             </languageList>
@@ -1904,8 +1933,8 @@
     <layout>
       <configItem>
         <name>ba</name>
-        <_shortDescription>Bih</_shortDescription>
-        <_description>Bosnia and Herzegovina</_description>
+        <_shortDescription>bs</_shortDescription>
+        <_description>Bosnian</_description>
         <languageList>
           <iso639Id>bos</iso639Id>
         </languageList>
@@ -1914,25 +1943,25 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Bosnia and Herzegovina -  Use guillemets for quotes</_description>
+            <_description>Bosnian (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Bosnia and Herzegovina - Use Bosnian digraphs</_description>
+            <_description>Bosnian (use Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>Bosnia and Herzegovina - US keyboard with Bosnian digraphs</_description>
+            <_description>Bosnian (US keyboard with Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Bosnia and Herzegovina - US keyboard with Bosnian letters</_description>
+            <_description>Bosnian (US keyboard with Bosnian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1940,8 +1969,8 @@
     <layout>
       <configItem>
         <name>br</name>
-        <_shortDescription>Bra</_shortDescription>
-        <_description>Brazil</_description>
+        <_shortDescription>pt</_shortDescription>
+        <_description>Portuguese (Brazil)</_description>
         <languageList>
           <iso639Id>por</iso639Id>
         </languageList>
@@ -1950,31 +1979,31 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Brazil - Eliminate dead keys</_description>
+            <_description>Portuguese (Brazil, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Brazil - Dvorak</_description>
+            <_description>Portuguese (Brazil, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Brazil - Nativo</_description>
+            <_description>Portuguese (Brazil, nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Brazil - Nativo for USA keyboards</_description>
+            <_description>Portuguese (Brazil, nativo for USA keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Brazil - Nativo for Esperanto</_description>
+            <_description>Portuguese (Brazil, nativo for Esperanto)</_description>
             <languageList>
               <iso639Id>epo</iso639Id>
             </languageList>
@@ -1985,8 +2014,8 @@
     <layout>
       <configItem>
         <name>bg</name>
-        <_shortDescription>Bgr</_shortDescription>
-        <_description>Bulgaria</_description>
+        <_shortDescription>bg</_shortDescription>
+        <_description>Bulgarian</_description>
         <languageList>
           <iso639Id>bul</iso639Id>
         </languageList>
@@ -1995,13 +2024,13 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Bulgaria - Traditional phonetic</_description>
+            <_description>Bulgarian (traditional phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bas_phonetic</name>
-            <_description>Bulgaria - New phonetic</_description>
+            <_description>Bulgarian (new phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2009,13 +2038,15 @@
     <layout>
       <configItem>
         <name>ma</name>
-        <_description>Morocco</_description>
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Morocco)</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>french</name>
-            <_description>Morocco - French</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Morocco)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -2024,7 +2055,8 @@
         <variant>
           <configItem>
             <name>tifinagh</name>
-            <_description>Morocco - Tifinagh</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2033,7 +2065,8 @@
         <variant>
           <configItem>
             <name>tifinagh-alt</name>
-            <_description>Morocco - Tifinagh alternative</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh alternative)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2042,7 +2075,8 @@
         <variant>
           <configItem>
             <name>tifinagh-alt-phonetic</name>
-            <_description>Morocco - Tifinagh alternative phonetic</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh alternative phonetic)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2051,7 +2085,8 @@
         <variant>
           <configItem>
             <name>tifinagh-extended</name>
-            <_description>Morocco - Tifinagh extended</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh extended)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2060,7 +2095,8 @@
         <variant>
           <configItem>
             <name>tifinagh-phonetic</name>
-            <_description>Morocco - Tifinagh phonetic</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh phonetic)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2069,7 +2105,8 @@
         <variant>
           <configItem>
             <name>tifinagh-extended-phonetic</name>
-            <_description>Morocco - Tifinagh extended phonetic</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh extended phonetic)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2080,8 +2117,8 @@
     <layout>
       <configItem>
         <name>mm</name>
-        <_shortDescription>Mmr</_shortDescription>
-        <_description>Myanmar</_description>
+        <_shortDescription>my</_shortDescription>
+        <_description>Burmese</_description>
         <languageList>
           <iso639Id>mya</iso639Id>
         </languageList>
@@ -2091,8 +2128,8 @@
     <layout>
       <configItem>
         <name>ca</name>
-        <_shortDescription>Can</_shortDescription>
-        <_description>Canada</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Canada)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2101,37 +2138,40 @@
         <variant>
           <configItem>
             <name>fr-dvorak</name>
-            <_description>Canada - French Dvorak</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Canada, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr-legacy</name>
-            <_description>Canada - French (legacy)</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Canada, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multix</name>
-            <_description>Canada - Multilingual</_description>
+            <_description>Canadian Multilingual</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi</name>
-            <_description>Canada - Multilingual, first part</_description>
+            <_description>Canadian Multilingual (first part)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi-2gr</name>
-            <_description>Canada - Multilingual, second part</_description>
+            <_description>Canadian Multilingual (second part)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ike</name>
-            <_description>Canada - Inuktitut</_description>
+            <_shortDescription>ike</_shortDescription>
+            <_description>Inuktitut</_description>
             <languageList>
               <iso639Id>iku</iso639Id>
             </languageList>
@@ -2140,19 +2180,22 @@
         <variant>
           <configItem>
             <name>shs</name>
-            <_description>Canada - Secwepemctsin</_description>
+            <_shortDescription>shs</_shortDescription>
+            <_description>Secwepemctsin</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kut</name>
-            <_description>Canada - Ktunaxa</_description>
+            <_shortDescription>kut</_shortDescription>
+            <_description>Kutenai</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>Canada - English</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Canada)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
             </languageList>
@@ -2163,8 +2206,8 @@
     <layout>
       <configItem>
         <name>cd</name>
-        <_shortDescription>COD</_shortDescription>
-        <_description>Congo, Democratic Republic of the</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Democratic Republic of the Congo)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2174,8 +2217,8 @@
     <layout>
       <configItem>
         <name>cn</name>
-        <_shortDescription>Chn</_shortDescription>
-        <_description>China</_description>
+        <_shortDescription>zh</_shortDescription>
+        <_description>Chinese</_description>
         <languageList>
           <iso639Id>chi</iso639Id>
         </languageList>
@@ -2184,7 +2227,7 @@
         <variant>
           <configItem>
             <name>tib</name>
-            <_description>China - Tibetan</_description>
+            <_description>Chinese (Tibetan)</_description>
             <languageList>
               <iso639Id>tib</iso639Id>
             </languageList>
@@ -2193,7 +2236,7 @@
         <variant>
           <configItem>
             <name>tib_asciinum</name>
-            <_description>China - Tibetan (with ASCII numerals)</_description>
+            <_description>Chinese (Tibetan with ASCII numerals)</_description>
             <languageList>
               <iso639Id>tib</iso639Id>
             </languageList>
@@ -2202,7 +2245,7 @@
         <variant>
           <configItem>
             <name>uig</name>
-            <_description>China - Uyghur</_description>
+            <_description>Chinese (Uyghur)</_description>
             <languageList>
               <iso639Id>uig</iso639Id>
             </languageList>
@@ -2213,8 +2256,8 @@
     <layout>
       <configItem>
         <name>hr</name>
-        <_shortDescription>Hrv</_shortDescription>
-        <_description>Croatia</_description>
+        <_shortDescription>hr</_shortDescription>
+        <_description>Croatian</_description>
         <languageList>
           <iso639Id>scr</iso639Id>
         </languageList>
@@ -2223,25 +2266,25 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Croatia - Use guillemets for quotes</_description>
+            <_description>Croatian (Use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Croatia - Use Croatian digraphs</_description>
+            <_description>Croatian (Use Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>Croatia - US keyboard with Croatian digraphs</_description>
+            <_description>Croatian (US keyboard with Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Croatia - US keyboard with Croatian letters</_description>
+            <_description>Croatian (US keyboard with Croatian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2249,8 +2292,8 @@
     <layout>
       <configItem>
         <name>cz</name>
-        <_shortDescription>Cze</_shortDescription>
-        <_description>Czechia</_description>
+        <_shortDescription>cs</_shortDescription>
+        <_description>Czech</_description>
         <languageList>
           <iso639Id>cze</iso639Id>
         </languageList>
@@ -2259,31 +2302,31 @@
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Czechia - With &lt;\|&gt; key</_description>
+            <_description>Czech (With &lt;\|&gt; key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Czechia - qwerty</_description>
+            <_description>Czech (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>Czechia - qwerty, extended Backslash</_description>
+            <_description>Czech (qwerty, extended Backslash)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ucw</name>
-            <_description>Czechia - UCW layout (accented letters only)</_description>
+            <_description>Czech (UCW layout accented letters only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-ucw</name>
-            <_description>Czechia - US Dvorak with CZ UCW support</_description>
+            <_description>Czech (US Dvorak with CZ UCW support)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2291,8 +2334,8 @@
     <layout>
       <configItem>
         <name>dk</name>
-        <_shortDescription>Dnk</_shortDescription>
-        <_description>Denmark</_description>
+        <_shortDescription>da</_shortDescription>
+        <_description>Danish</_description>
         <languageList>
           <iso639Id>dan</iso639Id>
         </languageList>
@@ -2301,25 +2344,25 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Denmark - Eliminate dead keys</_description>
+            <_description>Danish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Denmark - Macintosh</_description>
+            <_description>Danish (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Denmark - Macintosh, eliminate dead keys</_description>
+            <_description>Danish (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Denmark - Dvorak</_description>
+            <_description>Danish (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2327,8 +2370,8 @@
     <layout>
       <configItem>
         <name>nl</name>
-        <_shortDescription>Nld</_shortDescription>
-        <_description>Netherlands</_description>
+        <_shortDescription>nl</_shortDescription>
+        <_description>Dutch</_description>
         <languageList>
           <iso639Id>nld</iso639Id>
         </languageList>
@@ -2337,19 +2380,19 @@
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Netherlands - Sun dead keys</_description>
+            <_description>Dutch (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Netherlands - Macintosh</_description>
+            <_description>Dutch (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Netherlands - Standard</_description>
+            <_description>Dutch (standard)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2357,8 +2400,8 @@
     <layout>
       <configItem>
         <name>bt</name>
-        <_shortDescription>Btn</_shortDescription>
-        <_description>Bhutan</_description>
+        <_shortDescription>dz</_shortDescription>
+        <_description>Dzongkha</_description>
         <languageList>
           <iso639Id>dzo</iso639Id>
         </languageList>
@@ -2367,8 +2410,8 @@
     <layout>
       <configItem>
         <name>ee</name>
-        <_shortDescription>Est</_shortDescription>
-        <_description>Estonia</_description>
+        <_shortDescription>et</_shortDescription>
+        <_description>Estonian</_description>
         <languageList>
           <iso639Id>est</iso639Id>
         </languageList>
@@ -2377,19 +2420,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Estonia - Eliminate dead keys</_description>
+            <_description>Estonian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Estonia - Dvorak</_description>
+            <_description>Estonian (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Estonia - US keyboard with Estonian letters</_description>
+            <_description>Estonian (US keyboard with Estonian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2397,8 +2440,8 @@
     <layout>
       <configItem>
         <name>ir</name>
-        <_shortDescription>Irn</_shortDescription>
-        <_description>Iran</_description>
+        <_shortDescription>fa</_shortDescription>
+        <_description>Persian</_description>
         <languageList>
           <iso639Id>per</iso639Id>
         </languageList>
@@ -2407,13 +2450,14 @@
         <variant>
           <configItem>
             <name>pes_keypad</name>
-            <_description>Iran - Persian, with Persian Keypad</_description>
+            <_description>Persian (with Persian Keypad)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Iran - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2422,7 +2466,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Iran - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2431,7 +2476,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Iran - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, latin alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2440,7 +2486,8 @@
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Iran - Kurdish, Arabic-Latin</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Arabic-Latin)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2451,8 +2498,8 @@
     <layout>
       <configItem>
         <name>iq</name>
-        <_shortDescription>Irq</_shortDescription>
-        <_description>Iraq</_description>
+        <_shortDescription>irq</_shortDescription>
+        <_description>Iraqi</_description>
         <languageList><iso639Id>ara</iso639Id>
                       <iso639Id>kur</iso639Id></languageList>
       </configItem>
@@ -2460,7 +2507,8 @@
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Iraq - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2469,7 +2517,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Iraq - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2478,7 +2527,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Iraq - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2487,7 +2537,8 @@
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Iraq - Kurdish, Arabic-Latin</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Arabic-Latin)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2498,8 +2549,8 @@
     <layout>
       <configItem>
         <name>fo</name>
-        <_shortDescription>Fro</_shortDescription>
-        <_description>Faroe Islands</_description>
+        <_shortDescription>fo</_shortDescription>
+        <_description>Faroese</_description>
         <languageList>
           <iso639Id>fao</iso639Id>
         </languageList>
@@ -2508,7 +2559,7 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Faroe Islands - Eliminate dead keys</_description>
+            <_description>Faroese (eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2516,8 +2567,8 @@
     <layout>
       <configItem>
         <name>fi</name>
-        <_shortDescription>Fin</_shortDescription>
-        <_description>Finland</_description>
+        <_shortDescription>fi</_shortDescription>
+        <_description>Finnish</_description>
         <languageList>
           <iso639Id>fin</iso639Id>
         </languageList>
@@ -2526,19 +2577,19 @@
         <variant>
           <configItem>
             <name>classic</name>
-            <_description>Finland - Classic</_description>
+            <_description>Finnish (classic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Finland - Classic, eliminate dead keys</_description>
+            <_description>Finnish (classic, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Finland - Northern Saami</_description>
+            <_description>Finnish (northern Saami)</_description>
             <languageList><iso639Id>smi</iso639Id>
                           <iso639Id>sme</iso639Id></languageList>
           </configItem>
@@ -2546,7 +2597,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Finland - Macintosh</_description>
+            <_description>Finnish (Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2554,8 +2605,8 @@
     <layout>
       <configItem>
         <name>fr</name>
-        <_shortDescription>Fra</_shortDescription>
-        <_description>France</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2564,91 +2615,91 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>France - Eliminate dead keys</_description>
+            <_description>French (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>France - Sun dead keys</_description>
+            <_description>French (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>France - Alternative</_description>
+            <_description>French (alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>France - Alternative, latin-9 only</_description>
+            <_description>French (alternative, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_nodeadkeys</name>
-            <_description>France - Alternative, eliminate dead keys</_description>
+            <_description>French (alternative, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>France - Alternative, Sun dead keys</_description>
+            <_description>French (alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9</name>
-            <_description>France - (Legacy) Alternative</_description>
+            <_description>French (legacy alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_nodeadkeys</name>
-            <_description>France - (Legacy) Alternative, eliminate dead keys</_description>
+            <_description>French (legacy, alternative, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_sundeadkeys</name>
-            <_description>France - (Legacy) Alternative, Sun dead keys</_description>
+            <_description>French (legacy, alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo</name>
-            <_description>France - Bepo, ergonomic, Dvorak way</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo_latin9</name>
-            <_description>France - Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>France - Dvorak</_description>
+            <_description>French (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>France - Macintosh</_description>
+            <_description>French (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bre</name>
-            <_description>France - Breton</_description>
+            <_description>French (Breton)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oci</name>
-            <_description>France - Occitan</_description>
+            <_description>French (Occitan)</_description>
             <languageList>
               <iso639Id>oci</iso639Id>
             </languageList>
@@ -2657,7 +2708,7 @@
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>France - Georgian AZERTY Tskapo</_description>
+            <_description>French (Georgian AZERTY Tskapo)</_description>
             <languageList>
               <iso639Id>geo</iso639Id>
             </languageList>
@@ -2668,8 +2719,8 @@
     <layout>
       <configItem>
         <name>gh</name>
-        <_shortDescription>Gha</_shortDescription>
-        <_description>Ghana</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Ghana)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -2678,13 +2729,14 @@
         <variant>
           <configItem>
             <name>generic</name>
-            <_description>Ghana - Multilingual</_description>
+            <_description>English (Ghana, multilingual)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>akan</name>
-            <_description>Ghana - Akan</_description>
+            <_shortDescription>ak</_shortDescription>
+            <_description>Akan</_description>
             <languageList>
               <iso639Id>aka</iso639Id>
             </languageList>
@@ -2693,7 +2745,8 @@
         <variant>
           <configItem>
             <name>ewe</name>
-            <_description>Ghana - Ewe</_description>
+            <_shortDescription>ee</_shortDescription>
+            <_description>Ewe</_description>
             <languageList>
               <iso639Id>ewe</iso639Id>
             </languageList>
@@ -2702,7 +2755,8 @@
         <variant>
           <configItem>
             <name>fula</name>
-            <_description>Ghana - Fula</_description>
+            <_shortDescription>ff</_shortDescription>
+            <_description>Fula</_description>
             <languageList>
               <iso639Id>ful</iso639Id>
             </languageList>
@@ -2711,7 +2765,8 @@
         <variant>
           <configItem>
             <name>ga</name>
-            <_description>Ghana - Ga</_description>
+            <_shortDescription>gaa</_shortDescription>
+            <_description>Ga</_description>
             <languageList>
               <iso639Id>gaa</iso639Id>
             </languageList>
@@ -2720,7 +2775,8 @@
         <variant>
           <configItem>
             <name>hausa</name>
-            <_description>Ghana - Hausa</_description>
+            <_shortDescription>ha</_shortDescription>
+            <_description>Hausa</_description>
             <languageList>
               <iso639Id>hau</iso639Id>
             </languageList>
@@ -2729,7 +2785,8 @@
         <variant>
           <configItem>
             <name>avn</name>
-            <_description>Ghana - Avatime</_description>
+            <_shortDescription>avn</_shortDescription>
+            <_description>Avatime</_description>
             <languageList>
               <iso639Id>avn</iso639Id>
             </languageList>
@@ -2738,7 +2795,7 @@
         <variant>
           <configItem>
             <name>gillbt</name>
-            <_description>Ghana - GILLBT</_description>
+            <_description>English (Ghana, GILLBT)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2746,8 +2803,8 @@
     <layout>
       <configItem>
         <name>gn</name>
-        <_shortDescription>Gin</_shortDescription>
-        <_description>Guinea</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Guinea)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2757,8 +2814,8 @@
     <layout>
       <configItem>
         <name>ge</name>
-        <_shortDescription>Geo</_shortDescription>
-        <_description>Georgia</_description>
+        <_shortDescription>ka</_shortDescription>
+        <_description>Georgian</_description>
         <languageList>
           <iso639Id>geo</iso639Id>
         </languageList>
@@ -2767,19 +2824,20 @@
         <variant>
           <configItem>
             <name>ergonomic</name>
-            <_description>Georgia - Ergonomic</_description>
+            <_description>Georgian (ergonomic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mess</name>
-            <_description>Georgia - MESS</_description>
+            <_description>Georgian (MESS)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Georgia - Russian</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Georgia)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -2788,7 +2846,7 @@
         <variant>
           <configItem>
             <name>os</name>
-            <_description>Georgia - Ossetian</_description>
+            <_description>Georgian (Ossetian)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -2799,8 +2857,8 @@
     <layout>
       <configItem>
         <name>de</name>
-        <_shortDescription>Deu</_shortDescription>
-        <_description>Germany</_description>
+        <_shortDescription>de</_shortDescription>
+        <_description>German</_description>
         <languageList>
           <iso639Id>ger</iso639Id>
         </languageList>
@@ -2809,67 +2867,67 @@
         <variant>
           <configItem>
             <name>deadacute</name>
-            <_description>Germany - Dead acute</_description>
+            <_description>German (dead acute)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadgraveacute</name>
-            <_description>Germany - Dead grave acute</_description>
+            <_description>German (dead grave acute)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Germany - Eliminate dead keys</_description>
+            <_description>German (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro</name>
-            <_description>Germany - Romanian keyboard with German letters</_description>
+            <_description>German (Romanian keyboard with German letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro_nodeadkeys</name>
-            <_description>Germany - Romanian keyboard with German letters, eliminate dead keys</_description>
+            <_description>German (Romanian keyboard with German letters, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Germany - Dvorak</_description>
+            <_description>German (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Germany - Sun dead keys</_description>
+            <_description>German (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>neo</name>
-            <_description>Germany - Neo 2</_description>
+            <_description>German (Neo 2)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Germany - Macintosh</_description>
+            <_description>German (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Germany - Macintosh, eliminate dead keys</_description>
+            <_description>German (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb</name>
-            <_description>Germany - Lower Sorbian</_description>
+            <_description>German (lower Sorbian)</_description>
             <languageList>
               <iso639Id>dsb</iso639Id>
             </languageList>
@@ -2878,7 +2936,7 @@
         <variant>
           <configItem>
             <name>dsb_qwertz</name>
-            <_description>Germany - Lower Sorbian (qwertz)</_description>
+            <_description>German (lower Sorbian qwertz)</_description>
             <languageList>
               <iso639Id>dsb</iso639Id>
             </languageList>
@@ -2887,13 +2945,13 @@
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Germany - qwerty</_description>
+            <_description>German (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Germany - Russian phonetic</_description>
+            <_description>Russian (Germany, phonetic)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -2904,8 +2962,8 @@
     <layout>
       <configItem>
         <name>gr</name>
-        <_shortDescription>Grc</_shortDescription>
-        <_description>Greece</_description>
+        <_shortDescription>gr</_shortDescription>
+        <_description>Greek</_description>
         <languageList>
           <iso639Id>gre</iso639Id>
         </languageList>
@@ -2914,25 +2972,25 @@
         <variant>
           <configItem>
             <name>simple</name>
-            <_description>Greece - Simple</_description>
+            <_description>Greek (simple)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>extended</name>
-            <_description>Greece - Extended</_description>
+            <_description>Greek (extended)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Greece - Eliminate dead keys</_description>
+            <_description>Greek (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>polytonic</name>
-            <_description>Greece - Polytonic</_description>
+            <_description>Greek (polytonic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2940,8 +2998,8 @@
     <layout>
       <configItem>
         <name>hu</name>
-        <_shortDescription>Hun</_shortDescription>
-        <_description>Hungary</_description>
+        <_shortDescription>hu</_shortDescription>
+        <_description>Hungarian</_description>
         <languageList>
           <iso639Id>hun</iso639Id>
         </languageList>
@@ -2950,115 +3008,115 @@
         <variant>
           <configItem>
             <name>standard</name>
-            <_description>Hungary - Standard</_description>
+            <_description>Hungarian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Hungary - Eliminate dead keys</_description>
+            <_description>Hungarian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Hungary - qwerty</_description>
+            <_description>Hungarian (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_comma_dead</name>
-            <_description>Hungary - 101/qwertz/comma/Dead keys</_description>
+            <_description>Hungarian (101/qwertz/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_comma_nodead</name>
-            <_description>Hungary - 101/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwertz/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_dead</name>
-            <_description>Hungary - 101/qwertz/dot/Dead keys</_description>
+            <_description>Hungarian (101/qwertz/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_nodead</name>
-            <_description>Hungary - 101/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwertz/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_dead</name>
-            <_description>Hungary - 101/qwerty/comma/Dead keys</_description>
+            <_description>Hungarian (101/qwerty/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_nodead</name>
-            <_description>Hungary - 101/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwerty/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_dead</name>
-            <_description>Hungary - 101/qwerty/dot/Dead keys</_description>
+            <_description>Hungarian (101/qwerty/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_nodead</name>
-            <_description>Hungary - 101/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwerty/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_comma_dead</name>
-            <_description>Hungary - 102/qwertz/comma/Dead keys</_description>
+            <_description>Hungarian (102/qwertz/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_comma_nodead</name>
-            <_description>Hungary - 102/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwertz/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_dead</name>
-            <_description>Hungary - 102/qwertz/dot/Dead keys</_description>
+            <_description>Hungarian (102/qwertz/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_nodead</name>
-            <_description>Hungary - 102/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwertz/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_dead</name>
-            <_description>Hungary - 102/qwerty/comma/Dead keys</_description>
+            <_description>Hungarian (102/qwerty/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_nodead</name>
-            <_description>Hungary - 102/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwerty/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_dead</name>
-            <_description>Hungary - 102/qwerty/dot/Dead keys</_description>
+            <_description>Hungarian (102/qwerty/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_nodead</name>
-            <_description>Hungary - 102/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwerty/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3066,8 +3124,8 @@
     <layout>
       <configItem>
         <name>is</name>
-        <_shortDescription>Isl</_shortDescription>
-        <_description>Iceland</_description>
+        <_shortDescription>is</_shortDescription>
+        <_description>Icelandic</_description>
         <languageList>
           <iso639Id>ice</iso639Id>
         </languageList>
@@ -3076,25 +3134,25 @@
         <variant>
           <configItem>
             <name>Sundeadkeys</name>
-            <_description>Iceland - Sun dead keys</_description>
+            <_description>Icelandic (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Iceland - Eliminate dead keys</_description>
+            <_description>Icelandic (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Iceland - Macintosh</_description>
+            <_description>Icelandic (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Iceland - Dvorak</_description>
+            <_description>Icelandic (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3102,8 +3160,8 @@
     <layout>
       <configItem>
         <name>il</name>
-        <_shortDescription>Isr</_shortDescription>
-        <_description>Israel</_description>
+        <_shortDescription>he</_shortDescription>
+        <_description>Hebrew</_description>
         <languageList>
           <iso639Id>heb</iso639Id>
         </languageList>
@@ -3112,19 +3170,19 @@
         <variant>
           <configItem>
             <name>lyx</name>
-            <_description>Israel - lyx</_description>
+            <_description>Hebrew (lyx)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Israel - Phonetic</_description>
+            <_description>Hebrew (Phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>biblical</name>
-            <_description>Israel - Biblical Hebrew (Tiro)</_description>
+            <_description>Hebrew (Tiro)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3132,8 +3190,8 @@
     <layout>
       <configItem>
         <name>it</name>
-        <_shortDescription>Ita</_shortDescription>
-        <_description>Italy</_description>
+        <_shortDescription>it</_shortDescription>
+        <_description>Italian</_description>
         <languageList>
           <iso639Id>ita</iso639Id>
         </languageList>
@@ -3142,25 +3200,25 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Italy - Eliminate dead keys</_description>
+            <_description>Italian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Italy - Macintosh</_description>
+            <_description>Italian (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Italy - US keyboard with Italian letters</_description>
+            <_description>Italian (US keyboard with Italian letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Italy - Georgian</_description>
+            <_description>Italian (Georgian)</_description>
             <languageList>
               <iso639Id>geo</iso639Id>
             </languageList>
@@ -3171,8 +3229,8 @@
     <layout>
       <configItem>
         <name>jp</name>
-        <_shortDescription>Jpn</_shortDescription>
-        <_description>Japan</_description>
+        <_shortDescription>ja</_shortDescription>
+        <_description>Japanese</_description>
         <languageList>
           <iso639Id>jpn</iso639Id>
         </languageList>
@@ -3181,25 +3239,25 @@
         <variant>
           <configItem>
             <name>kana</name>
-            <_description>Japan - Kana</_description>
+            <_description>Japanese (Kana)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kana86</name>
-            <_description>Japan - Kana 86</_description>
+            <_description>Japanese (Kana 86)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>OADG109A</name>
-            <_description>Japan - OADG 109A</_description>
+            <_description>Japanese (OADG 109A)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Japan - Macintosh</_description>
+            <_description>Japanese (Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3207,8 +3265,8 @@
     <layout>
       <configItem>
         <name>kg</name>
-        <_shortDescription>Kgz</_shortDescription>
-        <_description>Kyrgyzstan</_description>
+        <_shortDescription>ki</_shortDescription>
+        <_description>Kyrgyz</_description>
         <languageList>
           <iso639Id>kir</iso639Id>
         </languageList>
@@ -3217,7 +3275,7 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Kyrgyzstan - Phonetic</_description>
+            <_description>Kyrgyz (phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3225,8 +3283,8 @@
     <layout>
       <configItem>
         <name>kh</name>
-        <_shortDescription>Khm</_shortDescription>
-        <_description>Cambodia</_description>
+        <_shortDescription>km</_shortDescription>
+        <_description>Khmer (Cambodian)</_description>
         <languageList>
           <iso639Id>khm</iso639Id>
         </languageList>
@@ -3236,8 +3294,8 @@
     <layout>
       <configItem>
         <name>kz</name>
-        <_shortDescription>Kaz</_shortDescription>
-        <_description>Kazakhstan</_description>
+        <_shortDescription>kk</_shortDescription>
+        <_description>Kazakh</_description>
         <languageList>
           <iso639Id>kaz</iso639Id>
         </languageList>
@@ -3246,7 +3304,8 @@
         <variant>
           <configItem>
             <name>ruskaz</name>
-            <_description>Kazakhstan - Russian with Kazakh</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Kazakhstan, with Kazakh)</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
           </configItem>
@@ -3254,7 +3313,7 @@
         <variant>
           <configItem>
             <name>kazrus</name>
-            <_description>Kazakhstan - Kazakh with Russian</_description>
+            <_description>Kazakh (with Russian)</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
           </configItem>
@@ -3264,8 +3323,8 @@
     <layout>
       <configItem>
         <name>la</name>
-        <_shortDescription>Lao</_shortDescription>
-        <_description>Laos</_description>
+        <_shortDescription>lo</_shortDescription>
+        <_description>Lao</_description>
         <languageList>
           <iso639Id>lao</iso639Id>
         </languageList>
@@ -3274,7 +3333,7 @@
         <variant>
           <configItem>
             <name>stea</name>
-            <_description>Laos - STEA (proposed standard layout)</_description>
+            <_description>Lao (STEA proposed standard layout)</_description>
             <languageList><iso639Id>lao</iso639Id>
             </languageList>
           </configItem>
@@ -3284,8 +3343,8 @@
     <layout>
       <configItem>
         <name>latam</name>
-        <_shortDescription>Esp</_shortDescription>
-        <_description>Latin American</_description>
+        <_shortDescription>es</_shortDescription>
+        <_description>Spanish (Latin American)</_description>
         <countryList>
           <iso3166Id>AR</iso3166Id>
           <iso3166Id>BO</iso3166Id>
@@ -3317,19 +3376,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Latin American - Eliminate dead keys</_description>
+            <_description>Spanish (Latin American, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Latin American - Include dead tilde</_description>
+            <_description>Spanish (Latin American, include dead tilde)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Latin American - Sun dead keys</_description>
+            <_description>Spanish (Latin American, sun dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3337,8 +3396,8 @@
     <layout>
       <configItem>
         <name>lt</name>
-        <_shortDescription>Ltu</_shortDescription>
-        <_description>Lithuania</_description>
+        <_shortDescription>lt</_shortDescription>
+        <_description>Lithuanian</_description>
         <languageList>
           <iso639Id>lit</iso639Id>
         </languageList>
@@ -3347,31 +3406,31 @@
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Lithuania - Standard</_description>
+            <_description>Lithuanian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Lithuania - US keyboard with Lithuanian letters</_description>
+            <_description>Lithuanian (US keyboard with Lithuanian letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ibm</name>
-            <_description>Lithuania - IBM (LST 1205-92)</_description>
+            <_description>Lithuanian (IBM LST 1205-92)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekp</name>
-            <_description>Lithuania - LEKP</_description>
+            <_description>Lithuanian (LEKP)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekpa</name>
-            <_description>Lithuania - LEKPa</_description>
+            <_description>Lithuanian (LEKPa)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3379,8 +3438,8 @@
     <layout>
       <configItem>
         <name>lv</name>
-        <_shortDescription>Lva</_shortDescription>
-        <_description>Latvia</_description>
+        <_shortDescription>lv</_shortDescription>
+        <_description>Latvian</_description>
         <languageList>
           <iso639Id>lav</iso639Id>
         </languageList>
@@ -3389,19 +3448,19 @@
         <variant>
           <configItem>
             <name>apostrophe</name>
-            <_description>Latvia - Apostrophe (') variant</_description>
+            <_description>Latvian (Apostrophe ' variant)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tilde</name>
-            <_description>Latvia - Tilde (~) variant</_description>
+            <_description>Latvian (Tilde ~ variant)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fkey</name>
-            <_description>Latvia - F-letter (F) variant</_description>
+            <_description>Latvian (F variant)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3409,8 +3468,8 @@
     <layout>
       <configItem>
         <name>mao</name>
-        <_shortDescription>Mao</_shortDescription>
-        <_description>Maori</_description>
+        <_shortDescription>mi</_shortDescription>
+        <_description>Māori</_description>
         <languageList>
           <iso639Id>mao</iso639Id>
         </languageList>
@@ -3420,8 +3479,8 @@
     <layout>
       <configItem>
         <name>me</name>
-        <_shortDescription>MNE</_shortDescription>
-        <_description>Montenegro</_description>
+        <_shortDescription>srp</_shortDescription>
+        <_description>Montenegrin</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -3430,43 +3489,43 @@
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Montenegro - Cyrillic</_description>
+            <_description>Montenegrin (Cyrillic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicyz</name>
-            <_description>Montenegro - Cyrillic, Z and ZHE swapped</_description>
+            <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Montenegro - Latin unicode</_description>
+            <_description>Montenegrin (Latin unicode)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Montenegro - Latin qwerty</_description>
+            <_description>Montenegrin (Latin qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Montenegro - Latin unicode qwerty</_description>
+            <_description>Montenegrin (Latin unicode qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicalternatequotes</name>
-            <_description>Montenegro - Cyrillic with guillemets</_description>
+            <_description>Montenegrin (Cyrillic with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Montenegro - Latin with guillemets</_description>
+            <_description>Montenegrin (Latin with guillemets)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3474,8 +3533,8 @@
     <layout>
       <configItem>
         <name>mk</name>
-        <_shortDescription>Mkd</_shortDescription>
-        <_description>Macedonia</_description>
+        <_shortDescription>mk</_shortDescription>
+        <_description>Macedonian</_description>
         <languageList>
           <iso639Id>mkd</iso639Id>
         </languageList>
@@ -3484,7 +3543,7 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Macedonia - Eliminate dead keys</_description>
+            <_description>Macedonian (eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3492,8 +3551,8 @@
     <layout>
       <configItem>
         <name>mt</name>
-        <_shortDescription>Mlt</_shortDescription>
-        <_description>Malta</_description>
+        <_shortDescription>mt</_shortDescription>
+        <_description>Maltese</_description>
         <languageList>
           <iso639Id>mlt</iso639Id>
         </languageList>
@@ -3502,7 +3561,7 @@
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Malta - Maltese keyboard with US layout</_description>
+            <_description>Maltese (with US layout)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3510,8 +3569,8 @@
     <layout>
       <configItem>
         <name>mn</name>
-        <_shortDescription>Mng</_shortDescription>
-        <_description>Mongolia</_description>
+        <_shortDescription>mn</_shortDescription>
+        <_description>Mongolian</_description>
         <languageList>
           <iso639Id>mng</iso639Id>
         </languageList>
@@ -3521,8 +3580,8 @@
     <layout>
       <configItem>
         <name>no</name>
-        <_shortDescription>Nor</_shortDescription>
-        <_description>Norway</_description>
+        <_shortDescription>no</_shortDescription>
+        <_description>Norwegian</_description>
         <languageList>
           <iso639Id>nor</iso639Id>
         </languageList>
@@ -3531,19 +3590,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Norway - Eliminate dead keys</_description>
+            <_description>Norwegian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Norway - Dvorak</_description>
+            <_description>Norwegian (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Norway - Northern Saami</_description>
+            <_description>Norwegian (Northern Saami</_description>
             <languageList>
               <iso639Id>sme</iso639Id>
             </languageList>
@@ -3552,7 +3611,7 @@
         <variant>
           <configItem>
             <name>smi_nodeadkeys</name>
-            <_description>Norway - Northern Saami, eliminate dead keys</_description>
+            <_description>Norwegian (northern Saami, eliminate dead keys)</_description>
             <languageList>
               <iso639Id>sme</iso639Id>
             </languageList>
@@ -3561,13 +3620,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Norway - Macintosh</_description>
+            <_description>Norwegian (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Norway - Macintosh, eliminate dead keys</_description>
+            <_description>Norwegian (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3575,8 +3634,8 @@
     <layout>
       <configItem>
         <name>pl</name>
-        <_shortDescription>Pol</_shortDescription>
-        <_description>Poland</_description>
+        <_shortDescription>pl</_shortDescription>
+        <_description>Polish</_description>
         <languageList>
           <iso639Id>pol</iso639Id>
         </languageList>
@@ -3585,31 +3644,31 @@
         <variant>
           <configItem>
             <name>qwertz</name>
-            <_description>Poland - qwertz</_description>
+            <_description>Polish (qwertz)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Poland - Dvorak</_description>
+            <_description>Polish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_quotes</name>
-            <_description>Poland - Dvorak, Polish quotes on quotemark key</_description>
+            <_description>Polish (Dvorak, polish quotes on quotemark key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_altquotes</name>
-            <_description>Poland - Dvorak, Polish quotes on key 1</_description>
+            <_description>Polish (Dvorak, polish quotes on key 1)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>csb</name>
-            <_description>Poland - Kashubian</_description>
+            <_description>Polish (Kashubian)</_description>
             <languageList>
               <iso639Id>csb</iso639Id>
             </languageList>
@@ -3618,7 +3677,8 @@
         <variant>
           <configItem>
             <name>ru_phonetic_dvorak</name>
-            <_description>Poland - Russian phonetic Dvorak</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Poland, phonetic Dvorak)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -3627,7 +3687,7 @@
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>Poland - Programmer Dvorak</_description>
+            <_description>Polish (programmer Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3635,8 +3695,8 @@
     <layout>
       <configItem>
         <name>pt</name>
-        <_shortDescription>Prt</_shortDescription>
-        <_description>Portugal</_description>
+        <_shortDescription>pt</_shortDescription>
+        <_description>Portuguese</_description>
         <languageList>
           <iso639Id>por</iso639Id>
         </languageList>
@@ -3645,49 +3705,49 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Portugal - Eliminate dead keys</_description>
+            <_description>Portuguese (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Portugal - Sun dead keys</_description>
+            <_description>Portuguese (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Portugal - Macintosh</_description>
+            <_description>Portuguese (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Portugal - Macintosh, eliminate dead keys</_description>
+            <_description>Portuguese (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_sundeadkeys</name>
-            <_description>Portugal - Macintosh, Sun dead keys</_description>
+            <_description>Portuguese (Mac, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Portugal - Nativo</_description>
+            <_description>Portuguese (Nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portugal - Nativo for USA keyboards</_description>
+            <_description>Portuguese (Nativo for USA keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Portugal - Nativo for Esperanto</_description>
+            <_description>Portuguese (Nativo for Esperanto)</_description>
             <languageList>
               <iso639Id>epo</iso639Id>
             </languageList>
@@ -3698,8 +3758,8 @@
     <layout>
       <configItem>
         <name>ro</name>
-        <_shortDescription>Rou</_shortDescription>
-        <_description>Romania</_description>
+        <_shortDescription>ro</_shortDescription>
+        <_description>Romanian</_description>
         <languageList>
           <iso639Id>rum</iso639Id>
         </languageList>
@@ -3708,31 +3768,31 @@
         <variant>
           <configItem>
             <name>cedilla</name>
-            <_description>Romania - Cedilla</_description>
+            <_description>Romanian (cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Romania - Standard</_description>
+            <_description>Romanian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std_cedilla</name>
-            <_description>Romania - Standard (Cedilla)</_description>
+            <_description>Romanian (standard cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Romania - Winkeys</_description>
+            <_description>Romanian (WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Romania - Crimean Tatar (Turkish F)</_description>
+            <_description>Romanian (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3741,7 +3801,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Romania - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Romanian (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3750,7 +3810,7 @@
         <variant>
           <configItem>
             <name>crh_dobruca1</name>
-            <_description>Romania - Crimean Tatar (Dobruca-1 Q)</_description>
+            <_description>Romanian (Crimean Tatar Dobruca-1 Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3759,7 +3819,7 @@
         <variant>
           <configItem>
             <name>crh_dobruca2</name>
-            <_description>Romania - Crimean Tatar (Dobruca-2 Q)</_description>
+            <_description>Romanian (Crimean Tatar Dobruca-2 Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3770,8 +3830,8 @@
     <layout>
       <configItem>
         <name>ru</name>
-        <_shortDescription>Rus</_shortDescription>
-        <_description>Russia</_description>
+        <_shortDescription>ru</_shortDescription>
+        <_description>Russian</_description>
         <languageList>
           <iso639Id>rus</iso639Id>
         </languageList>
@@ -3780,37 +3840,37 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Russia - Phonetic</_description>
+            <_description>Russian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic_winkeys</name>
-            <_description>Russia - Phonetic Winkeys</_description>
+            <_description>Russian (phonetic WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Russia - Typewriter</_description>
+            <_description>Russian (typewriter)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Russia - Legacy</_description>
+            <_description>Russian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter-legacy</name>
-            <_description>Russia - Typewriter, legacy</_description>
+            <_description>Russian (typewriter, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tt</name>
-            <_description>Russia - Tatar</_description>
+            <_description>Russian (Tatar)</_description>
             <languageList>
               <iso639Id>tat</iso639Id>
             </languageList>
@@ -3819,7 +3879,7 @@
         <variant>
           <configItem>
             <name>os_legacy</name>
-            <_description>Russia - Ossetian, legacy</_description>
+            <_description>Russian (Ossetian, legacy)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -3828,7 +3888,7 @@
         <variant>
           <configItem>
             <name>os_winkeys</name>
-            <_description>Russia - Ossetian, Winkeys</_description>
+            <_description>Russian (Ossetian, WinKeys)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -3837,7 +3897,7 @@
         <variant>
           <configItem>
             <name>cv</name>
-            <_description>Russia - Chuvash</_description>
+            <_description>Russian (Chuvash)</_description>
             <languageList>
               <iso639Id>chv</iso639Id>
             </languageList>
@@ -3846,7 +3906,7 @@
         <variant>
           <configItem>
             <name>cv_latin</name>
-            <_description>Russia - Chuvash Latin</_description>
+            <_description>Russian (Chuvash Latin)</_description>
             <languageList>
               <iso639Id>chv</iso639Id>
             </languageList>
@@ -3855,7 +3915,7 @@
         <variant>
           <configItem>
             <name>udm</name>
-            <_description>Russia - Udmurt</_description>
+            <_description>Russian (Udmurt)</_description>
             <languageList>
               <iso639Id>udm</iso639Id>
             </languageList>
@@ -3864,7 +3924,7 @@
         <variant>
           <configItem>
             <name>kom</name>
-            <_description>Russia - Komi</_description>
+            <_description>Russian (Komi)</_description>
             <languageList>
               <iso639Id>kom</iso639Id>
             </languageList>
@@ -3873,7 +3933,7 @@
         <variant>
           <configItem>
             <name>sah</name>
-            <_description>Russia - Yakut</_description>
+            <_description>Russian (Yakut)</_description>
             <languageList>
               <iso639Id>sah</iso639Id>
             </languageList>
@@ -3882,7 +3942,7 @@
         <variant>
           <configItem>
             <name>xal</name>
-            <_description>Russia - Kalmyk</_description>
+            <_description>Russian (Kalmyk)</_description>
             <languageList>
               <iso639Id>xal</iso639Id>
             </languageList>
@@ -3891,13 +3951,13 @@
         <variant>
           <configItem>
             <name>dos</name>
-            <_description>Russia - DOS</_description>
+            <_description>Russian (DOS)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>srp</name>
-            <_description>Russia - Serbian</_description>
+            <_description>Russian (Serbian)</_description>
             <languageList><iso639Id>rus</iso639Id>
                           <iso639Id>srp</iso639Id></languageList>
           </configItem>
@@ -3905,7 +3965,7 @@
         <variant>
           <configItem>
             <name>bak</name>
-            <_description>Russia - Bashkirian</_description>
+            <_description>Russian (Bashkirian)</_description>
             <languageList>
               <iso639Id>bak</iso639Id>
             </languageList>
@@ -3914,7 +3974,7 @@
         <variant>
           <configItem>
             <name>chm</name>
-            <_description>Russia - Mari</_description>
+            <_description>Russian (Mari)</_description>
             <languageList>
               <iso639Id>chm</iso639Id>
             </languageList>
@@ -3925,8 +3985,8 @@
     <layout>
       <configItem>
         <name>rs</name>
-        <_shortDescription>Srb</_shortDescription>
-        <_description>Serbia</_description>
+        <_shortDescription>sr</_shortDescription>
+        <_description>Serbian</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -3935,49 +3995,49 @@
         <variant>
           <configItem>
             <name>yz</name>
-            <_description>Serbia - Z and ZHE swapped</_description>
+            <_description>Serbian (Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Serbia - Latin</_description>
+            <_description>Serbian (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Serbia - Latin Unicode</_description>
+            <_description>Serbian (Latin Unicode)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Serbia - Latin qwerty</_description>
+            <_description>Serbian (Latin qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Serbia - Latin Unicode qwerty</_description>
+            <_description>Serbian (Latin Unicode qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Serbia - With guillemets</_description>
+            <_description>Serbian (with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Serbia - Latin with guillemets</_description>
+            <_description>Serbian (Latin with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rue</name>
-            <_description>Serbia - Pannonian Rusyn Homophonic</_description>
+            <_description>Serbian (Pannonian Rusyn Homophonic)</_description>
             <languageList>
               <iso639Id>rue</iso639Id>
             </languageList>
@@ -3988,8 +4048,8 @@
     <layout>
       <configItem>
         <name>si</name>
-        <_shortDescription>Svn</_shortDescription>
-        <_description>Slovenia</_description>
+        <_shortDescription>sl</_shortDescription>
+        <_description>Slovene</_description>
         <languageList>
           <iso639Id>slv</iso639Id>
         </languageList>
@@ -3998,13 +4058,13 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Slovenia - Use guillemets for quotes</_description>
+            <_description>Slovene (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Slovenia - US keyboard with Slovenian letters</_description>
+            <_description>Slovene (US keyboard with Slovenian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4012,8 +4072,8 @@
     <layout>
       <configItem>
         <name>sk</name>
-        <_shortDescription>Svk</_shortDescription>
-        <_description>Slovakia</_description>
+        <_shortDescription>sk</_shortDescription>
+        <_description>Slovak</_description>
         <languageList>
           <iso639Id>slo</iso639Id>
         </languageList>
@@ -4022,19 +4082,19 @@
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Slovakia - Extended Backslash</_description>
+            <_description>Slovak (extended Backslash)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Slovakia - qwerty</_description>
+            <_description>Slovak (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>Slovakia - qwerty, extended Backslash</_description>
+            <_description>Slovak (qwerty, extended Backslash)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4042,8 +4102,8 @@
     <layout>
       <configItem>
         <name>es</name>
-        <_shortDescription>Esp</_shortDescription>
-        <_description>Spain</_description>
+        <_shortDescription>es</_shortDescription>
+        <_description>Spanish</_description>
         <languageList>
           <iso639Id>spa</iso639Id>
         </languageList>
@@ -4052,31 +4112,31 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Spain - Eliminate dead keys</_description>
+            <_description>Spanish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Spain - Include dead tilde</_description>
+            <_description>Spanish (include dead tilde)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Spain - Sun dead keys</_description>
+            <_description>Spanish (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Spain - Dvorak</_description>
+            <_description>Spanish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ast</name>
-            <_description>Spain - Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <_description>Spanish (Asturian variant with bottom-dot H and bottom-dot L)</_description>
             <languageList>
               <iso639Id>ast</iso639Id>
             </languageList>
@@ -4085,7 +4145,7 @@
         <variant>
           <configItem>
             <name>cat</name>
-            <_description>Spain - Catalan variant with middle-dot L</_description>
+            <_description>Spanish (Catalan variant with middle-dot L)</_description>
             <languageList>
               <iso639Id>cat</iso639Id>
             </languageList>
@@ -4094,7 +4154,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Spain - Macintosh</_description>
+            <_description>Spanish (Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4102,8 +4162,8 @@
     <layout>
       <configItem>
         <name>se</name>
-        <_shortDescription>Swe</_shortDescription>
-        <_description>Sweden</_description>
+        <_shortDescription>sv</_shortDescription>
+        <_description>Swedish</_description>
         <languageList>
           <iso639Id>swe</iso639Id>
         </languageList>
@@ -4112,19 +4172,20 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Sweden - Eliminate dead keys</_description>
+            <_description>Swedish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Sweden - Dvorak</_description>
+            <_description>Swedish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>Sweden - Russian phonetic</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Sweden, phonetic)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -4133,7 +4194,8 @@
         <variant>
           <configItem>
             <name>rus_nodeadkeys</name>
-            <_description>Sweden - Russian phonetic, eliminate dead keys</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Sweden, phonetic, eliminate dead keys)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -4142,7 +4204,7 @@
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Sweden - Northern Saami</_description>
+            <_description>Swedish (northern Saami)</_description>
             <languageList>
               <iso639Id>sme</iso639Id>
             </languageList>
@@ -4151,13 +4213,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Sweden - Macintosh</_description>
+            <_description>Swedish (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>svdvorak</name>
-            <_description>Sweden - Svdvorak</_description>
+            <_description>Swedish (Svdvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4165,8 +4227,8 @@
     <layout>
       <configItem>
         <name>ch</name>
-        <_shortDescription>Che</_shortDescription>
-        <_description>Switzerland</_description>
+        <_shortDescription>che</_shortDescription>
+        <_description>Swiss</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>gsw</iso639Id></languageList>
       </configItem>
@@ -4174,25 +4236,28 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Switzerland - Legacy</_description>
+            <_description>Swiss (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_nodeadkeys</name>
-            <_description>Switzerland - German, eliminate dead keys</_description>
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_sundeadkeys</name>
-            <_description>Switzerland - German, Sun dead keys</_description>
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr</name>
-            <_description>Switzerland - French</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4201,7 +4266,8 @@
         <variant>
           <configItem>
             <name>fr_nodeadkeys</name>
-            <_description>Switzerland - French, eliminate dead keys</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, eliminate dead keys)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4210,7 +4276,8 @@
         <variant>
           <configItem>
             <name>fr_sundeadkeys</name>
-            <_description>Switzerland - French, Sun dead keys</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, Sun dead keys)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4219,7 +4286,8 @@
         <variant>
           <configItem>
             <name>fr_mac</name>
-            <_description>Switzerland - French (Macintosh)</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, Mac)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4228,7 +4296,8 @@
         <variant>
           <configItem>
             <name>de_mac</name>
-            <_description>Switzerland - German (Macintosh)</_description>
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4236,8 +4305,8 @@
     <layout>
       <configItem>
         <name>sy</name>
-        <_shortDescription>Syr</_shortDescription>
-        <_description>Syria</_description>
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Syria)</_description>
         <languageList>
           <iso639Id>syr</iso639Id>
         </languageList>
@@ -4246,19 +4315,22 @@
         <variant>
           <configItem>
             <name>syc</name>
-            <_description>Syria - Syriac</_description>
+            <_shortDescription>syc</_shortDescription>
+            <_description>Syriac</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>syc_phonetic</name>
-            <_description>Syria - Syriac phonetic</_description>
+            <_shortDescription>syc</_shortDescription>
+            <_description>Syriac (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Syria - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4267,7 +4339,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Syria - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4276,7 +4349,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Syria - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4287,8 +4361,8 @@
     <layout>
       <configItem>
         <name>tj</name>
-        <_shortDescription>Tjk</_shortDescription>
-        <_description>Tajikistan</_description>
+        <_shortDescription>tg</_shortDescription>
+        <_description>Tajik</_description>
         <languageList>
           <iso639Id>tgk</iso639Id>
         </languageList>
@@ -4297,7 +4371,7 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Tajikistan - Legacy</_description>
+            <_description>Tajik (legacy)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4305,8 +4379,8 @@
     <layout>
       <configItem>
         <name>lk</name>
-        <_shortDescription>Lka</_shortDescription>
-        <_description>Sri Lanka</_description>
+        <_shortDescription>si</_shortDescription>
+        <_description>Sinhala</_description>
         <languageList>
           <iso639Id>sin</iso639Id>
         </languageList>
@@ -4315,7 +4389,8 @@
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>Sri Lanka - Tamil Unicode</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Sri Lanka, Unicode)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -4324,7 +4399,7 @@
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Sri Lanka - Tamil TAB Typewriter</_description>
+            <_description>Tamil (Sri Lanka, TAB Typewriter)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -4335,8 +4410,8 @@
     <layout>
       <configItem>
         <name>th</name>
-        <_shortDescription>Tha</_shortDescription>
-        <_description>Thailand</_description>
+        <_shortDescription>th</_shortDescription>
+        <_description>Thai</_description>
         <languageList>
           <iso639Id>tha</iso639Id>
         </languageList>
@@ -4345,13 +4420,13 @@
         <variant>
           <configItem>
             <name>tis</name>
-            <_description>Thailand - TIS-820.2538</_description>
+            <_description>Thai (TIS-820.2538)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>pat</name>
-            <_description>Thailand - Pattachote</_description>
+            <_description>Thai (Pattachote)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4359,8 +4434,8 @@
     <layout>
       <configItem>
         <name>tr</name>
-        <_shortDescription>Tur</_shortDescription>
-        <_description>Turkey</_description>
+        <_shortDescription>tr</_shortDescription>
+        <_description>Turkish</_description>
         <languageList>
           <iso639Id>tur</iso639Id>
         </languageList>
@@ -4369,25 +4444,26 @@
         <variant>
           <configItem>
             <name>f</name>
-            <_description>Turkey - (F)</_description>
+            <_description>Turkish (F)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Turkey - Alt-Q</_description>
+            <_description>Turkish (Alt-Q)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Turkey - Sun dead keys</_description>
+            <_description>Turkish (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Turkey - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4396,7 +4472,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Turkey - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4405,7 +4482,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Turkey - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4414,13 +4492,13 @@
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>Turkey - International (with dead keys)</_description>
+            <_description>Turkish (international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Turkey - Crimean Tatar (Turkish Q)</_description>
+            <_description>Turkish (Crimean Tatar Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4429,7 +4507,7 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Turkey - Crimean Tatar (Turkish F)</_description>
+            <_description>Turkish (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4438,7 +4516,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Turkey - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Turkish (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4449,8 +4527,8 @@
     <layout>
       <configItem>
         <name>tw</name>
-        <_shortDescription>Twn</_shortDescription>
-        <_description>Taiwan</_description>
+        <_shortDescription>twn</_shortDescription>
+        <_description>Taiwanese</_description>
         <languageList>
           <iso639Id>trv</iso639Id>
         </languageList>
@@ -4459,7 +4537,7 @@
         <variant>
           <configItem>
             <name>indigenous</name>
-            <_description>Taiwan - Indigenous</_description>
+            <_description>Taiwanese (indigenous)</_description>
             <languageList>
               <iso639Id>ami</iso639Id>
               <iso639Id>tay</iso639Id>
@@ -4478,9 +4556,10 @@
         <variant>
           <configItem>
             <name>saisiyat</name>
-            <_description>Taiwan - Saisiyat</_description>
+            <_shortDescription>xsy</_shortDescription>
+            <_description>Saisiyat (Taiwan)</_description>
             <languageList>
-              <iso639Id>xsf</iso639Id>
+              <iso639Id>xsy</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -4489,8 +4568,8 @@
     <layout>
       <configItem>
         <name>ua</name>
-        <_shortDescription>Ukr</_shortDescription>
-        <_description>Ukraine</_description>
+        <_shortDescription>uk</_shortDescription>
+        <_description>Ukrainian</_description>
         <languageList>
           <iso639Id>ukr</iso639Id>
         </languageList>
@@ -4499,49 +4578,49 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Ukraine - Phonetic</_description>
+            <_description>Ukrainian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Ukraine - Typewriter</_description>
+            <_description>Ukrainian (typewriter)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Ukraine - Winkeys</_description>
+            <_description>Ukrainian (WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Ukraine - Legacy</_description>
+            <_description>Ukrainian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rstu</name>
-            <_description>Ukraine - Standard RSTU</_description>
+            <_description>Ukrainian (standard RSTU)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rstu_ru</name>
-            <_description>Ukraine - Standard RSTU on Russian layout</_description>
+            <_description>Ukrainian (standard RSTU on Russian layout)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>homophonic</name>
-            <_description>Ukraine - Homophonic</_description>
+            <_description>Ukrainian (homophonic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Ukraine - Crimean Tatar (Turkish Q)</_description>
+            <_description>Ukrainian (Crimean Tatar Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4550,7 +4629,7 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Ukraine - Crimean Tatar (Turkish F)</_description>
+            <_description>Ukrainian (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4559,7 +4638,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Ukraine - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Ukrainian (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4571,7 +4650,7 @@
       <configItem>
         <name>gb</name>
         <_shortDescription>GBr</_shortDescription>
-        <_description>United Kingdom</_description>
+        <_description>English (UK)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4580,43 +4659,43 @@
         <variant>
           <configItem>
             <name>extd</name>
-            <_description>United Kingdom - Extended - Winkeys</_description>
+            <_description>English (UK, extended, WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>United Kingdom - International (with dead keys)</_description>
+            <_description>English (UK, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>United Kingdom - Dvorak</_description>
+            <_description>English (UK, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorakukp</name>
-            <_description>United Kingdom - Dvorak (UK Punctuation)</_description>
+            <_description>English (UK, Dvorak UK punctuation)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>United Kingdom - Macintosh</_description>
+            <_description>English (UK, Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_intl</name>
-            <_description>United Kingdom - Macintosh (International)</_description>
+            <_description>English (UK, Mac international)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>United Kingdom - Colemak</_description>
+            <_description>English (UK, Colemak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4624,8 +4703,8 @@
     <layout>
       <configItem>
         <name>uz</name>
-        <_shortDescription>Uzb</_shortDescription>
-        <_description>Uzbekistan</_description>
+        <_shortDescription>uz</_shortDescription>
+        <_description>Uzbek</_description>
         <languageList>
           <iso639Id>uzb</iso639Id>
         </languageList>
@@ -4634,13 +4713,13 @@
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Uzbekistan - Latin</_description>
+            <_description>Uzbek (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Uzbekistan - Crimean Tatar (Turkish Q)</_description>
+            <_description>Uzbek (Crimean Tatar Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4649,7 +4728,7 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Uzbekistan - Crimean Tatar (Turkish F)</_description>
+            <_description>Uzbek (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4658,7 +4737,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Uzbekistan - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Uzbek (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4669,8 +4748,8 @@
     <layout>
       <configItem>
         <name>vn</name>
-        <_shortDescription>Vnm</_shortDescription>
-        <_description>Vietnam</_description>
+        <_shortDescription>vi</_shortDescription>
+        <_description>Vietnamese</_description>
         <languageList>
           <iso639Id>vie</iso639Id>
         </languageList>
@@ -4680,8 +4759,8 @@
     <layout>
       <configItem>
         <name>kr</name>
-        <_shortDescription>Kor</_shortDescription>
-        <_description>Korea, Republic of</_description>
+        <_shortDescription>ko</_shortDescription>
+        <_description>Korean</_description>
         <languageList>
           <iso639Id>kor</iso639Id>
         </languageList>
@@ -4690,7 +4769,7 @@
         <variant>
           <configItem>
             <name>kr104</name>
-            <_description>Korea, Republic of - 101/104 key Compatible</_description>
+            <_description>Korean (101/104 key compatible)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4698,8 +4777,8 @@
     <layout>
       <configItem>
         <name>nec_vndr/jp</name>
-        <_shortDescription>Jpn</_shortDescription>
-        <_description>Japan (PC-98xx Series)</_description>
+        <_shortDescription>ja</_shortDescription>
+        <_description>Japanese (PC-98xx Series)</_description>
         <countryList>
           <iso3166Id>JP</iso3166Id>
         </countryList>
@@ -4712,8 +4791,8 @@
     <layout>
       <configItem>
         <name>ie</name>
-        <_shortDescription>Irl</_shortDescription>
-        <_description>Ireland</_description>
+        <_shortDescription>ie</_shortDescription>
+        <_description>Irish</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4722,7 +4801,7 @@
         <variant>
           <configItem>
             <name>CloGaelach</name>
-            <_description>Ireland - CloGaelach</_description>
+            <_description>Irish (CloGaelach)</_description>
             <languageList>
               <iso639Id>gla</iso639Id>
             </languageList>
@@ -4731,19 +4810,19 @@
         <variant>
           <configItem>
             <name>UnicodeExpert</name>
-            <_description>Ireland - UnicodeExpert</_description>
+            <_description>Irish (UnicodeExpert)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam</name>
-            <_description>Ireland - Ogham</_description>
+            <_description>Irish (Ogham)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam_is434</name>
-            <_description>Ireland - Ogham IS434</_description>
+            <_description>Irish (Ogham IS434)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4751,8 +4830,8 @@
     <layout>
       <configItem>
         <name>pk</name>
-        <_shortDescription>Pak</_shortDescription>
-        <_description>Pakistan</_description>
+        <_shortDescription>ur</_shortDescription>
+        <_description>Urdu (Pakistan)</_description>
         <languageList>
           <iso639Id>urd</iso639Id>
         </languageList>
@@ -4761,7 +4840,7 @@
         <variant>
           <configItem>
             <name>urd-crulp</name>
-            <_description>Pakistan - CRULP</_description>
+            <_description>Urdu (Pakistan, CRULP)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -4770,7 +4849,7 @@
         <variant>
           <configItem>
             <name>urd-nla</name>
-            <_description>Pakistan - NLA</_description>
+            <_description>Urdu (Pakistan, NLA)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -4779,7 +4858,8 @@
         <variant>
           <configItem>
             <name>ara</name>
-            <_description>Pakistan - Arabic</_description>
+            <_shortDescription>ar</_shortDescription>
+            <_description>Arabic (Pakistan)</_description>
             <languageList>
               <iso639Id>ara</iso639Id>
             </languageList>
@@ -4788,7 +4868,8 @@
         <variant>
           <configItem>
             <name>snd</name>
-            <_description>Pakistan - Sindhi</_description>
+            <_shortDescription>sd</_shortDescription>
+            <_description>Sindhi</_description>
             <languageList>
               <iso639Id>sd</iso639Id>
             </languageList>
@@ -4799,8 +4880,8 @@
     <layout>
       <configItem>
         <name>mv</name>
-        <_shortDescription>Mdv</_shortDescription>
-        <_description>Maldives</_description>
+        <_shortDescription>dv</_shortDescription>
+        <_description>Dhivehi</_description>
         <languageList>
           <iso639Id>div</iso639Id>
         </languageList>
@@ -4810,8 +4891,8 @@
     <layout>
       <configItem>
         <name>za</name>
-        <_shortDescription>Zaf</_shortDescription>
-        <_description>South Africa</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (South Africa)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4820,7 +4901,7 @@
     <layout>
       <configItem>
         <name>epo</name>
-        <_shortDescription>Epo</_shortDescription>
+        <_shortDescription>eo</_shortDescription>
         <_description>Esperanto</_description>
         <languageList>
           <iso639Id>epo</iso639Id>
@@ -4830,7 +4911,7 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Esperanto - displaced semicolon and quote (obsolete)</_description>
+            <_description>Esperanto (displaced semicolon and quote, obsolete)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4838,8 +4919,8 @@
     <layout>
       <configItem>
         <name>np</name>
-        <_shortDescription>Npl</_shortDescription>
-        <_description>Nepal</_description>
+        <_shortDescription>ne</_shortDescription>
+        <_description>Nepali</_description>
         <languageList>
           <iso639Id>nep</iso639Id>
         </languageList>
@@ -4848,8 +4929,8 @@
     <layout>
       <configItem>
         <name>ng</name>
-        <_shortDescription>Nga</_shortDescription>
-        <_description>Nigeria</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Nigeria)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4858,7 +4939,8 @@
         <variant>
           <configItem>
             <name>igbo</name>
-            <_description>Nigeria - Igbo</_description>
+            <_shortDescription>ig</_shortDescription>
+            <_description>Igbo</_description>
             <languageList>
               <iso639Id>ibo</iso639Id>
             </languageList>
@@ -4867,7 +4949,8 @@
         <variant>
           <configItem>
             <name>yoruba</name>
-            <_description>Nigeria - Yoruba</_description>
+            <_shortDescription>yo</_shortDescription>
+            <_description>Yoruba</_description>
             <languageList>
               <iso639Id>yor</iso639Id>
             </languageList>
@@ -4876,7 +4959,8 @@
         <variant>
           <configItem>
             <name>hausa</name>
-            <_description>Nigeria - Hausa</_description>
+            <_shortDescription>ha</_shortDescription>
+            <_description>Hausa</_description>
             <languageList>
               <iso639Id>hau</iso639Id>
             </languageList>
@@ -4887,8 +4971,8 @@
     <layout>
       <configItem>
         <name>et</name>
-        <_shortDescription>Eth</_shortDescription>
-        <_description>Ethiopia</_description>
+        <_shortDescription>am</_shortDescription>
+        <_description>Amharic</_description>
         <languageList>
           <iso639Id>amh</iso639Id>
         </languageList>
@@ -4898,8 +4982,8 @@
     <layout>
       <configItem>
         <name>sn</name>
-        <_shortDescription>Sen</_shortDescription>
-        <_description>Senegal</_description>
+        <_shortDescription>wo</_shortDescription>
+        <_description>Wolof</_description>
         <languageList>
           <iso639Id>wol</iso639Id>
         </languageList>
@@ -4909,20 +4993,20 @@
     <layout>
       <configItem>
         <name>brai</name>
-        <_shortDescription>Brl</_shortDescription>
+        <_shortDescription>brl</_shortDescription>
         <_description>Braille</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>left_hand</name>
-            <_description>Braille - Left hand</_description>
+            <_description>Braille (left hand)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>right_hand</name>
-            <_description>Braille - Right hand</_description>
+            <_description>Braille (right hand)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4930,8 +5014,8 @@
     <layout>
       <configItem>
         <name>tm</name>
-        <_shortDescription>Tkm</_shortDescription>
-        <_description>Turkmenistan</_description>
+        <_shortDescription>tk</_shortDescription>
+        <_description>Turkmen</_description>
         <languageList>
           <iso639Id>tuk</iso639Id>
         </languageList>
@@ -4940,7 +5024,7 @@
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Turkmenistan - Alt-Q</_description>
+            <_description>Turkmen (Alt-Q)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4948,8 +5032,8 @@
     <layout>
       <configItem>
         <name>ml</name>
-        <_shortDescription>Mli</_shortDescription>
-        <_description>Mali</_description>
+        <_shortDescription>bm</_shortDescription>
+        <_description>Bambara</_description>
         <languageList>
           <iso639Id>bam</iso639Id>
         </languageList>
@@ -4958,19 +5042,22 @@
         <variant>
           <configItem>
             <name>fr-oss</name>
-            <_description>Mali - Français (France Alternative)</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Mali, alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us-mac</name>
-            <_description>Mali - English (USA Macintosh)</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Mali, USA Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us-intl</name>
-            <_description>Mali - English (USA International)</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Mali, USA international)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4978,8 +5065,8 @@
     <layout>
       <configItem>
         <name>tz</name>
-        <_shortDescription>Tza</_shortDescription>
-        <_description>Tanzania</_description>
+        <_shortDescription>sw</_shortDescription>
+        <_description>Swahili (Tanzania)</_description>
         <languageList>
           <iso639Id>swa</iso639Id>
         </languageList>
@@ -4988,8 +5075,8 @@
     <layout>
       <configItem>
         <name>ke</name>
-        <_shortDescription>Ken</_shortDescription>
-        <_description>Kenya</_description>
+        <_shortDescription>sw</_shortDescription>
+        <_description>Swahili (Kenya)</_description>
         <languageList>
           <iso639Id>swa</iso639Id>
         </languageList>
@@ -4998,7 +5085,8 @@
         <variant>
           <configItem>
             <name>kik</name>
-            <_description>Kenya - Kikuyu</_description>
+            <_shortDescription>ki</_shortDescription>
+            <_description>Kikuyu</_description>
             <languageList>
               <iso639Id>kik</iso639Id>
             </languageList>
@@ -5009,8 +5097,8 @@
     <layout>
       <configItem>
         <name>bw</name>
-        <_shortDescription>Bwa</_shortDescription>
-        <_description>Botswana</_description>
+        <_shortDescription>tn</_shortDescription>
+        <_description>Tswana</_description>
         <languageList>
           <iso639Id>tsn</iso639Id>
         </languageList>
@@ -5019,8 +5107,8 @@
     <layout>
       <configItem>
         <name>ph</name>
-        <_shortDescription>Phi</_shortDescription>
-        <_description>Philippines</_description>
+        <_shortDescription>ph</_shortDescription>
+        <_description>Filipino</_description>
         <languageList><iso639Id>eng</iso639Id>
                      <iso639Id>bik</iso639Id>
                       <iso639Id>ceb</iso639Id>
@@ -5037,7 +5125,7 @@
         <variant>
           <configItem>
             <name>qwerty-bay</name>
-            <_description>Philippines - QWERTY (Baybayin)</_description>
+            <_description>Filipino (QWERTY Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5053,13 +5141,13 @@
         <variant>
           <configItem>
             <name>capewell-dvorak</name>
-            <_description>Philippines - Capewell-Dvorak (Latin)</_description>
+            <_description>Filipino (Capewell-Dvorak Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>capewell-dvorak-bay</name>
-            <_description>Philippines - Capewell-Dvorak (Baybayin)</_description>
+            <_description>Filipino (Capewell-Dvorak Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5075,13 +5163,13 @@
         <variant>
           <configItem>
             <name>capewell-qwerf2k6</name>
-            <_description>Philippines - Capewell-QWERF 2006 (Latin)</_description>
+            <_description>Filipino (Capewell-QWERF 2006 Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>capewell-qwerf2k6-bay</name>
-            <_description>Philippines - Capewell-QWERF 2006 (Baybayin)</_description>
+            <_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5097,13 +5185,13 @@
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Philippines - Colemak (Latin)</_description>
+            <_description>Filipino (Colemak Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak-bay</name>
-            <_description>Philippines - Colemak (Baybayin)</_description>
+            <_description>Filipino (Colemak Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5119,7 +5207,7 @@
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Philippines - Dvorak (Latin)</_description>
+            <_description>Filipino (Dvorak Latin)</_description>
           </configItem>
         </variant>
         <variant>
-- 
cgit v1.2.3