Git update 21 nov 2012

fontconfig: 376fc9d22f1480ac380a3845f4cb4fe227e4be9a
mesa: d82b873a501606d62b9f208b6d5cda79c9a6b4b8
xkeyboard-config: 0be23e0774bebdaa9766ddd7a1f3cf088d079bf0

2 files changed, 23 insertions, 24 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 205f5c119..fcccd1b73 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -7,57 +7,50 @@
       <configItem>
         <name>apl</name>
         <_shortDescription>apl</_shortDescription>
-        <_description>APL Keyboard Symbols</_description>
+        <_description>APL keyboard symbols</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>dyalog</name>
-            <shortDescription>dyalog</shortDescription>
-            <description>dyalog</description>
+            <shortDescription>dlg</shortDescription>
+            <description>APL keyboard symbols (Dyalog)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sax</name>
             <shortDescription>sax</shortDescription>
-            <description>sax</description>
+            <description>APL keyboard symbols (sax)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unified</name>
-            <shortDescription>unified</shortDescription>
-            <description>unified</description>
+            <shortDescription>ufd</shortDescription>
+            <description>APL keyboard symbols (unified)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>apl2</name>
             <shortDescription>apl2</shortDescription>
-            <description>apl2</description>
+            <description>APL keyboard symbols (IBM APL2)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>aplplusII</name>
-            <shortDescription>aplplusII</shortDescription>
-            <description>aplplusII</description>
+            <shortDescription>aplII</shortDescription>
+            <description>APL keyboard symbols (Manugistics APL*PLUS II)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>aplx</name>
             <shortDescription>aplx</shortDescription>
-            <description>aplx</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dyalog_base</name>
-            <shortDescription>dyalog_base</shortDescription>
-            <description>dyalog without box or op-codes</description>
+            <description>APL keyboard symbols (APLX unified)</description>
           </configItem>
         </variant>
       </variantList>
@@ -362,14 +355,14 @@
       <configItem>
         <name>il</name>
         <_shortDescription>he</_shortDescription>
-        <_description>Hebrew (Biblical SIL)</_description>
+        <_description>Hebrew</_description>
         <languageList><iso639Id>heb</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
-            <name>SIL Phonetic</name>
-            <_description>Biblical SIL phonetic</_description>
+            <name>biblicalSIL</name>
+            <_description>Hebrew (Biblical, SIL phonetic)</_description>
             <languageList><iso639Id>heb</iso639Id></languageList>
           </configItem>
         </variant>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 313f4884d..5f0618166 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1296,7 +1296,7 @@
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>English (Dvorak international with dead keys)</_description>
+            <_description>English (Dvorak, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
@@ -1375,9 +1375,15 @@
         <variant>
           <configItem>
             <name>workman</name>
-            <_description>English (US, Workman)</_description>
+            <_description>English (Workman)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>workman-intl</name>
+            <_description>English (Workman, international with dead keys)</_description>
+           </configItem>
+         </variant>
       </variantList>
     </layout>
     <layout>
@@ -4235,7 +4241,7 @@
         <name>rs</name>
         <!-- Keyboard indicator for Serbian layouts -->
         <_shortDescription>sr</_shortDescription>
-        <_description>Serbian (Cyrillic)</_description>
+        <_description>Serbian</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -5511,7 +5517,7 @@
           <configItem>
             <name>gag</name>
             <_shortDescription>gag</_shortDescription>
-            <_description>Gagauz</_description>
+            <_description>Moldavian (Gagauz)</_description>
             <languageList><iso639Id>gag</iso639Id></languageList>
           </configItem>
         </variant>