Fixed descriptions for Crimean Tatar layouts

https://bugs.freedesktop.org/show_bug.cgi?id=35787

5 files changed, 28 insertions, 142 deletions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index a01b283f..0f5e60dd 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3792,26 +3792,9 @@
         </variant>
         <variant>
           <configItem>
-            <name>crh_f</name>
-            <_description>Romanian (Crimean Tatar Turkish F)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_alt</name>
-            <_description>Romanian (Crimean Tatar Turkish Alt-Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>crh_dobruca1</name>
-            <_description>Romanian (Crimean Tatar Dobruca-1 Q)</_description>
+            <_shortDescription>crh</_shortDescription>
+            <_description>Crimean Tatar (Dobruja-1 Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3820,7 +3803,8 @@
         <variant>
           <configItem>
             <name>crh_dobruca2</name>
-            <_description>Romanian (Crimean Tatar Dobruca-2 Q)</_description>
+            <_shortDescription>crh</_shortDescription>
+            <_description>Crimean Tatar (Dobruja-2 Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4499,7 +4483,8 @@
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Turkish (Crimean Tatar Turkish Q)</_description>
+            <_shortDescription>crh</_shortDescription>
+            <_description>Crimean Tatar (Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4508,7 +4493,8 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Turkish (Crimean Tatar Turkish F)</_description>
+            <_shortDescription>crh</_shortDescription>
+            <_description>Crimean Tatar (Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4517,7 +4503,8 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Turkish (Crimean Tatar Turkish Alt-Q)</_description>
+            <_shortDescription>crh</_shortDescription>
+            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4618,33 +4605,6 @@
             <_description>Ukrainian (homophonic)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>crh</name>
-            <_description>Ukrainian (Crimean Tatar Turkish Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_f</name>
-            <_description>Ukrainian (Crimean Tatar Turkish F)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_alt</name>
-            <_description>Ukrainian (Crimean Tatar Turkish Alt-Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4717,33 +4677,6 @@
             <_description>Uzbek (Latin)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>crh</name>
-            <_description>Uzbek (Crimean Tatar Turkish Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_f</name>
-            <_description>Uzbek (Crimean Tatar Turkish F)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_alt</name>
-            <_description>Uzbek (Crimean Tatar Turkish Alt-Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
diff --git a/symbols/ro b/symbols/ro
index f37a60da..eda5325c 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -192,21 +192,16 @@ xkb_symbols "winkeys" {
 
 };
 
-// Crimean Tatar (Crimean Turkish) layouts.
-partial
-xkb_symbols "crh_f" {
-    include "tr(crh_f)"
-
-    name[Group1]="Romania - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
-    include "tr(crh_alt)"
-
-    name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
-};
-
+// Romania-specific Crimean Tatar (Crimean Turkish) layouts.
+// F layout is not included, at least for the time being, given that the common
+// F layout is now available in the UI (which is now locale-based) right next to
+// these country-specific layouts (in addition, Q (qwerty) physical keyboards
+// are usually used in Romania).
+// There is only 1 Alt-Q layout variant, so there is no longer any need to
+// include it here, assuming locale-based keyboard layout listing is provided by
+// the UI going forward.
+// Reşat SABIQ <tilde.birlik @ gmail . com>, 2009
+// Özgür Qarahan <qarahan @ gmail . com>, 2009
 partial
 xkb_symbols "crh_dobruca1" {
     include "tr(crh)"
diff --git a/symbols/tr b/symbols/tr
index 6553d185..6092ce1c 100644
--- a/symbols/tr
+++ b/symbols/tr
@@ -294,12 +294,14 @@ xkb_symbols "olpc" {
 
 };
 
-// Crimean Tatar (Crimean Turkish) layouts. 
-// First released: 2009.
-// These layouts are currently experimental. In particular, the mapping of letter 'x', 
-// included for foreign words and shortcuts, might change in the future...
-// Reşat SABIQ <tilde.birlik @ gmail . com>
-// Özgür Qarahan <qarahan @ gmail . com>
+// Crimean Tatar (Crimean Turkish) layouts.
+// First released (by Ubuntu): 2009-02-24.
+// These layouts are not yet standard. In particular, the mapping of 
+// letter 'x' might change in the future. This letter is not used in the 
+// current official alphabet, but is included in the layouts for foreign words
+// and shortcuts.
+// Reşat SABIQ <tilde.birlik @ gmail . com>, 2009
+// Özgür Qarahan <qarahan @ gmail . com>, 2009
 
 // Crimean Tatar (Crimean Turkish) Q Layout
 partial
diff --git a/symbols/ua b/symbols/ua
index 788a8664..ac8e4a27 100644
--- a/symbols/ua
+++ b/symbols/ua
@@ -306,25 +306,3 @@ xkb_symbols "homophonic" {
   key <AB09> {   [ period,            greater	          ]    };
   key <AB10> {   [ slash,             question            ]    };
 };
-
-// Crimean Tatar (Crimean Turkish) layouts.
-partial
-xkb_symbols "crh" {
-    include "tr(crh)"
-
-    name[Group1]="Ukraine - Crimean Tatar (Turkish Q)";
-};
-
-partial
-xkb_symbols "crh_f" {
-    include "tr(crh_f)"
-
-    name[Group1]="Ukraine - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
-    include "tr(crh_alt)"
-
-    name[Group1]="Ukraine - Crimean Tatar (Turkish Alt-Q)";
-};
diff --git a/symbols/uz b/symbols/uz
index e580c44c..68862bbc 100644
--- a/symbols/uz
+++ b/symbols/uz
@@ -96,25 +96,3 @@ xkb_symbols "latin" {
     name[Group1]= "Uzbekistan - Latin";
     key <AC11>  { [0x010002BB, quotedbl] };
 };
-
-// Crimean Tatar (Crimean Turkish) layouts.
-partial
-xkb_symbols "crh" {
-    include "tr(crh)"
-
-    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Q)";
-};
-
-partial
-xkb_symbols "crh_f" {
-    include "tr(crh_f)"
-
-    name[Group1]="Uzbekistan - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
-    include "tr(crh_alt)"
-
-    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Alt-Q)";
-};