improved structure for new options, better descriptions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index e8b7de0..f952d54 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4720,7 +4720,25 @@
       <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>
@@ -5100,7 +5118,7 @@
       <option>
         <configItem>
           <name>compose:102</name>
-          <_description>Less-than/Greater-than</_description>
+          <_description>&lt;Less/Greater&gt;</_description>
         </configItem>
       </option>
       <option>
@@ -5193,24 +5211,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">
       <!-- Special shortcuts for the Euro character -->
@@ -5251,49 +5251,49 @@
       <option>
         <configItem>
           <name>lv5:lsgt_switch_lock</name>
-         <_description>&lt;Less/Greater&gt; chooses 5th level and locks it when pressed together with another 5th-level-chooser</_description>
+         <_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 and locks it when pressed together with another 5th-level-chooser</_description>
+          <_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 and locks it when pressed together with another 5th-level-chooser</_description>
+          <_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 and locks it when pressed together with another 5th-level-chooser</_description>
+          <_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 and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+         <_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 and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+          <_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 and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+          <_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:rwin_switch_lock_cancel</name>
-          <_description>Right Win chooses 5th level and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+          <_description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</_description>
         </configItem>
       </option>
       <option>
@@ -5311,7 +5311,7 @@
       <option>
         <configItem>
           <name>lv5:lsgt_switch_lock_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>
+         <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>