use Latin as default Montenegro variant

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 37274ec..ecc9ce1 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2538,20 +2538,20 @@
       <variantList>
         <variant>
           <configItem>
-            <name>yz</name>
-            <_description>Z and ZHE swapped</_description>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>latin</name>
-            <_description>Latin</_description>
+            <name>cyrillicyz</name>
+            <_description>Cyrillic, Z and ZHE swapped</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Latin Unicode</_description>
+            <_description>Latin unicode</_description>
           </configItem>
         </variant>
         <variant>
@@ -2563,13 +2563,13 @@
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Latin Unicode qwerty</_description>
+            <_description>Latin unicode qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>alternatequotes</name>
-            <_description>With guillemets</_description>
+            <name>cyrillicalternatequotes</name>
+            <_description>Cyrillic with guillemets</_description>
           </configItem>
         </variant>
         <variant>

diff --git a/symbols/me b/symbols/me
index a528473..a4b4073 100644 (file)
--- a/symbols/me
+++ b/symbols/me
@@ -6,28 +6,28 @@
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
-  include "rs(basic)"
+  include "rs(latin)"
   name[Group1]= "Montenegro";
 };
 
 
 partial alphanumeric_keys
-xkb_symbols "latin" {
-  include "rs(latin)"
-  name[Group1]= "Montenegro - Latin";
+xkb_symbols "cyrillic" {
+  include "rs(basic)"
+  name[Group1]= "Montenegro - Cyrillic";
 };
 
 
 partial alphanumeric_keys
-xkb_symbols "yz" {
+xkb_symbols "cyrillicyz" {
   include "rs(yz)"
-  name[Group1]= "Montenegro - Z and ZHE swapped";
+  name[Group1]= "Montenegro - Cyrillic, Z and ZHE swapped";
 };
 
 partial alphanumeric_keys
 xkb_symbols "latinunicode" {
   include "rs(latinunicode)"
-  name[Group1]= "Montenegro - Latin Unicode";
+  name[Group1]= "Montenegro - Latin unicode";
 };
 
 partial alphanumeric_keys
@@ -39,12 +39,12 @@ xkb_symbols "latinyz" {
 partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   include "rs(latinunicodeyz)"
-  name[Group1]= "Montenegro - Latin Unicode qwerty";
+  name[Group1]= "Montenegro - Latin unicode qwerty";
 };
 
-xkb_symbols "alternatequotes" {
+xkb_symbols "cyrillicalternatequotes" {
   include "rs(alternatequotes)"
-  name[Group1]= "Montenegro - With guillemets";
+  name[Group1]= "Montenegro - Cyrillic with guillemets";
 };
 
 xkb_symbols "latinalternatequotes" {