xkeyboard-config/rules base.o_s.part, 1.24, 1.25 base.xml.in, 1.210, 1.211

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/rules
In directory kemper:/tmp/cvs-serv6407/rules

Modified Files:
	base.o_s.part base.xml.in 
Log Message:
splitting Serbia and Montenegro, b.fd.o#12390

Index: base.o_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.o_s.part,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- base.o_s.part	16 Jul 2007 08:27:03 -0000	1.24
+++ base.o_s.part	4 Oct 2007 21:46:56 -0000	1.25
@@ -79,4 +79,5 @@
   kpdl:commaoss         =	+kpdl(commaoss)
   kpdl:momayyezoss      =	+kpdl(momayyezoss)
   kpdl:kposs            =	+kpdl(kposs)
+  shift:breaks_caps     =	+shift(breaks_caps)
 

Index: base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- base.xml.in	26 Sep 2007 12:56:11 -0000	1.210
+++ base.xml.in	4 Oct 2007 21:46:56 -0000	1.211
@@ -948,7 +948,7 @@
       <configItem>
         <name>us</name>
         <_shortDescription>USA</_shortDescription>
-        <_description>U.S. English</_description>
+        <_description>USA</_description>
       </configItem>
       <variantList>
         <variant>
@@ -1020,7 +1020,7 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>OLPC with mode toggle on multiply/divide key</_description>
+            <_description>Group toggle on multiply/divide key</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2433,6 +2433,57 @@
     </layout>
     <layout>
       <configItem>
+        <name>me</name>
+        <_shortDescription>MNE</_shortDescription>
+        <_description>Montenegro</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>yz</name>
+            <_description>Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin Unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>With guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>mk</name>
         <_shortDescription>Mkd</_shortDescription>
         <_description>Macedonia</_description>
@@ -2690,9 +2741,9 @@
     </layout>
     <layout>
       <configItem>
-        <name>cs</name>
-        <_shortDescription>SCG</_shortDescription>
-        <_description>Serbia and Montenegro</_description>
+        <name>rs</name>
+        <_shortDescription>SRB</_shortDescription>
+        <_description>Serbia</_description>
       </configItem>
       <variantList>
         <variant>
@@ -3892,6 +3943,12 @@
           <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>shift:breaks_caps</name>
+          <_description>Shift cancels CapsLock.</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->