From: Sergey V. Udaltsov <svu@gnome.org>
Date: Thu, 14 Apr 2011 23:36:36 +0000 (+0100)
Subject: Moving ca(kut) to extras
X-Git-Tag: xkeyboard-config-2.3~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec1f5af5d16ef9ccbb23b74cbe82f11b311d7293;p=platform%2Fupstream%2Fxkeyboard-config.git

Moving ca(kut) to extras

There are only 12 speakers, as of 1999
http://en.wikipedia.org/wiki/Kutenai_language
---

diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index 60eafdd..9cb7977 100644
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -14,6 +14,23 @@
     </layout>
     <layout>
       <configItem>
+        <name>ca</name>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Canada)</_description>
+        <languageList><iso639Id>fr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kut</name>
+            <_shortDescription>kut</_shortDescription>
+            <_description>Kutenai</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>ir</name>
         <_shortDescription>Iran</_shortDescription>
         <_description>Iran</_description>
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 3f26331..3024f95 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2186,13 +2186,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>kut</name>
-            <_shortDescription>kut</_shortDescription>
-            <_description>Kutenai</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>eng</name>
             <_shortDescription>en</_shortDescription>
             <_description>English (Canada)</_description>
diff --git a/symbols/ca b/symbols/ca
index cfb7b25..1c777ee 100644
--- a/symbols/ca
+++ b/symbols/ca
@@ -492,6 +492,14 @@ xkb_symbols "olpc" {
 };
 
 partial alphanumeric_keys 
+xkb_symbols "eng" {
+    name[Group1] = "English (Canada)";
+    include "us(basic)"
+};
+
+// EXTRAS:
+
+partial alphanumeric_keys 
 xkb_symbols "kut" {
 
     //Ejective U0313  and compose accents are from shs layout
@@ -519,9 +527,3 @@ xkb_symbols "kut" {
     //MODIFIER LETTER RIGHT HALF RING
     key <AC10> {	[ semicolon,	colon,U02BE,U02BE	]	};
 };
-
-partial alphanumeric_keys 
-xkb_symbols "eng" {
-    name[Group1] = "English (Canada)";
-    include "us(basic)"
-};