rules/base.xml: improve the sorting of the layout names per country code

Also, correct a few misindentations of `<variant>` tags and similar.

1 files changed, 532 insertions, 533 deletions

diff --git a/rules/base.xml b/rules/base.xml
index 32851430..10f355c9 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -1358,42 +1358,37 @@
       <variantList>
         <variant>
           <configItem>
-            <name>chr</name>
-            <!-- Keyboard indicator for Cherokee layouts -->
-            <shortDescription>chr</shortDescription>
-            <description>Cherokee</description>
-            <languageList>
-              <iso639Id>chr</iso639Id>
-            </languageList>
+            <name>euro</name>
+            <description>English (US, euro on 5)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>haw</name>
-            <!-- Keyboard indicator for Hawaian layouts -->
-            <shortDescription>haw</shortDescription>
-            <description>Hawaiian</description>
-            <languageList>
-              <iso639Id>haw</iso639Id>
-            </languageList>
+            <name>intl</name>
+            <description>English (US, intl., with dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>euro</name>
-            <description>English (US, euro on 5)</description>
+            <name>alt-intl</name>
+            <description>English (US, alt. intl.)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>intl</name>
-            <description>English (US, intl., with dead keys)</description>
+            <name>altgr-intl</name>
+            <description>English (intl., with AltGr dead keys)</description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+              <iso639Id>fra</iso639Id>
+              <iso639Id>deu</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>alt-intl</name>
-            <description>English (US, alt. intl.)</description>
+            <name>mac</name>
+            <description>English (Macintosh)</description>
           </configItem>
         </variant>
         <variant>
@@ -1482,37 +1477,27 @@
         </variant>
         <variant>
           <configItem>
-            <name>symbolic</name>
-            <description>English (US, Symbolic)</description>
+            <name>norman</name>
+            <description>English (Norman)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>rus</name>
-            <!-- Keyboard indicator for Russian layouts -->
-            <shortDescription>ru</shortDescription>
-            <description>Russian (US, phonetic)</description>
-            <languageList>
-              <iso639Id>rus</iso639Id>
-            </languageList>
+            <name>symbolic</name>
+            <description>English (US, Symbolic)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>mac</name>
-            <description>English (Macintosh)</description>
+            <name>workman</name>
+            <description>English (Workman)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>altgr-intl</name>
-            <description>English (intl., with AltGr dead keys)</description>
-            <languageList>
-              <iso639Id>eng</iso639Id>
-              <iso639Id>fra</iso639Id>
-              <iso639Id>deu</iso639Id>
-            </languageList>
-          </configItem>
+            <name>workman-intl</name>
+            <description>English (Workman, intl., with dead keys)</description>
+           </configItem>
         </variant>
         <variant>
           <configItem>
@@ -1522,35 +1507,50 @@
         </variant>
         <variant>
           <configItem>
-            <name>hbs</name>
-            <description>Serbo-Croatian (US)</description>
+            <name>chr</name>
+            <!-- Keyboard indicator for Cherokee layouts -->
+            <shortDescription>chr</shortDescription>
+            <description>Cherokee</description>
             <languageList>
-              <iso639Id>eng</iso639Id>
-              <iso639Id>bos</iso639Id>
-              <iso639Id>hbs</iso639Id>
-              <iso639Id>hrv</iso639Id>
-              <iso639Id>srp</iso639Id>
+              <iso639Id>chr</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>norman</name>
-            <description>English (Norman)</description>
+            <name>haw</name>
+            <!-- Keyboard indicator for Hawaian layouts -->
+            <shortDescription>haw</shortDescription>
+            <description>Hawaiian</description>
+            <languageList>
+              <iso639Id>haw</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>workman</name>
-            <description>English (Workman)</description>
+            <name>rus</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russian (US, phonetic)</description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>workman-intl</name>
-            <description>English (Workman, intl., with dead keys)</description>
-           </configItem>
-         </variant>
+            <name>hbs</name>
+            <description>Serbo-Croatian (US)</description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+              <iso639Id>bos</iso639Id>
+              <iso639Id>hbs</iso639Id>
+              <iso639Id>hrv</iso639Id>
+              <iso639Id>srp</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -1591,6 +1591,14 @@
         </variant>
         <variant>
           <configItem>
+            <name>fa-olpc</name>
+            <!-- Keyboard indicator for Persian layouts -->
+            <shortDescription>fa</shortDescription>
+            <description>Dari (Afghanistan, OLPC)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>ps-olpc</name>
             <!-- Keyboard indicator for Pashto layouts -->
             <shortDescription>ps</shortDescription>
@@ -1602,14 +1610,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>fa-olpc</name>
-            <!-- Keyboard indicator for Persian layouts -->
-            <shortDescription>fa</shortDescription>
-            <description>Dari (Afghanistan, OLPC)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>uz-olpc</name>
             <!-- Keyboard indicator for Uzbek layouts -->
             <shortDescription>uz</shortDescription>
@@ -1655,20 +1655,20 @@
       <variantList>
         <variant>
           <configItem>
-            <name>azerty</name>
-            <description>Arabic (AZERTY)</description>
+            <name>digits</name>
+            <description>Arabic (Eastern Arabic numerals)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>azerty_digits</name>
-            <description>Arabic (AZERTY, Eastern Arabic numerals)</description>
+            <name>azerty</name>
+            <description>Arabic (AZERTY)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>digits</name>
-            <description>Arabic (Eastern Arabic numerals)</description>
+            <name>azerty_digits</name>
+            <description>Arabic (AZERTY, Eastern Arabic numerals)</description>
           </configItem>
         </variant>
         <variant>
@@ -1691,12 +1691,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>olpc</name>
-            <description>Arabic (OLPC)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>mac</name>
             <description>Arabic (Macintosh)</description>
           </configItem>
@@ -1707,6 +1701,12 @@
             <description>Arabic (Macintosh, phonetic)</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>olpc</name>
+            <description>Arabic (OLPC)</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -1771,14 +1771,14 @@
         </variant>
         <variant>
           <configItem>
-            <name>western</name>
-            <description>Armenian (western)</description>
+            <name>eastern-alt</name>
+            <description>Armenian (alt. eastern)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>eastern-alt</name>
-            <description>Armenian (alt. eastern)</description>
+            <name>western</name>
+            <description>Armenian (western)</description>
           </configItem>
         </variant>
       </variantList>
@@ -1875,15 +1875,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>ru</name>
-            <description>Russian (Belarus)</description>
-            <languageList>
-              <iso639Id>rus</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>intl</name>
             <description>Belarusian (intl.)</description>
           </configItem>
@@ -1894,6 +1885,15 @@
             <description>Belarusian (phonetic)</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>ru</name>
+            <description>Russian (Belarus)</description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2104,7 +2104,7 @@
             </languageList>
           </configItem>
         </variant>
-         <variant>
+        <variant>
           <configItem>
             <name>ben_gitanjali</name>
             <description>Bangla (India, Gitanjali)</description>
@@ -2128,10 +2128,12 @@
         </variant>
         <variant>
           <configItem>
-            <name>mni</name>
-            <description>Manipuri (Meitei)</description>
+            <name>eng</name>
+            <!-- Keyboard indicator for English layouts -->
+            <shortDescription>en</shortDescription>
+            <description>English (India, with rupee)</description>
             <languageList>
-              <iso639Id>mni</iso639Id>
+              <iso639Id>eng</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -2159,23 +2161,34 @@
         </variant>
         <variant>
           <configItem>
-            <name>guru</name>
-            <!-- Keyboard indicator for Punjabi layouts -->
-            <shortDescription>pa</shortDescription>
-            <description>Punjabi (Gurmukhi)</description>
+            <name>bolnagri</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <shortDescription>hi</shortDescription>
+            <description>Hindi (Bolnagri)</description>
             <languageList>
-              <iso639Id>pan</iso639Id>
+              <iso639Id>hin</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>jhelum</name>
-            <!-- Keyboard indicator for Punjabi layouts -->
-            <shortDescription>pa</shortDescription>
-            <description>Punjabi (Gurmukhi Jhelum)</description>
+            <name>hin-wx</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <shortDescription>hi</shortDescription>
+            <description>Hindi (Wx)</description>
             <languageList>
-              <iso639Id>pan</iso639Id>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hin-kagapa</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <shortDescription>hi</shortDescription>
+            <description>Hindi (KaGaPa, phonetic)</description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -2233,8 +2246,8 @@
               <iso639Id>mal</iso639Id>
             </languageList>
           </configItem>
-         </variant>
-         <variant>
+        </variant>
+        <variant>
           <configItem>
             <name>mal_poorna</name>
             <!-- Keyboard indicator for Malayalam layouts -->
@@ -2244,9 +2257,38 @@
               <iso639Id>mal</iso639Id>
             </languageList>
           </configItem>
-         </variant>
-         <variant>
-           <configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mni</name>
+            <description>Manipuri (Meitei)</description>
+            <languageList>
+              <iso639Id>mni</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mar-kagapa</name>
+            <!-- Keyboard indicator for Marathi layouts -->
+            <shortDescription>mr</shortDescription>
+            <description>Marathi (KaGaPa, phonetic)</description>
+            <languageList>
+              <iso639Id>mar</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>marathi</name>
+            <description>Marathi (enhanced InScript)</description>
+            <languageList>
+              <iso639Id>mar</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>ori</name>
             <!-- Keyboard indicator for Oriya layouts -->
             <shortDescription>or</shortDescription>
@@ -2285,6 +2327,39 @@
           </configItem>
         </variant>
         <variant>
+          <configItem>
+            <name>guru</name>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <shortDescription>pa</shortDescription>
+            <description>Punjabi (Gurmukhi)</description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <shortDescription>pa</shortDescription>
+            <description>Punjabi (Gurmukhi Jhelum)</description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>san-kagapa</name>
+            <!-- Keyboard indicator for Sanskrit layouts -->
+            <shortDescription>sa</shortDescription>
+            <description>Sanskrit (KaGaPa, phonetic)</description>
+            <languageList>
+              <iso639Id>san</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
            <configItem>
             <name>sat</name>
             <!-- Keyboard indicator for Santali layouts -->
@@ -2430,72 +2505,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>bolnagri</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <shortDescription>hi</shortDescription>
-            <description>Hindi (Bolnagri)</description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>hin-wx</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <shortDescription>hi</shortDescription>
-            <description>Hindi (Wx)</description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>hin-kagapa</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <shortDescription>hi</shortDescription>
-            <description>Hindi (KaGaPa, phonetic)</description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>san-kagapa</name>
-            <!-- Keyboard indicator for Sanskrit layouts -->
-            <shortDescription>sa</shortDescription>
-            <description>Sanskrit (KaGaPa, phonetic)</description>
-            <languageList>
-              <iso639Id>san</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mar-kagapa</name>
-            <!-- Keyboard indicator for Marathi layouts -->
-            <shortDescription>mr</shortDescription>
-            <description>Marathi (KaGaPa, phonetic)</description>
-            <languageList>
-              <iso639Id>mar</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>eng</name>
-            <!-- Keyboard indicator for English layouts -->
-            <shortDescription>en</shortDescription>
-            <description>English (India, with rupee)</description>
-            <languageList>
-              <iso639Id>eng</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>iipa</name>
             <description>Indic IPA</description>
             <languageList>
@@ -2503,15 +2512,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>marathi</name>
-            <description>Marathi (enhanced InScript)</description>
-            <languageList>
-              <iso639Id>mar</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2588,19 +2588,14 @@
         </variant>
         <variant>
           <configItem>
-            <name>rus</name>
-            <!-- Keyboard indicator for Russian layouts -->
-            <shortDescription>ru</shortDescription>
-            <description>Russian (Brazil, phonetic)</description>
-            <languageList>
-              <iso639Id>rus</iso639Id>
-            </languageList>
+            <name>nativo-us</name>
+            <description>Portuguese (Brazil, Nativo for US keyboards)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>nativo-us</name>
-            <description>Portuguese (Brazil, Nativo for US keyboards)</description>
+            <name>thinkpad</name>
+            <description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</description>
           </configItem>
         </variant>
         <variant>
@@ -2614,8 +2609,13 @@
         </variant>
         <variant>
           <configItem>
-            <name>thinkpad</name>
-            <description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</description>
+            <name>rus</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russian (Brazil, phonetic)</description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2671,9 +2671,9 @@
       <variantList>
         <variant>
           <configItem>
-            <name>azerty-deadkeys</name>
+            <name>ber</name>
             <shortDescription>kab</shortDescription>
-            <description>Kabyle (AZERTY, with dead keys)</description>
+            <description>Berber (Algeria, Tifinagh)</description>
             <languageList>
               <iso639Id>kab</iso639Id>
             </languageList>
@@ -2681,9 +2681,9 @@
         </variant>
         <variant>
           <configItem>
-            <name>qwerty-gb-deadkeys</name>
+            <name>azerty-deadkeys</name>
             <shortDescription>kab</shortDescription>
-            <description>Kabyle (QWERTY, UK, with dead keys)</description>
+            <description>Kabyle (AZERTY, with dead keys)</description>
             <languageList>
               <iso639Id>kab</iso639Id>
             </languageList>
@@ -2691,9 +2691,9 @@
         </variant>
         <variant>
           <configItem>
-            <name>qwerty-us-deadkeys</name>
+            <name>qwerty-gb-deadkeys</name>
             <shortDescription>kab</shortDescription>
-            <description>Kabyle (QWERTY, US, with dead keys)</description>
+            <description>Kabyle (QWERTY, UK, with dead keys)</description>
             <languageList>
               <iso639Id>kab</iso639Id>
             </languageList>
@@ -2701,9 +2701,9 @@
         </variant>
         <variant>
           <configItem>
-            <name>ber</name>
+            <name>qwerty-us-deadkeys</name>
             <shortDescription>kab</shortDescription>
-            <description>Berber (Algeria, Tifinagh)</description>
+            <description>Kabyle (QWERTY, US, with dead keys)</description>
             <languageList>
               <iso639Id>kab</iso639Id>
             </languageList>
@@ -2965,48 +2965,48 @@
         </variant>
         <variant>
           <configItem>
-            <name>shn</name>
-            <!-- Keyboard indicator for Shan layouts -->
-            <shortDescription>shn</shortDescription>
-            <description>Shan</description>
+            <name>mnw</name>
+            <!-- Keyboard indicator for Mon layouts -->
+            <shortDescription>mnw</shortDescription>
+            <description>Mon</description>
             <languageList>
-              <iso639Id>shn</iso639Id>
+              <iso639Id>mnw</iso639Id>
               <iso639Id>eng</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>zgt</name>
-            <!-- Keyboard indicator for Shan layouts -->
-            <shortDescription>shn</shortDescription>
-            <description>Shan (Zawgyi Tai)</description>
+            <name>mnw-a1</name>
+            <!-- Keyboard indicator for Mon layouts -->
+            <shortDescription>mnw</shortDescription>
+            <description>Mon (A1)</description>
             <languageList>
-              <iso639Id>shn</iso639Id>
+              <iso639Id>mnw</iso639Id>
               <iso639Id>eng</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>mnw</name>
-            <!-- Keyboard indicator for Mon layouts -->
-            <shortDescription>mnw</shortDescription>
-            <description>Mon</description>
+            <name>shn</name>
+            <!-- Keyboard indicator for Shan layouts -->
+            <shortDescription>shn</shortDescription>
+            <description>Shan</description>
             <languageList>
-              <iso639Id>mnw</iso639Id>
+              <iso639Id>shn</iso639Id>
               <iso639Id>eng</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>mnw-a1</name>
-            <!-- Keyboard indicator for Mon layouts -->
-            <shortDescription>mnw</shortDescription>
-            <description>Mon (A1)</description>
+            <name>zgt</name>
+            <!-- Keyboard indicator for Shan layouts -->
+            <shortDescription>shn</shortDescription>
+            <description>Shan (Zawgyi Tai)</description>
             <languageList>
-              <iso639Id>mnw</iso639Id>
+              <iso639Id>shn</iso639Id>
               <iso639Id>eng</iso639Id>
             </languageList>
           </configItem>
@@ -3051,23 +3051,23 @@
         </variant>
         <variant>
           <configItem>
-            <name>ike</name>
-            <!-- Keyboard indicator for Inuktikut layouts -->
-            <shortDescription>ike</shortDescription>
-            <description>Inuktitut</description>
+            <name>eng</name>
+            <!-- Keyboard indicator for English layouts -->
+            <shortDescription>en</shortDescription>
+            <description>English (Canada)</description>
             <languageList>
-              <iso639Id>iku</iso639Id>
+              <iso639Id>eng</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>eng</name>
-            <!-- Keyboard indicator for English layouts -->
-            <shortDescription>en</shortDescription>
-            <description>English (Canada)</description>
+            <name>ike</name>
+            <!-- Keyboard indicator for Inuktikut layouts -->
+            <shortDescription>ike</shortDescription>
+            <description>Inuktitut</description>
             <languageList>
-              <iso639Id>eng</iso639Id>
+              <iso639Id>iku</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -3102,7 +3102,15 @@
         </languageList>
       </configItem>
       <variantList>
-
+        <variant>
+          <configItem>
+            <name>altgr-pinyin</name>
+            <description>Hanyu Pinyin Letters (with AltGr dead keys)</description>
+            <languageList>
+              <iso639Id>zho</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>mon_trad</name>
@@ -3196,15 +3204,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>altgr-pinyin</name>
-            <description>Hanyu Pinyin Letters (with AltGr dead keys)</description>
-            <languageList>
-              <iso639Id>zho</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3500,10 +3499,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>ku_f</name>
+            <name>ku_alt</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
-            <description>Kurdish (Iran, F)</description>
+            <description>Kurdish (Iran, Latin Alt-Q)</description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -3511,10 +3510,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>ku_alt</name>
+            <name>ku_f</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
-            <description>Kurdish (Iran, Latin Alt-Q)</description>
+            <description>Kurdish (Iran, F)</description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -3561,10 +3560,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>ku_f</name>
+            <name>ku_alt</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
-            <description>Kurdish (Iraq, F)</description>
+            <description>Kurdish (Iraq, Latin Alt-Q)</description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -3572,10 +3571,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>ku_alt</name>
+            <name>ku_f</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
-            <description>Kurdish (Iraq, Latin Alt-Q)</description>
+            <description>Kurdish (Iraq, F)</description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -3650,6 +3649,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>mac</name>
+            <description>Finnish (Macintosh)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>smi</name>
             <description>Northern Saami (Finland)</description>
             <languageList>
@@ -3657,12 +3662,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>mac</name>
-            <description>Finnish (Macintosh)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3693,14 +3692,14 @@
         </variant>
         <variant>
           <configItem>
-            <name>oss_latin9</name>
-            <description>French (alt., Latin-9 only)</description>
+            <name>oss_nodeadkeys</name>
+            <description>French (alt., no dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>oss_nodeadkeys</name>
-            <description>French (alt., no dead keys)</description>
+            <name>oss_latin9</name>
+            <description>French (alt., Latin-9 only)</description>
           </configItem>
         </variant>
         <variant>
@@ -3717,6 +3716,18 @@
         </variant>
         <variant>
           <configItem>
+            <name>azerty</name>
+            <description>French (AZERTY)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>afnor</name>
+            <description>French (AZERTY, AFNOR)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>bepo</name>
             <description>French (BEPO)</description>
           </configItem>
@@ -3747,14 +3758,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>azerty</name>
-            <description>French (AZERTY)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>afnor</name>
-            <description>French (AZERTY, AFNOR)</description>
+            <name>us</name>
+            <description>French (US)</description>
           </configItem>
         </variant>
         <variant>
@@ -3784,12 +3789,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>us</name>
-            <description>French (US)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3814,6 +3813,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>gillbt</name>
+            <description>English (Ghana, GILLBT)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>akan</name>
             <!-- Keyboard indicator for Akan layouts -->
             <shortDescription>ak</shortDescription>
@@ -3825,6 +3830,17 @@
         </variant>
         <variant>
           <configItem>
+            <name>avn</name>
+            <!-- Keyboard indicator for Avatime layouts -->
+            <shortDescription>avn</shortDescription>
+            <description>Avatime</description>
+            <languageList>
+              <iso639Id>avn</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>ewe</name>
             <!-- Keyboard indicator for Ewe layouts -->
             <shortDescription>ee</shortDescription>
@@ -3867,23 +3883,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>avn</name>
-            <!-- Keyboard indicator for Avatime layouts -->
-            <shortDescription>avn</shortDescription>
-            <description>Avatime</description>
-            <languageList>
-              <iso639Id>avn</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>gillbt</name>
-            <description>English (Ghana, GILLBT)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3929,21 +3928,21 @@
         </variant>
         <variant>
           <configItem>
-            <name>ru</name>
-            <!-- Keyboard indicator for Russian layouts -->
-            <shortDescription>ru</shortDescription>
-            <description>Russian (Georgia)</description>
+            <name>os</name>
+            <description>Ossetian (Georgia)</description>
             <languageList>
-              <iso639Id>rus</iso639Id>
+              <iso639Id>oss</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>os</name>
-            <description>Ossetian (Georgia)</description>
+            <name>ru</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russian (Georgia)</description>
             <languageList>
-              <iso639Id>oss</iso639Id>
+              <iso639Id>rus</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -3977,6 +3976,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>deadtilde</name>
+            <description>German (dead tilde)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>nodeadkeys</name>
             <description>German (no dead keys)</description>
           </configItem>
@@ -4007,26 +4012,20 @@
         </variant>
         <variant>
           <configItem>
-            <name>ro</name>
-            <description>Romanian (Germany)</description>
-            <languageList>
-              <iso639Id>ron</iso639Id>
-            </languageList>
+            <name>dvorak</name>
+            <description>German (Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>ro_nodeadkeys</name>
-            <description>Romanian (Germany, no dead keys)</description>
-            <languageList>
-              <iso639Id>ron</iso639Id>
-            </languageList>
+            <name>mac</name>
+            <description>German (Macintosh)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>dvorak</name>
-            <description>German (Dvorak)</description>
+            <name>mac_nodeadkeys</name>
+            <description>German (Macintosh, no dead keys)</description>
           </configItem>
         </variant>
         <variant>
@@ -4037,14 +4036,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>mac</name>
-            <description>German (Macintosh)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mac_nodeadkeys</name>
-            <description>German (Macintosh, no dead keys)</description>
+            <name>qwerty</name>
+            <description>German (QWERTY)</description>
           </configItem>
         </variant>
         <variant>
@@ -4067,16 +4060,19 @@
         </variant>
         <variant>
           <configItem>
-            <name>qwerty</name>
-            <description>German (QWERTY)</description>
+            <name>ro</name>
+            <description>Romanian (Germany)</description>
+            <languageList>
+              <iso639Id>ron</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>tr</name>
-            <description>Turkish (Germany)</description>
+            <name>ro_nodeadkeys</name>
+            <description>Romanian (Germany, no dead keys)</description>
             <languageList>
-              <iso639Id>tur</iso639Id>
+              <iso639Id>ron</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -4093,8 +4089,11 @@
         </variant>
         <variant>
           <configItem>
-            <name>deadtilde</name>
-            <description>German (dead tilde)</description>
+            <name>tr</name>
+            <description>Turkish (Germany)</description>
+            <languageList>
+              <iso639Id>tur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4383,15 +4382,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>geo</name>
-            <description>Georgian (Italy)</description>
-            <languageList>
-              <iso639Id>kat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>ibm</name>
             <description>Italian (IBM 142)</description>
           </configItem>
@@ -4414,6 +4404,15 @@
         </variant>
         <variant>
           <configItem>
+            <name>fur</name>
+            <description>Friulian (Italy)</description>
+            <languageList>
+              <iso639Id>fur</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>scn</name>
             <description>Sicilian</description>
             <languageList>
@@ -4424,10 +4423,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>fur</name>
-            <description>Friulian (Italy)</description>
+            <name>geo</name>
+            <description>Georgian (Italy)</description>
             <languageList>
-              <iso639Id>fur</iso639Id>
+              <iso639Id>kat</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -4532,10 +4531,8 @@
       <variantList>
         <variant>
           <configItem>
-            <name>ruskaz</name>
-            <!-- Keyboard indicator for Russian layouts -->
-            <shortDescription>ru</shortDescription>
-            <description>Russian (Kazakhstan, with Kazakh)</description>
+            <name>kazrus</name>
+            <description>Kazakh (with Russian)</description>
             <languageList>
               <iso639Id>kaz</iso639Id>
               <iso639Id>rus</iso639Id>
@@ -4544,18 +4541,17 @@
         </variant>
         <variant>
           <configItem>
-            <name>kazrus</name>
-            <description>Kazakh (with Russian)</description>
+            <name>ext</name>
+            <description>Kazakh (extended)</description>
             <languageList>
               <iso639Id>kaz</iso639Id>
-              <iso639Id>rus</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>ext</name>
-            <description>Kazakh (extended)</description>
+            <name>latin</name>
+            <description>Kazakh (Latin)</description>
             <languageList>
               <iso639Id>kaz</iso639Id>
             </languageList>
@@ -4563,10 +4559,13 @@
         </variant>
         <variant>
           <configItem>
-            <name>latin</name>
-            <description>Kazakh (Latin)</description>
+            <name>ruskaz</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russian (Kazakhstan, with Kazakh)</description>
             <languageList>
               <iso639Id>kaz</iso639Id>
+              <iso639Id>rus</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -4703,6 +4702,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>ratise</name>
+            <description>Lithuanian (Ratise)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>sgs</name>
             <description>Samogitian</description>
             <languageList>
@@ -4710,12 +4715,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>ratise</name>
-            <description>Lithuanian (Ratise)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4819,6 +4818,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>cyrillicalternatequotes</name>
+            <description>Montenegrin (Cyrillic, with guillemets)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>latinunicode</name>
             <description>Montenegrin (Latin, Unicode)</description>
           </configItem>
@@ -4837,12 +4842,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>cyrillicalternatequotes</name>
-            <description>Montenegrin (Cyrillic, with guillemets)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>latinalternatequotes</name>
             <description>Montenegrin (Latin, with guillemets)</description>
           </configItem>
@@ -4950,56 +4949,56 @@
         </variant>
         <variant>
           <configItem>
-            <name>dvorak</name>
-            <description>Norwegian (Dvorak)</description>
+            <name>mac</name>
+            <description>Norwegian (Macintosh)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>smi</name>
-            <description>Northern Saami (Norway)</description>
-            <languageList>
-              <iso639Id>sme</iso639Id>
-            </languageList>
+            <name>mac_nodeadkeys</name>
+            <description>Norwegian (Macintosh, no dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>smi_nodeadkeys</name>
-            <description>Northern Saami (Norway, no dead keys)</description>
-            <languageList>
-              <iso639Id>sme</iso639Id>
-            </languageList>
+            <name>colemak</name>
+            <description>Norwegian (Colemak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>mac</name>
-            <description>Norwegian (Macintosh)</description>
+            <name>colemak_dh</name>
+            <description>Norwegian (Colemak-DH)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>mac_nodeadkeys</name>
-            <description>Norwegian (Macintosh, no dead keys)</description>
+            <name>colemak_dh_wide</name>
+            <description>Norwegian (Colemak-DH Wide)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>colemak</name>
-            <description>Norwegian (Colemak)</description>
+            <name>dvorak</name>
+            <description>Norwegian (Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>colemak_dh</name>
-            <description>Norwegian (Colemak-DH)</description>
+            <name>smi</name>
+            <description>Northern Saami (Norway)</description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>colemak_dh_wide</name>
-            <description>Norwegian (Colemak-DH Wide)</description>
+            <name>smi_nodeadkeys</name>
+            <description>Northern Saami (Norway, no dead keys)</description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -5050,6 +5049,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>dvp</name>
+            <description>Polish (programmer Dvorak)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>csb</name>
             <description>Kashubian</description>
             <languageList>
@@ -5077,12 +5082,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>dvp</name>
-            <description>Polish (programmer Dvorak)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -5202,6 +5201,18 @@
         </variant>
         <variant>
           <configItem>
+            <name>phonetic_azerty</name>
+            <description>Russian (phonetic, AZERTY)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic_dvorak</name>
+            <description>Russian (phonetic, Dvorak)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>typewriter</name>
             <description>Russian (typewriter)</description>
           </configItem>
@@ -5233,28 +5244,31 @@
         </variant>
         <variant>
           <configItem>
-            <name>tt</name>
-            <description>Tatar</description>
-            <languageList>
-              <iso639Id>tat</iso639Id>
-            </languageList>
+            <name>dos</name>
+            <description>Russian (DOS)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>os_legacy</name>
-            <description>Ossetian (legacy)</description>
+            <name>mac</name>
+            <description>Russian (Macintosh)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ab</name>
+            <description>Abkhazian (Russia)</description>
             <languageList>
-              <iso639Id>oss</iso639Id>
+              <iso639Id>abk</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>os_winkeys</name>
-            <description>Ossetian (Windows)</description>
+            <name>bak</name>
+            <description>Bashkirian</description>
             <languageList>
-              <iso639Id>oss</iso639Id>
+              <iso639Id>bak</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -5278,10 +5292,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>udm</name>
-            <description>Udmurt</description>
+            <name>xal</name>
+            <description>Kalmyk</description>
             <languageList>
-              <iso639Id>udm</iso639Id>
+              <iso639Id>xal</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -5296,32 +5310,29 @@
         </variant>
         <variant>
           <configItem>
-            <name>sah</name>
-            <description>Yakut</description>
+            <name>chm</name>
+            <description>Mari</description>
             <languageList>
-              <iso639Id>sah</iso639Id>
+              <iso639Id>chm</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>xal</name>
-            <description>Kalmyk</description>
+            <name>os_legacy</name>
+            <description>Ossetian (legacy)</description>
             <languageList>
-              <iso639Id>xal</iso639Id>
+              <iso639Id>oss</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>dos</name>
-            <description>Russian (DOS)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mac</name>
-            <description>Russian (Macintosh)</description>
+            <name>os_winkeys</name>
+            <description>Ossetian (Windows)</description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
@@ -5336,40 +5347,28 @@
         </variant>
         <variant>
           <configItem>
-            <name>bak</name>
-            <description>Bashkirian</description>
+            <name>tt</name>
+            <description>Tatar</description>
             <languageList>
-              <iso639Id>bak</iso639Id>
+              <iso639Id>tat</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>chm</name>
-            <description>Mari</description>
+            <name>udm</name>
+            <description>Udmurt</description>
             <languageList>
-              <iso639Id>chm</iso639Id>
+              <iso639Id>udm</iso639Id>
             </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>phonetic_azerty</name>
-            <description>Russian (phonetic, AZERTY)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>phonetic_dvorak</name>
-            <description>Russian (phonetic, Dvorak)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ab</name>
-            <description>Abkhazian (Russia)</description>
+            <name>sah</name>
+            <description>Yakut</description>
             <languageList>
-              <iso639Id>abk</iso639Id>
+              <iso639Id>sah</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -5391,6 +5390,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>alternatequotes</name>
+            <description>Serbian (Cyrillic, with guillemets)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>yz</name>
             <description>Serbian (Cyrillic, ZE and ZHE swapped)</description>
           </configItem>
@@ -5403,6 +5408,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>latinalternatequotes</name>
+            <description>Serbian (Latin, with guillemets)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>latinunicode</name>
             <description>Serbian (Latin, Unicode)</description>
           </configItem>
@@ -5421,18 +5432,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>alternatequotes</name>
-            <description>Serbian (Cyrillic, with guillemets)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latinalternatequotes</name>
-            <description>Serbian (Latin, with guillemets)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>rue</name>
             <description>Pannonian Rusyn</description>
             <languageList>
@@ -5526,14 +5525,14 @@
         </variant>
         <variant>
           <configItem>
-            <name>winkeys</name>
-            <description>Spanish (Windows)</description>
+            <name>deadtilde</name>
+            <description>Spanish (dead tilde)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>deadtilde</name>
-            <description>Spanish (dead tilde)</description>
+            <name>winkeys</name>
+            <description>Spanish (Windows)</description>
           </configItem>
         </variant>
         <variant>
@@ -5592,22 +5591,14 @@
         </variant>
         <variant>
           <configItem>
-            <name>rus</name>
-            <!-- Keyboard indicator for Russian layouts -->
-            <shortDescription>ru</shortDescription>
-            <description>Russian (Sweden, phonetic)</description>
-            <languageList>
-              <iso639Id>rus</iso639Id>
-            </languageList>
+            <name>us_dvorak</name>
+            <description>Swedish (Dvorak, intl.)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>smi</name>
-            <description>Northern Saami (Sweden)</description>
-            <languageList>
-              <iso639Id>sme</iso639Id>
-            </languageList>
+            <name>svdvorak</name>
+            <description>Swedish (Svdvorak)</description>
           </configItem>
         </variant>
         <variant>
@@ -5618,28 +5609,36 @@
         </variant>
         <variant>
           <configItem>
-            <name>svdvorak</name>
-            <description>Swedish (Svdvorak)</description>
+            <name>us</name>
+            <description>Swedish (US)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>us_dvorak</name>
-            <description>Swedish (Dvorak, intl.)</description>
+            <name>swl</name>
+            <description>Swedish Sign Language</description>
+            <languageList>
+              <iso639Id>swl</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>us</name>
-            <description>Swedish (US)</description>
+            <name>smi</name>
+            <description>Northern Saami (Sweden)</description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>swl</name>
-            <description>Swedish Sign Language</description>
+            <name>rus</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russian (Sweden, phonetic)</description>
             <languageList>
-              <iso639Id>swl</iso639Id>
+              <iso639Id>rus</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -5676,6 +5675,14 @@
         </variant>
         <variant>
           <configItem>
+            <name>de_mac</name>
+            <!-- Keyboard indicator for German layouts -->
+            <shortDescription>de</shortDescription>
+            <description>German (Switzerland, Macintosh)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>fr</name>
             <!-- Keyboard indicator for French layouts -->
             <shortDescription>fr</shortDescription>
@@ -5707,14 +5714,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>de_mac</name>
-            <!-- Keyboard indicator for German layouts -->
-            <shortDescription>de</shortDescription>
-            <description>German (Switzerland, Macintosh)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -5760,10 +5759,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>ku_f</name>
+            <name>ku_alt</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
-            <description>Kurdish (Syria, F)</description>
+            <description>Kurdish (Syria, Latin Alt-Q)</description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -5771,10 +5770,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>ku_alt</name>
+            <name>ku_f</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
-            <description>Kurdish (Syria, Latin Alt-Q)</description>
+            <description>Kurdish (Syria, F)</description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -5820,6 +5819,14 @@
       <variantList>
         <variant>
           <configItem>
+            <name>us</name>
+            <!-- Keyboard indicator for Sinhala layouts -->
+            <shortDescription>si</shortDescription>
+            <description>Sinhala (US)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>tam_unicode</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <shortDescription>ta</shortDescription>
@@ -5838,14 +5845,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>us</name>
-            <!-- Keyboard indicator for Sinhala layouts -->
-            <shortDescription>si</shortDescription>
-            <description>Sinhala (US)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -5910,6 +5909,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>intl</name>
+            <description>Turkish (intl., with dead keys)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>ku</name>
             <!-- Keyboard indicator for Kurdish layouts -->
             <shortDescription>ku</shortDescription>
@@ -5941,12 +5946,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>intl</name>
-            <description>Turkish (intl., with dead keys)</description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -6149,17 +6148,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>pl</name>
-            <!-- Keyboard indicator for Polish layouts -->
-            <shortDescription>pl</shortDescription>
-            <description>Polish (British keyboard)</description>
-            <languageList>
-              <iso639Id>pol</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>gla</name>
             <shortDescription>gd</shortDescription>
             <description>Scottish Gaelic</description>
@@ -6173,6 +6161,17 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>pl</name>
+            <!-- Keyboard indicator for Polish layouts -->
+            <shortDescription>pl</shortDescription>
+            <description>Polish (British keyboard)</description>
+            <languageList>
+              <iso639Id>pol</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -6269,6 +6268,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>UnicodeExpert</name>
+            <description>Irish (UnicodeExpert)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>CloGaelach</name>
             <description>CloGaelach</description>
             <languageList>
@@ -6278,12 +6283,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>UnicodeExpert</name>
-            <description>Irish (UnicodeExpert)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>ogam</name>
             <description>Ogham</description>
             <languageList>
@@ -6432,6 +6431,17 @@
       <variantList>
         <variant>
           <configItem>
+            <name>hausa</name>
+            <!-- Keyboard indicator for Hausa layouts -->
+            <shortDescription>ha</shortDescription>
+            <description>Hausa (Nigeria)</description>
+            <languageList>
+              <iso639Id>hau</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>igbo</name>
             <!-- Keyboard indicator for Igbo layouts -->
             <shortDescription>ig</shortDescription>
@@ -6452,17 +6462,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>hausa</name>
-            <!-- Keyboard indicator for Hausa layouts -->
-            <shortDescription>ha</shortDescription>
-            <description>Hausa (Nigeria)</description>
-            <languageList>
-              <iso639Id>hau</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -6886,12 +6885,6 @@
       <variantList>
        <variant>
          <configItem>
-          <name>javanese</name>
-            <description>Javanese</description>
-         </configItem>
-       </variant>
-       <variant>
-         <configItem>
           <name>melayu-phonetic</name>
             <description>Indonesian (Arab Melayu, phonetic)</description>
          </configItem>
@@ -6908,6 +6901,12 @@
             <description>Indonesian (Arab Pegon, phonetic)</description>
          </configItem>
        </variant>
+       <variant>
+         <configItem>
+          <name>javanese</name>
+            <description>Javanese</description>
+         </configItem>
+       </variant>
       </variantList>
     </layout>
     <layout>