$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>