Small polish on descriptions, more consistency

1 files changed, 50 insertions, 48 deletions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 429eadd..13d0da7 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1584,7 +1584,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>German (Austria, Mac)</_description>
+            <_description>German (Austria, Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2128,8 +2128,8 @@
     <layout>
       <configItem>
         <name>ca</name>
-        <_shortDescription>en</_shortDescription>
-        <_description>English (Canada)</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Canada)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2227,7 +2227,7 @@
         <variant>
           <configItem>
             <name>tib</name>
-            <_description>Chinese (Tibetan)</_description>
+            <_description>Tibetan</_description>
             <languageList>
               <iso639Id>tib</iso639Id>
             </languageList>
@@ -2236,7 +2236,7 @@
         <variant>
           <configItem>
             <name>tib_asciinum</name>
-            <_description>Chinese (Tibetan with ASCII numerals)</_description>
+            <_description>Tibetan (with ASCII numerals)</_description>
             <languageList>
               <iso639Id>tib</iso639Id>
             </languageList>
@@ -2245,7 +2245,7 @@
         <variant>
           <configItem>
             <name>uig</name>
-            <_description>Chinese (Uyghur)</_description>
+            <_description>Uyghur</_description>
             <languageList>
               <iso639Id>uig</iso639Id>
             </languageList>
@@ -2266,13 +2266,13 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Croatian (Use guillemets for quotes)</_description>
+            <_description>Croatian (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Croatian (Use Croatian digraphs)</_description>
+            <_description>Croatian (use Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2302,7 +2302,7 @@
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Czech (With &lt;\|&gt; key)</_description>
+            <_description>Czech (with &lt;\|&gt; key)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2320,7 +2320,7 @@
         <variant>
           <configItem>
             <name>ucw</name>
-            <_description>Czech (UCW layout accented letters only)</_description>
+            <_description>Czech (UCW layout, accented letters only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2350,13 +2350,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Danish (Mac)</_description>
+            <_description>Danish (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Danish (Mac, eliminate dead keys)</_description>
+            <_description>Danish (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2386,7 +2386,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Dutch (Mac)</_description>
+            <_description>Dutch (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2477,7 +2477,7 @@
           <configItem>
             <name>ku_alt</name>
             <_shortDescription>ku</_shortDescription>
-            <_description>Kurdish (Iran, latin alt-Q)</_description>
+            <_description>Kurdish (Iran, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2589,7 +2589,7 @@
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Finnish (northern Saami)</_description>
+            <_description>Saami (Finland)</_description>
             <languageList><iso639Id>smi</iso639Id>
                           <iso639Id>sme</iso639Id></languageList>
           </configItem>
@@ -2597,7 +2597,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Finnish (Mac)</_description>
+            <_description>Finnish (Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2651,7 +2651,7 @@
         <variant>
           <configItem>
             <name>latin9</name>
-            <_description>French (legacy alternative)</_description>
+            <_description>French (legacy, alternative)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2687,7 +2687,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>French (Mac)</_description>
+            <_description>French (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2699,7 +2699,7 @@
         <variant>
           <configItem>
             <name>oci</name>
-            <_description>French (Occitan)</_description>
+            <_description>Occitan</_description>
             <languageList>
               <iso639Id>oci</iso639Id>
             </languageList>
@@ -2708,7 +2708,7 @@
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>French (Georgian AZERTY Tskapo)</_description>
+            <_description>Georgian (France, AZERTY Tskapo)</_description>
             <languageList>
               <iso639Id>geo</iso639Id>
             </languageList>
@@ -2846,7 +2846,7 @@
         <variant>
           <configItem>
             <name>os</name>
-            <_description>Georgian (Ossetian)</_description>
+            <_description>Ossetian (Georgia)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -2885,13 +2885,15 @@
         <variant>
           <configItem>
             <name>ro</name>
-            <_description>German (Romanian keyboard with German letters)</_description>
+            <_description>Romanian (Germany)</_description>
+            <languageList><iso639Id>rum</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro_nodeadkeys</name>
-            <_description>German (Romanian keyboard with German letters, eliminate dead keys)</_description>
+            <_description>Romanian (Germany, eliminate dead keys)</_description>
+            <languageList><iso639Id>rum</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
@@ -2915,19 +2917,19 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>German (Mac)</_description>
+            <_description>German (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>German (Mac, eliminate dead keys)</_description>
+            <_description>German (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb</name>
-            <_description>German (lower Sorbian)</_description>
+            <_description>Lower Sorbian</_description>
             <languageList>
               <iso639Id>dsb</iso639Id>
             </languageList>
@@ -2936,7 +2938,7 @@
         <variant>
           <configItem>
             <name>dsb_qwertz</name>
-            <_description>German (lower Sorbian qwertz)</_description>
+            <_description>Lower Sorbian (qwertz)</_description>
             <languageList>
               <iso639Id>dsb</iso639Id>
             </languageList>
@@ -3146,7 +3148,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Icelandic (Mac)</_description>
+            <_description>Icelandic (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
@@ -3176,13 +3178,13 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Hebrew (Phonetic)</_description>
+            <_description>Hebrew (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>biblical</name>
-            <_description>Hebrew (Tiro)</_description>
+            <_description>Hebrew (Biblical, Tiro)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3206,7 +3208,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Italian (Mac)</_description>
+            <_description>Italian (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
@@ -3218,7 +3220,7 @@
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Italian (Georgian)</_description>
+            <_description>Georgian (Italy)</_description>
             <languageList>
               <iso639Id>geo</iso639Id>
             </languageList>
@@ -3257,7 +3259,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Japanese (Mac)</_description>
+            <_description>Japanese (Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3620,13 +3622,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Norwegian (Mac)</_description>
+            <_description>Norwegian (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Norwegian (Mac, eliminate dead keys)</_description>
+            <_description>Norwegian (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3717,19 +3719,19 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Portuguese (Mac)</_description>
+            <_description>Portuguese (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Portuguese (Mac, eliminate dead keys)</_description>
+            <_description>Portuguese (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_sundeadkeys</name>
-            <_description>Portuguese (Mac, Sun dead keys)</_description>
+            <_description>Portuguese (Macintosh, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4154,7 +4156,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Spanish (Mac)</_description>
+            <_description>Spanish (Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4213,7 +4215,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Swedish (Mac)</_description>
+            <_description>Swedish (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4228,7 +4230,7 @@
       <configItem>
         <name>ch</name>
         <_shortDescription>che</_shortDescription>
-        <_description>Swiss</_description>
+        <_description>German</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>gsw</iso639Id></languageList>
       </configItem>
@@ -4236,7 +4238,7 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Swiss (legacy)</_description>
+            <_description>German (Switzerland, legacy)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4287,7 +4289,7 @@
           <configItem>
             <name>fr_mac</name>
             <_shortDescription>fr</_shortDescription>
-            <_description>French (Switzerland, Mac)</_description>
+            <_description>French (Switzerland, Macintosh)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4297,7 +4299,7 @@
           <configItem>
             <name>de_mac</name>
             <_shortDescription>de</_shortDescription>
-            <_description>German (Switzerland, Mac)</_description>
+            <_description>German (Switzerland, Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4683,13 +4685,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>English (UK, Mac)</_description>
+            <_description>English (UK, Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_intl</name>
-            <_description>English (UK, Mac international)</_description>
+            <_description>English (UK, Macintosh international)</_description>
           </configItem>
         </variant>
         <variant>
@@ -5050,7 +5052,7 @@
           <configItem>
             <name>us-mac</name>
             <_shortDescription>en</_shortDescription>
-            <_description>English (Mali, USA Mac)</_description>
+            <_description>English (Mali, USA Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
@@ -5975,7 +5977,7 @@
       <option>
         <configItem>
           <name>numpad:mac</name>
-          <_description>Numeric keypad keys work as with Mac</_description>
+          <_description>Numeric keypad keys work as with Macintosh</_description>
         </configItem>
       </option>
       <option>