Unneeded Crimean Tatar variants removed from Romanian file

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

2 files changed, 16 insertions, 41 deletions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 0f5e60dd..941183ef 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3792,19 +3792,9 @@
         </variant>
         <variant>
           <configItem>
-            <name>crh_dobruca1</name>
+            <name>crh_dobruja</name>
             <_shortDescription>crh</_shortDescription>
-            <_description>Crimean Tatar (Dobruja-1 Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_dobruca2</name>
-            <_shortDescription>crh</_shortDescription>
-            <_description>Crimean Tatar (Dobruja-2 Q)</_description>
+            <_description>Crimean Tatar (Dobruja Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
diff --git a/symbols/ro b/symbols/ro
index eda5325c..1d405a76 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -192,39 +192,24 @@ xkb_symbols "winkeys" {
 
 };
 
-// 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)"
-
-    name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
-
-    key <AD05>	{ [         t,          T,       tcedilla,       Tcedilla ]	};
-    key <AD10>	{ [         p,          P,         abreve,         Abreve ]	};
-
-    key <AC04>	{ [         f,          F,         ibreve,         Ibreve ]	};
-    key <AC07>	{ [    iacute,     Iacute,              j,              J ]	};
+xkb_symbols "crh_dobruja" {
+    // Romania-specific Crimean Tatar (Crimean Turkish) Q layout.
+    // This layout is not yet standard. Common Alt-Q and F layouts are now also 
+    // available right next to this layout in the new language-centric UI.
+    // Reşat SABIQ <tilde.birlik @ gmail . com>, 2009, 2011
+    // Özgür Qarahan <qarahan @ gmail . com>, 2009
 
-    key <AB07>	{ [         m,          M,      trademark,      masculine ]	};
-};
-
-partial
-xkb_symbols "crh_dobruca2" {
-    include "ro(crh_dobruca1)"
+    include "tr(crh)"
 
-    name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+    name[Group1]="Romania - Crimean Tatar (Dobruja Q)";
 
-    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
-    key <AC07>	{ [    ibreve,     Ibreve,               j,               J ]	};
+    key <AD02>	{ [         w,          W,         abreve,         Abreve ] };
+    key <AD05>	{ [         t,          T,      0x100021b,      0x100021a ] };
+    key <AD10>	{ [         p,          P,        section 	          ] };
+    key <AC02>	{ [         s,          S,      0x1000219,      0x1000218 ] };
+    key <AC07>	{ [    ibreve,     Ibreve,              j,              J ] };
+    key <AB07>	{ [         m,          M,      trademark,      masculine ] };
 };
 
 // EXTRAS: