Update des xkb-Treibers

 • Dateien auf xkeyboard-config angeglichen (darunter viel refactoring des Neo-Treibers)
 • 2 für Neo unwichtige Types auskommentiert (sollte das Problem mit dem X-Server fixen)

git-svn-id: https://svn.neo-layout.org@2308 b9310e46-f624-0410-8ea1-cfbb3a30dc96

4 files changed, 239 insertions, 163 deletions

diff --git a/linux/X/rules/base b/linux/X/rules/base
index 2f0c8f4..68c29df 100644
--- a/linux/X/rules/base
+++ b/linux/X/rules/base
@@ -126,9 +126,6 @@
   sun6		=	sun(type6_usb)
   sun6euro	=	sun(type6tuv_usb)
   pc98		=	xfree98(pc98)
-  evdev		=	evdev
- $nokiamodels	=	evdev
-  olpc		=	evdev
  $applealu	=	macintosh(alukbd)
   macintosh_hhk	=	macintosh(hhk)
   macintosh_old	=	macintosh(old)
@@ -953,7 +950,6 @@
   a4_rfkb23     =       +inet(media_nav_acpi_common)
   asus_laptop   =       +inet(media_common)
   acer_tm_800   =       +inet(acer_laptop)
-  acpi          =       +inet(acpi_common)
   benqx730      =       +inet(benqx)
   benqx800      =       +inet(benqx)
   btc5126t      =       +inet(nav_acpi_common)
@@ -1000,32 +996,21 @@
   $maclaptop    =       +inet(apple)+level3(enter_switch)
   $applealu     =       +inet(apple)
   $macs	        =       +inet(apple)
-  
-  
-// Neo special modifier-keys
+
 ! layout	variant		=	compat
-  de		neo			=	+neo_mods
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+
 ! layout[1]	variant[1]	=	compat
-  de		neo			=	+neo_mods
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+
 ! layout[2]	variant[2]	=	compat
-  de		neo			=	+neo_mods:2
+  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+
 ! layout[3]	variant[3]	=	compat
-  de		neo			=	+neo_mods:3
-! layout[4]	variant[4]	=	compat
-  de		neo			=	+neo_mods:4
+  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
 
-! layout    variant     =   geometry
-  de        neo         =   pc(pc105)
-! layout[1] variant[1]  =   geometry
-  de        neo         =   pc(pc105)
-! layout[2] variant[2]  =   geometry
-  de        neo         =   pc(pc105)
-! layout[3] variant[3]  =   geometry
-  de        neo         =   pc(pc105)
-! layout[4] variant[4]  =   geometry
-  de        neo         =   pc(pc105)
-  
-  
+! layout[4]	variant[4]	=	compat
+  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
 
 ! model		layout		=	compat
   pc98		nec_vndr/jp	=	pc98(basic)
@@ -1191,14 +1176,14 @@
   lv3:caps_switch_latch              =       +level3(caps_switch_latch)
   lv3:bksl_switch_latch              =       +level3(bksl_switch_latch)
   lv3:lsgt_switch_latch              =       +level3(lsgt_switch_latch)
-  lv5:lsgt_switch_numlock            =       +level5(lsgt_switch_numlock)
-  lv5:ralt_switch_numlock            =       +level5(ralt_switch_numlock)
-  lv5:lwin_switch_numlock            =       +level5(lwin_switch_numlock)
-  lv5:rwin_switch_numlock            =       +level5(rwin_switch_numlock)
-  lv5:lsgt_switch_numlock_cancel     =       +level5(lsgt_switch_numlock_cancel)
-  lv5:ralt_switch_numlock_cancel     =       +level5(ralt_switch_numlock_cancel)
-  lv5:lwin_switch_numlock_cancel     =       +level5(lwin_switch_numlock_cancel)
-  lv5:rwin_switch_numlock_cancel     =       +level5(rwin_switch_numlock_cancel)
+  lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
+  lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
+  lv5:lwin_switch_lock            =       +level5(lwin_switch_lock)
+  lv5:rwin_switch_lock            =       +level5(rwin_switch_lock)
+  lv5:lsgt_switch_lock_cancel     =       +level5(lsgt_switch_lock_cancel)
+  lv5:ralt_switch_lock_cancel     =       +level5(ralt_switch_lock_cancel)
+  lv5:lwin_switch_lock_cancel     =       +level5(lwin_switch_lock_cancel)
+  lv5:rwin_switch_lock_cancel     =       +level5(rwin_switch_lock_cancel)
 
 
 
diff --git a/linux/X/rules/base.xml b/linux/X/rules/base.xml
index e48c705..952a457 100644
--- a/linux/X/rules/base.xml
+++ b/linux/X/rules/base.xml
@@ -123,13 +123,6 @@
     </model>
     <model>
       <configItem>
-        <name>acpi</name>
-        <description>ACPI Standard</description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>azonaRF2300</name>
         <description>Azona RF2300 wireless Internet Keyboard</description>
         <vendor>Azona</vendor>
@@ -1135,13 +1128,6 @@
     </model>
     <model>
       <configItem>
-	<name>evdev</name>
-	<description>Evdev-managed keyboard</description>
-	<vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
 	<name>benqx</name>
 	<description>BenQ X-Touch</description>
 	<vendor>BenQ</vendor>
@@ -2492,6 +2478,19 @@
             <languageList><iso639Id>hau</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>avn</name>
+            <description>Avatime</description>
+            <languageList><iso639Id>avn</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>gillbt</name>
+            <description>GILLBT</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4416,6 +4415,22 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>tz</name>
+        <shortDescription>Tza</shortDescription>
+	<description>Tanzania</description>
+        <languageList><iso639Id>swa</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ke</name>
+        <shortDescription>Ken</shortDescription>
+	<description>Kenya</description>
+        <languageList><iso639Id>swa</iso639Id></languageList>
+      </configItem>
+    </layout>
   </layoutList>
   <optionList>
     <group allowMultipleSelection="true">
@@ -4698,13 +4713,31 @@
       <option>
         <configItem>
           <name>lv3:bksl_switch</name>
-          <description>&lt;BKSL&gt;-Key</description>
+          <description>Backslash</description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:lsgt_switch</name>
-          <description>&lt;LSGT&gt;-Key</description>
+	  <description>&lt;Less/Greater&gt;</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch_latch</name>
+          <description>CapsLock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch_latch</name>
+          <description>Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lsgt_switch_latch</name>
+	  <description>&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
         </configItem>
       </option>
     </group>
@@ -5081,7 +5114,7 @@
       <option>
         <configItem>
           <name>compose:102</name>
-          <description>Less-than/Greater-than</description>
+          <description>&lt;Less/Greater&gt;</description>
         </configItem>
       </option>
       <option>
@@ -5174,24 +5207,6 @@
           <description>Both Shift-Keys together toggle ShiftLock</description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <name>lv3:caps_switch_latch</name>
-          <description>CapsLock chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:bksl_switch_latch</name>
-          <description>&lt;BKSL&gt;-Key chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:lsgt_switch_latch</name>
-          <description>&lt;LSGT&gt;-Key chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
     </group>
     <group allowMultipleSelection="true">
       
@@ -5225,56 +5240,91 @@
       </option>
     </group>
     <group allowMultipleSelection="true">
-      
       <configItem>
         <name>lv5</name>
-        <description>5th level options</description>
+        <description>Key to choose 5th level</description>
       </configItem>
       <option>
         <configItem>
-          <name>lv5:lsgt_switch_numlock</name>
-          <description>&lt;LSGT&gt;-Key chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+          <name>lv5:lsgt_switch_lock</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock</name>
+          <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock</name>
+          <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock_cancel</name>
+          <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock_cancel</name>
+          <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:ralt_switch_numlock</name>
-          <description>Right Alt chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+          <name>lv5:rwin_switch_lock_cancel</name>
+          <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lwin_switch_numlock</name>
+          <name>lv5:lwin_switch_lock</name>
           <description>Left Win chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:rwin_switch_numlock</name>
+          <name>lv5:rwin_switch_lock</name>
           <description>Right Win chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lsgt_switch_numlock_cancel</name>
-          <description>&lt;LSGT&gt;-Key chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:ralt_switch_numlock_cancel</name>
+          <name>lv5:ralt_switch_lock_cancel</name>
           <description>Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lwin_switch_numlock_cancel</name>
+          <name>lv5:lwin_switch_lock_cancel</name>
           <description>Left Win chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:rwin_switch_numlock_cancel</name>
+          <name>lv5:rwin_switch_lock_cancel</name>
           <description>Right Win chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
@@ -5431,4 +5481,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
+</xkbConfigRegistry>
\ No newline at end of file
diff --git a/linux/X/rules/evdev b/linux/X/rules/evdev
index 9fa1577..307c2a5 100644
--- a/linux/X/rules/evdev
+++ b/linux/X/rules/evdev
@@ -932,36 +932,27 @@
   *		us		alt-intl-unicode	=	+extras/us(alt-intl-unicode):4
   *		us		crd	=	+extras/us(crd):4
   *		us		intl-unicode	=	+extras/us(intl-unicode):4
-  
-  
-// Neo special modifier-keys
-! layout	variant		=	compat
-  de		neo			=	+neo_mods
-! layout[1]	variant[1]	=	compat
-  de		neo			=	+neo_mods
-! layout[2]	variant[2]	=	compat
-  de		neo			=	+neo_mods:2
-! layout[3]	variant[3]	=	compat
-  de		neo			=	+neo_mods:3
-! layout[4]	variant[4]	=	compat
-  de		neo			=	+neo_mods:4
-
-! layout    variant     =   geometry
-  de        neo         =   pc(pc105)
-! layout[1] variant[1]  =   geometry
-  de        neo         =   pc(pc105)
-! layout[2] variant[2]  =   geometry
-  de        neo         =   pc(pc105)
-! layout[3] variant[3]  =   geometry
-  de        neo         =   pc(pc105)
-! layout[4] variant[4]  =   geometry
-  de        neo         =   pc(pc105)
 
 ! model		=	symbols
   $evdevkbds    =   +inet(evdev)+inet(%m)
   applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alujiskeys)
   *             =   +inet(evdev)
 
+! layout	variant		=	compat
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+
+! layout[1]	variant[1]	=	compat
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+
+! layout[2]	variant[2]	=	compat
+  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+
+! layout[3]	variant[3]	=	compat
+  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+
+! layout[4]	variant[4]	=	compat
+  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+
 ! model		layout		=	compat
   pc98		nec_vndr/jp	=	pc98(basic)
   *		jp		=	complete+japan
@@ -1126,14 +1117,14 @@
   lv3:caps_switch_latch              =       +level3(caps_switch_latch)
   lv3:bksl_switch_latch              =       +level3(bksl_switch_latch)
   lv3:lsgt_switch_latch              =       +level3(lsgt_switch_latch)
-  lv5:lsgt_switch_numlock            =       +level5(lsgt_switch_numlock)
-  lv5:ralt_switch_numlock            =       +level5(ralt_switch_numlock)
-  lv5:lwin_switch_numlock            =       +level5(lwin_switch_numlock)
-  lv5:rwin_switch_numlock            =       +level5(rwin_switch_numlock)
-  lv5:lsgt_switch_numlock_cancel     =       +level5(lsgt_switch_numlock_cancel)
-  lv5:ralt_switch_numlock_cancel     =       +level5(ralt_switch_numlock_cancel)
-  lv5:lwin_switch_numlock_cancel     =       +level5(lwin_switch_numlock_cancel)
-  lv5:rwin_switch_numlock_cancel     =       +level5(rwin_switch_numlock_cancel)
+  lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
+  lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
+  lv5:lwin_switch_lock            =       +level5(lwin_switch_lock)
+  lv5:rwin_switch_lock            =       +level5(rwin_switch_lock)
+  lv5:lsgt_switch_lock_cancel     =       +level5(lsgt_switch_lock_cancel)
+  lv5:ralt_switch_lock_cancel     =       +level5(ralt_switch_lock_cancel)
+  lv5:lwin_switch_lock_cancel     =       +level5(lwin_switch_lock_cancel)
+  lv5:rwin_switch_lock_cancel     =       +level5(rwin_switch_lock_cancel)
 
 
 
diff --git a/linux/X/rules/evdev.xml b/linux/X/rules/evdev.xml
index e48c705..952a457 100644
--- a/linux/X/rules/evdev.xml
+++ b/linux/X/rules/evdev.xml
@@ -123,13 +123,6 @@
     </model>
     <model>
       <configItem>
-        <name>acpi</name>
-        <description>ACPI Standard</description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>azonaRF2300</name>
         <description>Azona RF2300 wireless Internet Keyboard</description>
         <vendor>Azona</vendor>
@@ -1135,13 +1128,6 @@
     </model>
     <model>
       <configItem>
-	<name>evdev</name>
-	<description>Evdev-managed keyboard</description>
-	<vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
 	<name>benqx</name>
 	<description>BenQ X-Touch</description>
 	<vendor>BenQ</vendor>
@@ -2492,6 +2478,19 @@
             <languageList><iso639Id>hau</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>avn</name>
+            <description>Avatime</description>
+            <languageList><iso639Id>avn</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>gillbt</name>
+            <description>GILLBT</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4416,6 +4415,22 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>tz</name>
+        <shortDescription>Tza</shortDescription>
+	<description>Tanzania</description>
+        <languageList><iso639Id>swa</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ke</name>
+        <shortDescription>Ken</shortDescription>
+	<description>Kenya</description>
+        <languageList><iso639Id>swa</iso639Id></languageList>
+      </configItem>
+    </layout>
   </layoutList>
   <optionList>
     <group allowMultipleSelection="true">
@@ -4698,13 +4713,31 @@
       <option>
         <configItem>
           <name>lv3:bksl_switch</name>
-          <description>&lt;BKSL&gt;-Key</description>
+          <description>Backslash</description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:lsgt_switch</name>
-          <description>&lt;LSGT&gt;-Key</description>
+	  <description>&lt;Less/Greater&gt;</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch_latch</name>
+          <description>CapsLock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch_latch</name>
+          <description>Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lsgt_switch_latch</name>
+	  <description>&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
         </configItem>
       </option>
     </group>
@@ -5081,7 +5114,7 @@
       <option>
         <configItem>
           <name>compose:102</name>
-          <description>Less-than/Greater-than</description>
+          <description>&lt;Less/Greater&gt;</description>
         </configItem>
       </option>
       <option>
@@ -5174,24 +5207,6 @@
           <description>Both Shift-Keys together toggle ShiftLock</description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <name>lv3:caps_switch_latch</name>
-          <description>CapsLock chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:bksl_switch_latch</name>
-          <description>&lt;BKSL&gt;-Key chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:lsgt_switch_latch</name>
-          <description>&lt;LSGT&gt;-Key chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
     </group>
     <group allowMultipleSelection="true">
       
@@ -5225,56 +5240,91 @@
       </option>
     </group>
     <group allowMultipleSelection="true">
-      
       <configItem>
         <name>lv5</name>
-        <description>5th level options</description>
+        <description>Key to choose 5th level</description>
       </configItem>
       <option>
         <configItem>
-          <name>lv5:lsgt_switch_numlock</name>
-          <description>&lt;LSGT&gt;-Key chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+          <name>lv5:lsgt_switch_lock</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock</name>
+          <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock</name>
+          <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock_cancel</name>
+          <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock_cancel</name>
+          <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:ralt_switch_numlock</name>
-          <description>Right Alt chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+          <name>lv5:rwin_switch_lock_cancel</name>
+          <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lwin_switch_numlock</name>
+          <name>lv5:lwin_switch_lock</name>
           <description>Left Win chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:rwin_switch_numlock</name>
+          <name>lv5:rwin_switch_lock</name>
           <description>Right Win chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lsgt_switch_numlock_cancel</name>
-          <description>&lt;LSGT&gt;-Key chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:ralt_switch_numlock_cancel</name>
+          <name>lv5:ralt_switch_lock_cancel</name>
           <description>Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lwin_switch_numlock_cancel</name>
+          <name>lv5:lwin_switch_lock_cancel</name>
           <description>Left Win chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:rwin_switch_numlock_cancel</name>
+          <name>lv5:rwin_switch_lock_cancel</name>
           <description>Right Win chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
@@ -5431,4 +5481,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
+</xkbConfigRegistry>
\ No newline at end of file