Attachment 1348 Details for Bug 1899 – #9: fix rules/xfree86 inconsistencies

[patch] #9: fix rules/xfree86 inconsistencies

099z_xkb_fix_rules_xfree86.diff (text/plain), 41.23 KB, created by Daniel Stone on 2004-11-22 11:06:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Stone

Created: 2004-11-22 11:06:22 UTC

Size: 41.23 KB

patch

obsolete

>$Id: 099z_xkb_fix_rules_xfree86.diff 1945 2004-10-12 16:09:53Z barbier $
>
>This patch by Denis Barbier.
>
>Fix inconsistencies in rules/xfree86* files.
>
>rules/xfree86:
>  + List in $oldlayouts all layouts which are currently not multi-layout
>    aware in the Debian xlibs package, including hu_US (thanks, Veres
>    Lajos).  (Closes: #247463, #270810)
>  + Support the lv3:ralt_switch option, which exists in xfree86.lst but was
>    forgotten in this file.
>  + Add support for a lv3:ralt_switch_multikey option.
>  + Move lv3 definitions after altwin so that the former can override
>    the latter.  See Bug#276143.
>
>rules/xfree86.{lst,xml}:
>  + Replace the options altwin:meta_super and altwin:meta_hyper with the
>    correct names altwin:super_win and altwin:hyper_win.  (Closes: #271259)
>  + Synchronize these files.
>
>diff -ruN xc-old/programs/xkbcomp/rules/xorg xc/programs/xkbcomp/rules/xorg
>--- xc-old/programs/xkbcomp/rules/xorg	2004-11-05 08:02:07.102809000 +0000
>+++ xc/programs/xkbcomp/rules/xorg	2004-11-05 08:02:38.421048424 +0000
>@@ -8,7 +8,7 @@
> //
> 
> // Layouts that still need be composed by old rules
>-! $oldlayouts = az bs ca_enhanced de_CH fr_CH hu_qwerty lt_std hr_US
>+! $oldlayouts = az bs ca_enhanced czsk de_CH fr_CH hr_US hu_US hu_qwerty lt_a lt_p lt_std ro2 ru_yawerty se_FI se_NO se_SE tr_f
> 
> // If you want non-latin layouts implicitly include the en_US layout
> // uncomment lines below
>@@ -162,14 +162,6 @@
>   grp:lctrl_toggle	=	+group(lctrl_toggle)
>   grp:rctrl_toggle	=	+group(rctrl_toggle)
>   grp:lalt_toggle	=	+group(lalt_toggle)
>-  lv3:switch		=	+level3(switch)
>-  lv3:ralt_switch	=	+level3(ralt_switch)
>-  lv3:lalt_switch	=	+level3(lalt_switch)
>-  lv3:alt_switch	=	+level3(alt_switch)
>-  lv3:menu_switch	=	+level3(menu_switch)
>-  lv3:win_switch	=	+level3(win_switch)
>-  lv3:lwin_switch	=	+level3(lwin_switch)
>-  lv3:rwin_switch	=	+level3(rwin_switch)
>   ctrl:nocaps		=	+ctrl(nocaps)
>   ctrl:swapcaps		=	+ctrl(swapcaps)
>   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
>@@ -181,6 +173,15 @@
>   altwin:left_meta_win	=	+altwin(left_meta_win)
>   altwin:super_win	=	+altwin(super_win)
>   altwin:hyper_win	=	+altwin(hyper_win)
>+  lv3:switch		=	+level3(switch)
>+  lv3:ralt_switch	=	+level3(ralt_switch)
>+  lv3:lalt_switch	=	+level3(lalt_switch)
>+  lv3:ralt_switch_multikey =	+level3(ralt_switch_multikey)
>+  lv3:alt_switch	=	+level3(alt_switch)
>+  lv3:menu_switch	=	+level3(menu_switch)
>+  lv3:win_switch	=	+level3(win_switch)
>+  lv3:lwin_switch	=	+level3(lwin_switch)
>+  lv3:rwin_switch	=	+level3(rwin_switch)
>   compose:ralt		=	+compose(ralt)
>   compose:rwin		=	+compose(rwin)
>   compose:menu		=	+compose(menu)
>diff -ruN xc-old/programs/xkbcomp/rules/xorg.lst xc/programs/xkbcomp/rules/xorg.lst
>--- xc-old/programs/xkbcomp/rules/xorg.lst	2004-11-05 08:02:06.281934000 +0000
>+++ xc/programs/xkbcomp/rules/xorg.lst	2004-11-05 08:02:38.421048424 +0000
>@@ -145,11 +145,14 @@
>   gur		Gurmukhi
>   dev		Hindi
>   hu		Hungarian
>+  hu_US		Hungarian (US)
>   hu_qwerty	Hungarian (qwerty)
>   is		Icelandic
>   iu		Inuktitut
>   ir		Iranian
>+  ie		Irish
>   il		Israeli
>+  il_phonetic	Israeli (phonetic)
>   it		Italian
>   jp		Japanese
>   kan		Kannada
>@@ -182,6 +185,7 @@
>   sk_qwerty	Slovak (qwerty)
>   es		Spanish
>   se		Swedish
>+  ch		Swiss
>   fr_CH		Swiss French
>   de_CH		Swiss German
>   syr		Syriac
>@@ -231,6 +235,7 @@
>   lv3:switch		Press Right Control to choose 3rd level
>   lv3:lalt_switch	Press Left Alt key to choose 3rd level
>   lv3:ralt_switch	Press Right Alt key to choose 3rd level
>+  lv3:ralt_switch_multikey Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key
>   lv3:alt_switch	Press any of Alt keys to choose 3rd level
>   lv3:menu_switch	Press Menu key to choose 3rd level
>   lv3:win_switch	Press any of Win-keys to choose 3rd level
>@@ -257,8 +262,8 @@
>   altwin:meta_alt	Alt and Meta on the Alt keys (default).
>   altwin:meta_win	Meta is mapped to the Win-keys.
>   altwin:left_meta_win	Meta is mapped to the left Win-key.
>-  altwin:meta_super	Super is mapped to the Win-keys (default).
>-  altwin:meta_hyper	Hyper is mapped to the Win-keys.
>+  altwin:super_win	Super is mapped to the Win-keys (default).
>+  altwin:hyper_win	Hyper is mapped to the Win-keys.
> 
>   compose:ralt		Right Alt is Compose
>   compose:rwin		Right Win-key is Compose
>diff -ruN xc-old/programs/xkbcomp/rules/xorg.xml xc/programs/xkbcomp/rules/xorg.xml
>--- xc-old/programs/xkbcomp/rules/xorg.xml	2004-11-05 08:02:06.285933000 +0000
>+++ xc/programs/xkbcomp/rules/xorg.xml	2004-11-05 08:04:21.236418112 +0000
>@@ -524,10 +524,16 @@
>     </model>
>     <model>
>       <configItem>
>+        <name>hp5181</name>
>+	<description>Hewlett-Packard 5181 Internet Keyboard</description>
>+      </configItem>
>+    </model>
>+    <model>
>+      <configItem>
>         <name>hpxe3gc</name>
>-        <description>Hewlett-Packard Omnibook XE3 GC</description>
>-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook XE3 GC</description>
>-        <description xml:lang="zh_CN">æ æ® Omnibook XE3 GC</description>
>+        <description>Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx</description>
>+        <description xml:lang="fr">clavier Hewlett-Packard Omnibook XE3 GC, GD, GE et Pavilion N5xxx</description>
>+        <description xml:lang="zh_CN">æ æ® Omnibook XE3 GC, GD, GE, Pavilion N5xxx</description>
>       </configItem>
>     </model>
>     <model>
>@@ -540,6 +546,12 @@
>     </model>
>     <model>
>       <configItem>
>+        <name>hpxe4xxx</name>
>+	<description>Hewlett-Packard Omnibook XE4xxx and ZE4xxx</description>
>+      </configItem>
>+    </model>
>+    <model>
>+      <configItem>
>         <name>hpxt1000</name>
>         <description>Hewlett-Packard Omnibook XT1000</description>
>         <description xml:lang="fr">clavier Hewlett-Packard Omnibook XT1000</description>
>@@ -1625,91 +1637,26 @@
>       <variantList>
>         <variant>
>           <configItem>
>-            <name>alternate</name>
>-            <description>Alternate</description>
>-            <description xml:lang="cs">AlternativnÃ</description>
>-            <description xml:lang="da">Alternativ</description>
>-            <description xml:lang="fr">Alternative</description>
>-            <description xml:lang="hu">MÃ¡sodlagos</description>
>-            <description xml:lang="nl">Alternatief</description>
>-            <description xml:lang="ru">ÐÐ¾Ð±Ð°Ð²Ð¾ÑÐ½Ð°Ñ</description>
>-            <description xml:lang="sk">AlternatÃvne</description>
>-            <description xml:lang="sr">Ð Ð°Ð·Ð¼ÐµÐ½Ð¸</description>
>-            <description xml:lang="tr">Ãteki</description>
>-            <description xml:lang="zh_CN">æ¿ä»£</description>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>nodeadkeys</name>
>-            <description>Eliminate dead keys</description>
>-            <description xml:lang="bg">ÐÐ·ÐºÐ»ÑÑÐ¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»Ð½Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="cs">Eliminovat mrtvÃ© klÃ¡vesy</description>
>-            <description xml:lang="da">SlÃ¥ dÃ¸de taster fra</description>
>-            <description xml:lang="fr">Ã©liminer des clÃ©s mortes</description>
>-            <description xml:lang="hu">Halott billentyÅ±k tiltÃ¡sa</description>
>-            <description xml:lang="nl">Dode toetsen niet doen</description>
>-            <description xml:lang="ru">ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="sk">EliminovaÅ¥ mrtvÃ© klÃ¡ves</description>
>-            <description xml:lang="sr">Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð°ÐºÑÐµÐ½ÑÐµ</description>
>-            <description xml:lang="tr">ÃlÃ¼ tuÅlarÄ± normal yapar</description>
>-            <description xml:lang="uk">ÐÐ¸Ð»ÑÑÐ¸ÑÐ¸ ÑÐ¿ÐµÑÑÐ°Ð»ÑÐ½Ñ ÐºÐ»Ð°Ð²ÑÑÑ (dead keys)</description>
>-            <description xml:lang="zh_CN">é¤å»æ»é®</description>
>+	    <name>fr</name>
>+	    <description>French</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>sundeadkeys</name>
>-            <description>Sun dead keys</description>
>-            <description xml:lang="cs">MrtvÃ© klÃ¡vesy Sun</description>
>-            <description xml:lang="da">Sun dÃ¸de taster</description>
>-            <description xml:lang="fr">clÃ©s mortes Sun</description>
>-            <description xml:lang="hu">Sun halott billentyÅ±k</description>
>-            <description xml:lang="nl">Sun dode toetsen</description>
>-            <description xml:lang="ru">Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys) Sun</description>
>-            <description xml:lang="sk">MÅtve klÃ¡vesy Sun</description>
>-            <description xml:lang="sr">Sun-Ð¾Ð²Ð¸ Ð°ÐºÑÐµÐ½ÑÐ¸</description>
>-            <description xml:lang="tr">Sun Ã¶lÃ¼ tuÅlar</description>
>-            <description xml:lang="zh_CN">Sun æ»é®</description>
>+	    <name>fr-legacy</name>
>+	    <description>French (legacy)</description>
>           </configItem>
>         </variant>
>-      </variantList>
>-    </layout>
>-    <layout>
>-      <configItem>
>-        <name>ca_enhanced</name>
>-        <shortDescription>Can</shortDescription>
>-        <shortDescription xml:lang="cs">Kan</shortDescription>
>-        <shortDescription xml:lang="ru">ÐÐ°Ð½</shortDescription>
>-        <shortDescription xml:lang="sr">ÐºÐ°Ð½</shortDescription>
>-        <shortDescription xml:lang="tr">Kan</shortDescription>
>-        <description>French Canadian</description>
>-        <description xml:lang="cs">FrancouzskÃ© kanadskÃ©</description>
>-        <description xml:lang="da">Fransk-canadisk</description>
>-        <description xml:lang="fr">Canadien FranÃ§ais</description>
>-        <description xml:lang="hu">francia (kanadai)</description>
>-        <description xml:lang="nl">Frans-Canadees</description>
>-        <description xml:lang="ru">Ð¤ÑÐ°Ð½ÑÑÐ·ÑÐºÐ°Ñ ÐÐ°Ð½Ð°Ð´ÑÐºÐ°Ñ</description>
>-        <description xml:lang="sk">FrancÃºzske kanadskÃ©</description>
>-        <description xml:lang="sr">ÑÑÐ°Ð½ÑÑÑÐºÐ¸ ÐºÐ°Ð½Ð°Ð´ÑÐºÐ¸</description>
>-        <description xml:lang="tr">Kanada FransÄ±zcasÄ±</description>
>-        <description xml:lang="uk">Ð¤ÑÐ°Ð½ÑÑÐ·ÑÐºÐ° ÐÐ°Ð½Ð°Ð´ÑÑÐºÐ°</description>
>-        <description xml:lang="zh_CN">æ³è£å æ¿å¤§</description>
>-      </configItem>
>-      <variantList>
>+	<variant>
>+	</variant>
>+	  <configItem>
>+	    <name>multi</name>
>+	    <description>Multilingual</description>
>+	  </configItem>
>         <variant>
>           <configItem>
>-            <name>basic</name>
>-            <description>Basic</description>
>-            <description xml:lang="cs">ZÃ¡kladnÃ</description>
>-            <description xml:lang="da">Basal</description>
>-            <description xml:lang="hu">Alap</description>
>-            <description xml:lang="nl">Standaard</description>
>-            <description xml:lang="ru">ÐÐ°Ð·Ð¾Ð²Ð°Ñ</description>
>-            <description xml:lang="sk">ZÃ¡kladnÃ©</description>
>-            <description xml:lang="sr">ÐÑÐ½Ð¾Ð²Ð½Ð¾</description>
>-            <description xml:lang="tr">Temel</description>
>-            <description xml:lang="zh_CN">åºæ¬</description>
>+            <name>multi-2gr</name>
>+            <description>Multilingual, second part</description>
>           </configItem>
>         </variant>
>         <variant>
>@@ -1753,7 +1700,14 @@
>         <description xml:lang="uk">Ð¥Ð¾ÑÐ²Ð°ÑÑÑÐºÐ°</description>
>         <description xml:lang="zh_CN">åç½å°äº</description>
>       </configItem>
>-      <variantList/>
>+      <variantList>
>+        <variant>
>+	  <configItem>
>+	    <name>us</name>
>+	    <description>US keyboard with Croatian letters</description>
>+	  </configItem>
>+	</variant>
>+      </variantList>
>     </layout>
>     <layout>
>       <configItem>
>@@ -2086,23 +2040,6 @@
>     </layout>
>     <layout>
>       <configItem>
>-        <name>ir</name>
>-        <shortDescription>Irn</shortDescription>
>-        <shortDescription xml:lang="ru">ÐÐµÑÑ</shortDescription>
>-        <shortDescription xml:lang="sr">Ð¸ÑÐ½</shortDescription>
>-        <shortDescription xml:lang="uk">ÐÑÐ½</shortDescription>
>-        <description>Farsi</description>
>-        <description xml:lang="hu">fÃ¡rszi</description>
>-        <description xml:lang="ru">Ð¤Ð°ÑÑÐ¸</description>
>-        <description xml:lang="sr">ÑÐ°ÑÑÐ¸</description>
>-        <description xml:lang="tr">FarsÃ§a</description>
>-        <description xml:lang="uk">Ð¤Ð°ÑÑÑ</description>
>-        <description xml:lang="zh_CN">æ³¢æ¯</description>
>-      </configItem>
>-      <variantList/>
>-    </layout>
>-    <layout>
>-      <configItem>
>         <name>fo</name>
>         <shortDescription>Fao</shortDescription>
>         <shortDescription xml:lang="da">FÃ¦r</shortDescription>
>@@ -2590,148 +2527,62 @@
>       <variantList>
>         <variant>
>           <configItem>
>-            <name>l2_101_qwerty_comma</name>
>-            <description>l2/101/qwerty/comma</description>
>-            <description xml:lang="cs">l2/101/qwerty/ÄÃ¡rka</description>
>-            <description xml:lang="da">l2/101/qwerty/komma</description>
>-            <description xml:lang="fr">l2/101/qwerty/virgule</description>
>-            <description xml:lang="hu">l2/101/qwerty/vesszÅ</description>
>-            <description xml:lang="nl">l2/101/qwerty/komma</description>
>-            <description xml:lang="ru">Latin2 pc101, qwerty, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">l2/101/qwerty/Äiarka</description>
>-            <description xml:lang="sr">Ð½2/101/qwerty/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">l2/101/qwerty/virgÃ¼l</description>
>+	    <name>standard</name>
>+	    <description>Standard</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_101_qwerty_dot</name>
>-            <description>l2/101/qwerty/dot</description>
>-            <description xml:lang="cs">l2/101/qwerty/teÄka</description>
>-            <description xml:lang="da">l2/101/qwerty/punktum</description>
>-            <description xml:lang="hu">l2/101/qwerty/pont</description>
>-            <description xml:lang="nl">l2/101/qwerty/punt</description>
>-            <description xml:lang="ru">Latin2 pc101, qwerty, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">l2/101/qwerty/bodka</description>
>-            <description xml:lang="sr">Ð½2/101/qwerty/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">l2/101/qwerty/nokta</description>
>+	    <name>qwerty</name>
>+	    <description>qwerty</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_101_qwertz_comma</name>
>-            <description>l2/101/qwertz/comma</description>
>-            <description xml:lang="cs">l2/101/qwertz/ÄÃ¡rka</description>
>-            <description xml:lang="da">l2/101/qwertz/komma</description>
>-            <description xml:lang="fr">l2/101/qwertz/virgule</description>
>-            <description xml:lang="hu">l2/101/qwertz/vesszÅ</description>
>-            <description xml:lang="nl">l2/101/qwertz/komma</description>
>-            <description xml:lang="ru">Latin2 pc101, qwertz, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">l2/101/qwertz/Äiarka</description>
>-            <description xml:lang="sr">Ð½2/101/qwertz/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">l2/101/qwertz/virgÃ¼l</description>
>+	    <name>101_qwertz_comma_dead</name>
>+	    <description>101/qwertz/comma/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_101_qwertz_dot</name>
>-            <description>l2/101/qwertz/dot</description>
>-            <description xml:lang="cs">l2/101/qwertz/teÄka</description>
>-            <description xml:lang="da">l2/101/qwertz/punktum</description>
>-            <description xml:lang="hu">l2/101/qwertz/pont</description>
>-            <description xml:lang="nl">l2/101/qwertz/punt</description>
>-            <description xml:lang="ru">Latin2 pc101, qwertz, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">l2/101/qwertz/bodka</description>
>-            <description xml:lang="sr">Ð½2/101/qwertz/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">l2/101/qwertz/nokta</description>
>+	    <name>101_qwertz_dot_dead</name>
>+	    <description>101/qwertz/dot/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_102_qwerty_comma</name>
>-            <description>l2/102/qwerty/comma</description>
>-            <description xml:lang="cs">l2/102/qwerty/ÄÃ¡rka</description>
>-            <description xml:lang="da">l2/102/qwerty/komma</description>
>-            <description xml:lang="hu">l2/102/qwerty/vesszÅ</description>
>-            <description xml:lang="nl">l2/102/qwerty/komma</description>
>-            <description xml:lang="ru">Latin2 pc102, qwerty, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">l2/102/qwerty/Äiarka</description>
>-            <description xml:lang="sr">Ð½2/102/qwerty/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">l2/102/qwerty/virgÃ¼l</description>
>+	    <name>101_qwertz_dot_dead</name>
>+	    <description>101/qwertz/dot/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_102_qwerty_dot</name>
>-            <description>l2/102/qwerty/dot</description>
>-            <description xml:lang="cs">l2/102/qwerty/teÄka</description>
>-            <description xml:lang="da">l2/102/qwerty/punktum</description>
>-            <description xml:lang="hu">l2/102/qwerty/pont</description>
>-            <description xml:lang="nl">l2/102/qwerty/punt</description>
>-            <description xml:lang="ru">Latin2 pc102, qwerty, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">l2/102/qwerty/bodka</description>
>-            <description xml:lang="sr">Ð½2/102/qwerty/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">l2/102/qwerty/nokta</description>
>+	    <name>101_qwertz_dot_nodead</name>
>+	    <description>101/qwertz/dot/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_102_qwertz_comma</name>
>-            <description>l2/102/qwertz/comma</description>
>-            <description xml:lang="cs">l2/102/qwertz/ÄÃ¡rka</description>
>-            <description xml:lang="da">l2/102/qwertz/komma</description>
>-            <description xml:lang="hu">l2/102/qwertz/vesszÅ</description>
>-            <description xml:lang="nl">l2/102/qwertz/komma</description>
>-            <description xml:lang="ru">Latin2 pc102, qwertz, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">l2/102/qwertz/Äiarka</description>
>-            <description xml:lang="sr">Ð½2/102/qwertz/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">l2/102/qwertz/virgÃ¼l</description>
>+	    <name>101_qwerty_comma_dead</name>
>+	    <description>101/qwerty/comma/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>l2_102_qwertz_dot</name>
>-            <description>l2/102/qwertz/dot</description>
>-            <description xml:lang="cs">l2/102/qwertz/teÄka</description>
>-            <description xml:lang="da">l2/102/qwertz/punktum</description>
>-            <description xml:lang="hu">l2/102/qwertz/pont</description>
>-            <description xml:lang="nl">l2/102/qwertz/punt</description>
>-            <description xml:lang="ru">Latin2 pc102, qwertz, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">l2/102/qwertz/bodka</description>
>-            <description xml:lang="sr">Ð½2/102/qwertz/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">l2/102/qwertz/nokta</description>
>+	    <name>101_qwerty_comma_nodead</name>
>+	    <description>101/qwerty/comma/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>nodeadkeys</name>
>-            <description>Eliminate dead keys</description>
>-            <description xml:lang="bg">ÐÐ·ÐºÐ»ÑÑÐ¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»Ð½Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="cs">Eliminovat mrtvÃ© klÃ¡vesy</description>
>-            <description xml:lang="da">SlÃ¥ dÃ¸de taster fra</description>
>-            <description xml:lang="fr">Ã©liminer des clÃ©s mortes</description>
>-            <description xml:lang="hu">Halott billentyÅ±k tiltÃ¡sa</description>
>-            <description xml:lang="nl">Dode toetsen niet doen</description>
>-            <description xml:lang="ru">ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="sk">EliminovaÅ¥ mrtvÃ© klÃ¡ves</description>
>-            <description xml:lang="sr">Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð°ÐºÑÐµÐ½ÑÐµ</description>
>-            <description xml:lang="tr">ÃlÃ¼ tuÅlarÄ± normal yapar</description>
>-            <description xml:lang="uk">ÐÐ¸Ð»ÑÑÐ¸ÑÐ¸ ÑÐ¿ÐµÑÑÐ°Ð»ÑÐ½Ñ ÐºÐ»Ð°Ð²ÑÑÑ (dead keys)</description>
>-            <description xml:lang="zh_CN">é¤å»æ»é®</description>
>+	    <name>101_qwerty_dot_dead</name>
>+	    <description>101/qwerty/dot/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>standard</name>
>-            <description>Standard</description>
>-            <description xml:lang="cs">StandardnÃ</description>
>-            <description xml:lang="hu">SzabvÃ¡nyos</description>
>-            <description xml:lang="nl">Standaard</description>
>-            <description xml:lang="ru">Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð°Ñ</description>
>-            <description xml:lang="sk">Å tandardnÃ©</description>
>-            <description xml:lang="sr">ÑÑÐ°Ð½Ð´Ð°ÑÐ´Ð½Ð°</description>
>-            <description xml:lang="tr">Standart</description>
>-            <description xml:lang="zh_CN">æ å</description>
>+	    <name>101_qwerty_dot_nodead</name>
>+	    <description>101/qwerty/dot/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>@@ -2752,150 +2603,56 @@
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_101_qwerty_comma</name>
>-            <description>uni/101/qwerty/comma</description>
>-            <description xml:lang="cs">uni/101/qwerty/ÄÃ¡rka</description>
>-            <description xml:lang="da">uni/101/qwerty/komma</description>
>-            <description xml:lang="fr">uni/101/qwerty/virgule</description>
>-            <description xml:lang="hu">uni/101/qwerty/vesszÅ</description>
>-            <description xml:lang="nl">uni/101/qwerty/komma</description>
>-            <description xml:lang="ru">Unicode pc101, qwerty, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">uni/101/qwerty/Äiarka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/101/qwerty/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">uni/101/qwerty/virgÃ¼l</description>
>+	    <name>102_qwertz_comma_dead</name>
>+	    <description>102/qwertz/comma/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_101_qwerty_dot</name>
>-            <description>uni/101/qwerty/dot</description>
>-            <description xml:lang="cs">uni/101/qwerty/teÄka</description>
>-            <description xml:lang="da">uni/101/qwerty/punktum</description>
>-            <description xml:lang="hu">uni/101/qwerty/pont</description>
>-            <description xml:lang="nl">uni/101/qwerty/punt</description>
>-            <description xml:lang="ru">Unicode pc101, qwerty, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">uni/101/qwerty/bodka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/101/qwerty/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">uni/101/qwerty/nokta</description>
>+	    <name>102_qwertz_comma_nodead</name>
>+	    <description>102/qwertz/comma/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_101_qwertz_comma</name>
>-            <description>uni/101/qwertz/comma</description>
>-            <description xml:lang="cs">uni/101/qwertz/ÄÃ¡rka</description>
>-            <description xml:lang="da">uni/101/qwertz/komma</description>
>-            <description xml:lang="fr">uni/101/qwertz/virgule</description>
>-            <description xml:lang="hu">uni/101/qwertz/vesszÅ</description>
>-            <description xml:lang="nl">uni/101/qwertz/komma</description>
>-            <description xml:lang="ru">Unicode pc101, qwertz, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">uni/101/qwertz/Äiarka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/101/qwertz/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">uni/101/qwertz/virgÃ¼l</description>
>+	    <name>102_qwertz_dot_dead</name>
>+	    <description>102/qwertz/dot/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_101_qwertz_dot</name>
>-            <description>uni/101/qwertz/dot</description>
>-            <description xml:lang="cs">uni/101/qwertz/teÄka</description>
>-            <description xml:lang="da">uni/101/qwertz/punktum</description>
>-            <description xml:lang="hu">uni/101/qwertz/pont</description>
>-            <description xml:lang="nl">uni/101/qwertz/punt</description>
>-            <description xml:lang="ru">Unicode pc101, qwertz, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">uni/101/qwertz/bodka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/101/qwertz/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">uni/101/qwertz/nokta</description>
>+	    <name>102_qwertz_dot_nodead</name>
>+	    <description>102/qwertz/dot/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_102_qwerty_comma</name>
>-            <description>uni/102/qwerty/comma</description>
>-            <description xml:lang="cs">uni/102/qwerty/ÄÃ¡rka</description>
>-            <description xml:lang="da">uni/102/qwerty/komma</description>
>-            <description xml:lang="fr">uni/102/qwerty/virgule</description>
>-            <description xml:lang="hu">uni/102/qwerty/vesszÅ</description>
>-            <description xml:lang="nl">uni/102/qwerty/komma</description>
>-            <description xml:lang="ru">Unicode pc102, qwerty, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">uni/102/qwerty/Äiarka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/102/qwerty/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">uni/102/qwerty/virgÃ¼l</description>
>+	    <name>102_qwerty_comma_dead</name>
>+	    <description>102/qwerty/comma/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_102_qwerty_dot</name>
>-            <description>uni/102/qwerty/dot</description>
>-            <description xml:lang="cs">uni/102/qwerty/teÄka</description>
>-            <description xml:lang="da">uni/102/qwerty/punktum</description>
>-            <description xml:lang="hu">uni/102/qwerty/pont</description>
>-            <description xml:lang="nl">uni/102/qwerty/punt</description>
>-            <description xml:lang="ru">Unicode pc102, qwerty, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">uni/102/qwerty/bodka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/102/qwerty/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">uni/102/qwerty/nokta</description>
>+	    <name>102_qwerty_comma_nodead</name>
>+	    <description>102/qwerty/comma/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_102_qwertz_comma</name>
>-            <description>uni/102/qwertz/comma</description>
>-            <description xml:lang="cs">uni/102/qwertz/ÄÃ¡rka</description>
>-            <description xml:lang="da">uni/102/qwertz/komma</description>
>-            <description xml:lang="fr">uni/102/qwertz/virgule</description>
>-            <description xml:lang="hu">uni/102/qwertz/vesszÅ</description>
>-            <description xml:lang="nl">uni/102/qwertz/komma</description>
>-            <description xml:lang="ru">Unicode pc102, qwertz, Ð·Ð°Ð¿ÑÑÐ°Ñ</description>
>-            <description xml:lang="sk">uni/102/qwertz/Äiarka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/102/qwertz/Ð·Ð°Ð¿ÐµÑÐ°</description>
>-            <description xml:lang="tr">uni/102/qwertz/virgÃ¼l</description>
>+	    <name>102_qwerty_dot_dead</name>
>+	    <description>102/qwerty/dot/Dead keys</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>uni_102_qwertz_dot</name>
>-            <description>uni/102/qwertz/dot</description>
>-            <description xml:lang="cs">uni/102/qwertz/teÄka</description>
>-            <description xml:lang="da">uni/102/qwertz/punktum</description>
>-            <description xml:lang="hu">uni/102/qwertz/pont</description>
>-            <description xml:lang="nl">uni/102/qwertz/punt</description>
>-            <description xml:lang="ru">Unicode pc102, qwertz, ÑÐ¾ÑÐºÐ°</description>
>-            <description xml:lang="sk">uni/102/qwertz/bodka</description>
>-            <description xml:lang="sr">ÑÐ½Ð¸/102/qwertz/ÑÐ°ÑÐºÐ°</description>
>-            <description xml:lang="tr">uni/102/qwertz/nokta</description>
>+	    <name>102_qwerty_dot_nodead</name>
>+	    <description>102/qwerty/dot/Eliminate dead keys</description>
>           </configItem>
>         </variant>
>       </variantList>
>     </layout>
>     <layout>
>       <configItem>
>-        <name>hu_qwerty</name>
>-        <shortDescription>Hun</shortDescription>
>-        <shortDescription xml:lang="cs">MaÄ</shortDescription>
>-        <shortDescription xml:lang="da">Ung</shortDescription>
>-        <shortDescription xml:lang="ru">ÐÐµÐ½Ð³</shortDescription>
>-        <shortDescription xml:lang="sk">MaÄ</shortDescription>
>-        <shortDescription xml:lang="sr">Ð¼Ð°Ñ</shortDescription>
>-        <shortDescription xml:lang="tr">Mcr</shortDescription>
>-        <shortDescription xml:lang="uk">Ð£Ð³Ð¾</shortDescription>
>-        <description>Hungarian (qwerty)</description>
>-        <description xml:lang="cs">MaÄarskÃ© (qwerty)</description>
>-        <description xml:lang="da">Ungarsk (qwerty)</description>
>-        <description xml:lang="fr">Hungrois (qwerty)</description>
>-        <description xml:lang="hu">magyar (qwerty)</description>
>-        <description xml:lang="nl">Hongaars (qwerty)</description>
>-        <description xml:lang="ru">ÐÐµÐ½Ð³ÐµÑÑÐºÐ°Ñ (qwerty)</description>
>-        <description xml:lang="sk">MaÄarskÃ¡ (qwerty)</description>
>-        <description xml:lang="sr">ÐÐ°ÑÐ°ÑÑÐºÐ¸ (qwerty)</description>
>-        <description xml:lang="tr">Macarca (qwerty)</description>
>-        <description xml:lang="uk">Ð£Ð³Ð¾ÑÑÑÐºÐ° (qwerty)</description>
>-        <description xml:lang="zh_CN">åçå©(qwerty)</description>
>-      </configItem>
>-      <variantList/>
>-    </layout>
>-    <layout>
>-      <configItem>
>         <name>is</name>
>         <shortDescription>Isl</shortDescription>
>         <shortDescription xml:lang="ru">ÐÑÐ»</shortDescription>
>@@ -4102,121 +3859,47 @@
>     </layout>
>     <layout>
>       <configItem>
>-        <name>fr_CH</name>
>+        <name>ch</name>
>         <shortDescription>Fra</shortDescription>
>-        <shortDescription xml:lang="ru">Ð¤Ñ</shortDescription>
>-        <shortDescription xml:lang="sr">ÑÑÐ°</shortDescription>
>-        <shortDescription xml:lang="uk">Ð¤ÑÐ°</shortDescription>
>-        <description>Swiss French</description>
>-        <description xml:lang="bg">ÑÐ²ÐµÐ¹ÑÐ°ÑÑÐºÐ° ÑÑÐµÐ½ÑÐºÐ°</description>
>-        <description xml:lang="cs">Å vÃ½carskÃ© francouzskÃ©</description>
>-        <description xml:lang="da">Schweizisk-fransk</description>
>-        <description xml:lang="fr">FranÃ§ais Suisse</description>
>-        <description xml:lang="hu">svÃ¡jci francia</description>
>-        <description xml:lang="nl">Zwitsers-Frans</description>
>-        <description xml:lang="ru">Ð¤ÑÐ°Ð½ÑÑÐ·ÑÐºÐ°Ñ (Ð¨Ð²ÐµÐ¹ÑÐ°ÑÐ¸Ñ)</description>
>-        <description xml:lang="sk">Å vajÄiarske francÃºzske</description>
>-        <description xml:lang="sr">ÑÐ²Ð°ÑÑÐ°ÑÑÐºÐ¸ ÑÑÐ°Ð½ÑÑÑÐºÐ¸</description>
>-        <description xml:lang="tr">Ä°sviÃ§re FransÄ±zcasÄ±</description>
>-        <description xml:lang="uk">Ð¤ÑÐ°Ð½ÑÑÐ·ÑÐºÐ° (Ð¨Ð²ÐµÐ¹ÑÐ°ÑÑÑ)</description>
>-        <description xml:lang="zh_CN">çå¸æ³è¯</description>
>+        <description>Swiss</description>
>       </configItem>
>       <variantList>
>         <variant>
>           <configItem>
>-            <name>nodeadkeys</name>
>-            <description>Eliminate dead keys</description>
>-            <description xml:lang="bg">ÐÐ·ÐºÐ»ÑÑÐ¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»Ð½Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="cs">Eliminovat mrtvÃ© klÃ¡vesy</description>
>-            <description xml:lang="da">SlÃ¥ dÃ¸de taster fra</description>
>-            <description xml:lang="fr">Ã©liminer des clÃ©s mortes</description>
>-            <description xml:lang="hu">Halott billentyÅ±k tiltÃ¡sa</description>
>-            <description xml:lang="nl">Dode toetsen niet doen</description>
>-            <description xml:lang="ru">ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="sk">EliminovaÅ¥ mrtvÃ© klÃ¡ves</description>
>-            <description xml:lang="sr">Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð°ÐºÑÐµÐ½ÑÐµ</description>
>-            <description xml:lang="tr">ÃlÃ¼ tuÅlarÄ± normal yapar</description>
>-            <description xml:lang="uk">ÐÐ¸Ð»ÑÑÐ¸ÑÐ¸ ÑÐ¿ÐµÑÑÐ°Ð»ÑÐ½Ñ ÐºÐ»Ð°Ð²ÑÑÑ (dead keys)</description>
>-            <description xml:lang="zh_CN">é¤å»æ»é®</description>
>+	    <name>de</name>
>+	    <description>German</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>sundeadkeys</name>
>-            <description>Sun dead keys</description>
>-            <description xml:lang="cs">MrtvÃ© klÃ¡vesy Sun</description>
>-            <description xml:lang="da">Sun dÃ¸de taster</description>
>-            <description xml:lang="fr">clÃ©s mortes Sun</description>
>-            <description xml:lang="hu">Sun halott billentyÅ±k</description>
>-            <description xml:lang="nl">Sun dode toetsen</description>
>-            <description xml:lang="ru">Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys) Sun</description>
>-            <description xml:lang="sk">MÅtve klÃ¡vesy Sun</description>
>-            <description xml:lang="sr">Sun-Ð¾Ð²Ð¸ Ð°ÐºÑÐµÐ½ÑÐ¸</description>
>-            <description xml:lang="tr">Sun Ã¶lÃ¼ tuÅlar</description>
>-            <description xml:lang="zh_CN">Sun æ»é®</description>
>+	    <name>de_nodeadkeys</name>
>+	    <description>German, eliminate dead keys</description>
>           </configItem>
>         </variant>
>-      </variantList>
>-    </layout>
>-    <layout>
>-      <configItem>
>-        <name>de_CH</name>
>-        <shortDescription>Deu</shortDescription>
>-        <shortDescription xml:lang="cs">NÄm</shortDescription>
>-        <shortDescription xml:lang="da">Tys</shortDescription>
>-        <shortDescription xml:lang="ru">ÐÐµÐ¼</shortDescription>
>-        <shortDescription xml:lang="sk">Nem</shortDescription>
>-        <shortDescription xml:lang="sr">Ð½ÐµÐ¼</shortDescription>
>-        <shortDescription xml:lang="tr">Alm</shortDescription>
>-        <description>Swiss German</description>
>-        <description xml:lang="bg">ÑÐ²ÐµÐ¹ÑÐ°ÑÑÐºÐ° Ð½ÐµÐ¼ÑÐºÐ°</description>
>-        <description xml:lang="cs">Å vÃ½carskÃ© nÄmeckÃ©</description>
>-        <description xml:lang="da">Schweizisk-tysk</description>
>-        <description xml:lang="fr">Allemand Suisse</description>
>-        <description xml:lang="hu">svÃ¡jci nÃ©met</description>
>-        <description xml:lang="nl">Zwitsers-Duits</description>
>-        <description xml:lang="ru">ÐÐµÐ¼ÐµÑÐºÐ°Ñ (Ð¨Ð²ÐµÐ¹ÑÐ°ÑÐ¸Ñ)</description>
>-        <description xml:lang="sk">NemeckÃ© (Å vajÄiarsko)</description>
>-        <description xml:lang="sr">ÑÐ²Ð°ÑÑÐ°ÑÑÐºÐ¸ Ð½ÐµÐ¼Ð°ÑÐºÐ¸</description>
>-        <description xml:lang="tr">Ä°sviÃ§re AlmancasÄ±</description>
>-        <description xml:lang="uk">ÐÑÐ¼ÐµÑÑÐºÐ° (Ð¨Ð²ÐµÐ¹ÑÐ°ÑÑÑ)</description>
>-        <description xml:lang="zh_CN">çå¸å¾·è¯</description>
>-      </configItem>
>-      <variantList>
>         <variant>
>+	  <configItem>
>+	    <name>de_sundeadkeys</name>
>+	    <description>German, Sun dead keys</description>
>+	  </configItem>
>+	</variant>
>+	<variant>
>           <configItem>
>-            <name>nodeadkeys</name>
>-            <description>Eliminate dead keys</description>
>-            <description xml:lang="bg">ÐÐ·ÐºÐ»ÑÑÐ¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»Ð½Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="cs">Eliminovat mrtvÃ© klÃ¡vesy</description>
>-            <description xml:lang="da">SlÃ¥ dÃ¸de taster fra</description>
>-            <description xml:lang="fr">Ã©liminer des clÃ©s mortes</description>
>-            <description xml:lang="hu">Halott billentyÅ±k tiltÃ¡sa</description>
>-            <description xml:lang="nl">Dode toetsen niet doen</description>
>-            <description xml:lang="ru">ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys)</description>
>-            <description xml:lang="sk">EliminovaÅ¥ mrtvÃ© klÃ¡ves</description>
>-            <description xml:lang="sr">Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð°ÐºÑÐµÐ½ÑÐµ</description>
>-            <description xml:lang="tr">ÃlÃ¼ tuÅlarÄ± normal yapar</description>
>-            <description xml:lang="uk">ÐÐ¸Ð»ÑÑÐ¸ÑÐ¸ ÑÐ¿ÐµÑÑÐ°Ð»ÑÐ½Ñ ÐºÐ»Ð°Ð²ÑÑÑ (dead keys)</description>
>-            <description xml:lang="zh_CN">é¤å»æ»é®</description>
>+	    <name>fr</name>
>+	    <description>French</description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>-            <name>sundeadkeys</name>
>-            <description>Sun dead keys</description>
>-            <description xml:lang="cs">MrtvÃ© klÃ¡vesy Sun</description>
>-            <description xml:lang="da">Sun dÃ¸de taster</description>
>-            <description xml:lang="fr">clÃ©s mortes Sun</description>
>-            <description xml:lang="hu">Sun halott billentyÅ±k</description>
>-            <description xml:lang="nl">Sun dode toetsen</description>
>-            <description xml:lang="ru">Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ (dead keys) Sun</description>
>-            <description xml:lang="sk">MÅtve klÃ¡vesy Sun</description>
>-            <description xml:lang="sr">Sun-Ð¾Ð²Ð¸ Ð°ÐºÑÐµÐ½ÑÐ¸</description>
>-            <description xml:lang="tr">Sun Ã¶lÃ¼ tuÅlar</description>
>-            <description xml:lang="zh_CN">Sun æ»é®</description>
>+	    <name>fr_nodeadkeys</name>
>+	    <description>French, eliminate dead keys</description>
>           </configItem>
>         </variant>
>+	<variant>
>+	  <configItem>
>+	    <name>fr_sundeadkeys</name>
>+	    <description>French, Sun dead keys</description>
>+	  </configItem>
>+	</variant>
>       </variantList>
>     </layout>
>     <layout>
>@@ -4697,6 +4380,13 @@
>     </layout>
>     <layout>
>       <configItem>
>+        <name>ir</name>
>+	<description>Iranian</description>
>+      </configItem>
>+      <variantList/>
>+    </layout>
>+    <layout>
>+      <configItem>
>         <name>ie</name>
>         <shortDescription>Irl</shortDescription>
>         <shortDescription xml:lang="cs">Irs</shortDescription>
>@@ -4852,7 +4542,7 @@
>       <option>
>         <configItem>
>           <name>grp:switch</name>
>-          <description>R-Alt switches group while pressed</description>
>+          <description>Right Alt switches group while pressed</description>
>           <description xml:lang="bg">ÐÐµÑÐ½Ð¸ÑÑ Alt ÑÐ¼ÐµÐ½Ñ Ð³ÑÑÐ¿Ð°ÑÐ° Ð´Ð¾ÐºÐ°ÑÐ¾ Ðµ Ð½Ð°ÑÐ¸ÑÐ½Ð°Ñ</description>
>           <description xml:lang="cs">PravÃ½ Alt pÅepne pÅi stisku skupinu</description>
>           <description xml:lang="da">HÃ¸jre Alt skifter gruppe mens nedtrykket</description>
>@@ -5353,6 +5043,12 @@
>           <description xml:lang="ru">ÐÑÐ±Ð¾Ñ 3-Ð³Ð¾ ÑÑÐ¾Ð²Ð½Ñ Ð½Ð°Ð¶Ð°ÑÐ¸ÐµÐ¼ Ð¿ÑÐ°Ð²Ð¾Ð¹ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Alt</description>
>         </configItem>
>       </option>
>+      <option>
>+        <configItem>
>+          <name>lv3:ralt_switch_multikey</name>
>+          <description>Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key</description>
>+        </configItem>
>+      </option>
>     </group>
>     <group allowMultipleSelection="false">
>       <configItem>
>@@ -5712,7 +5408,7 @@
>       </option>
>       <option>
>         <configItem>
>-          <name>altwin:meta_super</name>
>+          <name>altwin:super_win</name>
>           <description>Super is mapped to the Win-keys (default).</description>
>           <description xml:lang="bg">Win ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ÑÐµ ÑÑÐ½ÐºÑÐ¸Ð¾Ð½Ð¸ÑÐ°Ñ ÐºÐ°ÑÐ¾ Super</description>
>           <description xml:lang="cs">Super je mapovÃ¡no na klÃ¡vesy Win (vÃ½chozÃ).</description>
>@@ -5730,7 +5426,7 @@
>       </option>
>       <option>
>         <configItem>
>-          <name>altwin:meta_hyper</name>
>+          <name>altwin:hyper_win</name>
>           <description>Hyper is mapped to the Win-keys.</description>
>           <description xml:lang="bg">Hyper ÑÑÐ¾ÑÐ²ÐµÑÑÑÐ²Ð° Ð½Ð° ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ÑÐµ Win</description>
>           <description xml:lang="cs">Hyper je mapovÃ¡na na klÃ¡vesy Win.</description>

Actions: View | Splinter Review

Attachments on bug 1899: 1340 | 1341 | 1342 | 1343 | 1344 | 1345 | 1346 | 1347 | 1348 | 1349 | 1350 | 1351

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.