From cda19b1d226d565f1ca4327aeae827c621b3dfd6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 3 Jun 2011 08:18:04 +0200
Subject: xserver xkeyboard-config mesa git update 3 Jun 2011

---
 .../xkeyboard-config/rules/base.extras.xml.in      | 23 +++++++++++++++++++++-
 xorg-server/xkeyboard-config/rules/base.xml.in     |  6 +++---
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'xorg-server/xkeyboard-config/rules')

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index a6b52f0ed..119636500 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -36,6 +36,27 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>de</name>
+        <_shortDescription>de</_shortDescription>
+        <_description>German</_description>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>German (US keyboard with German letters)</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
     <layout>
       <configItem>
         <name>ir</name>
@@ -241,7 +262,7 @@
           <configItem>
             <name>ruu</name>
             <_shortDescription>ru</_shortDescription>
-            <_description>Russian (with UKR and BEL layout)</_description>
+            <_description>Russian (with Ukrainian-Belorussian layout)</_description>
             <languageList><iso639Id>rus</iso639Id>
                           <iso639Id>ukr</iso639Id>
                           <iso639Id>bel</iso639Id></languageList>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 9f117cf34..7d4e2b9c9 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -2132,7 +2132,7 @@
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>English (Cameroon qwerty)</_description>
+            <_description>Cameroon Multilingual (qwerty)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
               <iso639Id>bas</iso639Id>
@@ -2169,7 +2169,7 @@
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>French (Cameroon azerty)</_description>
+            <_description>Cameroon Multilingual (azerty)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
               <iso639Id>bas</iso639Id>
@@ -4453,7 +4453,7 @@
       <configItem>
         <name>lk</name>
         <_shortDescription>si</_shortDescription>
-        <_description>Sinhala</_description>
+        <_description>Sinhala (phonetic)</_description>
         <languageList>
           <iso639Id>sin</iso639Id>
         </languageList>
-- 
cgit v1.2.3