--- xkeyboard-config-2.11.orig/rules/evdev.xml.in	2014-01-15 02:05:04.000000000 +0100
+++ xkeyboard-config-2.11/rules/evdev.xml.in	2014-03-04 14:30:54.000000000 +0100
@@ -5,627 +5,627 @@
     <model>
       <configItem>
         <name>pc101</name>
-        <_description>Generic 101-key PC</_description>
+        <description>Generic 101-key PC</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>pc102</name>
-        <_description>Generic 102-key (Intl) PC</_description>
+        <description>Generic 102-key (Intl) PC</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>pc104</name>
-        <_description>Generic 104-key PC</_description>
+        <description>Generic 104-key PC</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>pc105</name>
-        <_description>Generic 105-key (Intl) PC</_description>
+        <description>Generic 105-key (Intl) PC</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dell101</name>
-        <_description>Dell 101-key PC</_description>
+        <description>Dell 101-key PC</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>latitude</name>
-        <_description>Dell Latitude series laptop</_description>
+        <description>Dell Latitude series laptop</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dellm65</name>
-        <_description>Dell Precision M65</_description>
+        <description>Dell Precision M65</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>everex</name>
-        <_description>Everex STEPnote</_description>
+        <description>Everex STEPnote</description>
         <vendor>Everex</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>flexpro</name>
-        <_description>Keytronic FlexPro</_description>
+        <description>Keytronic FlexPro</description>
         <vendor>Keytronic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoft</name>
-        <_description>Microsoft Natural</_description>
+        <description>Microsoft Natural</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>omnikey101</name>
-        <_description>Northgate OmniKey 101</_description>
+        <description>Northgate OmniKey 101</description>
         <vendor>Northgate</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>winbook</name>
-        <_description>Winbook Model XP5</_description>
+        <description>Winbook Model XP5</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>pc98</name>
-        <_description>PC-98xx Series</_description>
+        <description>PC-98xx Series</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>a4techKB21</name>
-        <_description>A4Tech KB-21</_description>
+        <description>A4Tech KB-21</description>
         <vendor>A4Tech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>a4techKBS8</name>
-        <_description>A4Tech KBS-8</_description>
+        <description>A4Tech KBS-8</description>
         <vendor>A4Tech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>a4_rfkb23</name>
-        <_description>A4Tech Wireless Desktop RFKB-23</_description>
+        <description>A4Tech Wireless Desktop RFKB-23</description>
         <vendor>A4Tech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>airkey</name>
-        <_description>Acer AirKey V</_description>
+        <description>Acer AirKey V</description>
         <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>azonaRF2300</name>
-        <_description>Azona RF2300 wireless Internet Keyboard</_description>
+        <description>Azona RF2300 wireless Internet Keyboard</description>
         <vendor>Azona</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>scorpius</name>
-        <_description>Advance Scorpius KI</_description>
+        <description>Advance Scorpius KI</description>
         <vendor>Scorpius</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>brother</name>
-        <_description>Brother Internet Keyboard</_description>
+        <description>Brother Internet Keyboard</description>
         <vendor>Brother</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc5113rf</name>
-        <_description>BTC 5113RF Multimedia</_description>
+        <description>BTC 5113RF Multimedia</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc5126t</name>
-        <_description>BTC 5126T</_description>
+        <description>BTC 5126T</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc6301urf</name>
-        <_description>BTC 6301URF</_description>
+        <description>BTC 6301URF</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc9000</name>
-        <_description>BTC 9000</_description>
+        <description>BTC 9000</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc9000a</name>
-        <_description>BTC 9000A</_description>
+        <description>BTC 9000A</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc9001ah</name>
-        <_description>BTC 9001AH</_description>
+        <description>BTC 9001AH</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc5090</name>
-        <_description>BTC 5090</_description>
+        <description>BTC 5090</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc9019u</name>
-        <_description>BTC 9019U</_description>
+        <description>BTC 9019U</description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc9116u</name>
-        <_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
+        <description>BTC 9116U Mini Wireless Internet and Gaming</description>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cherryblue</name>
-        <_description>Cherry Blue Line CyBo@rd</_description>
+        <description>Cherry Blue Line CyBo@rd</description>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cherryblueb</name>
-        <_description>Cherry CyMotion Master XPress</_description>
+        <description>Cherry CyMotion Master XPress</description>
         <vendor>Cherry</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cherrybluea</name>
-        <_description>Cherry Blue Line CyBo@rd (alternate option)</_description>
+        <description>Cherry Blue Line CyBo@rd (alternate option)</description>
         <vendor>Cherry</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cherrycyboard</name>
-        <_description>Cherry CyBo@rd USB-Hub</_description>
+        <description>Cherry CyBo@rd USB-Hub</description>
         <vendor>Cherry</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cherrycmexpert</name>
-        <_description>Cherry CyMotion Expert</_description>
+        <description>Cherry CyMotion Expert</description>
         <vendor>Cherry</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cherrybunlim</name>
-        <_description>Cherry B.UNLIMITED</_description>
+        <description>Cherry B.UNLIMITED</description>
         <vendor>Cherry</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>chicony</name>
-        <_description>Chicony Internet Keyboard</_description>
+        <description>Chicony Internet Keyboard</description>
         <vendor>Chicony</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>chicony0108</name>
-        <_description>Chicony KU-0108</_description>
+        <description>Chicony KU-0108</description>
         <vendor>Chicony</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>chicony0420</name>
-        <_description>Chicony KU-0420</_description>
+        <description>Chicony KU-0420</description>
         <vendor>Chicony</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>chicony9885</name>
-        <_description>Chicony KB-9885</_description>
+        <description>Chicony KB-9885</description>
         <vendor>Chicony</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>compaqeak8</name>
-        <_description>Compaq Easy Access Keyboard</_description>
+        <description>Compaq Easy Access Keyboard</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>compaqik7</name>
-        <_description>Compaq Internet Keyboard (7 keys)</_description>
+        <description>Compaq Internet Keyboard (7 keys)</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>compaqik13</name>
-        <_description>Compaq Internet Keyboard (13 keys)</_description>
+        <description>Compaq Internet Keyboard (13 keys)</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>compaqik18</name>
-        <_description>Compaq Internet Keyboard (18 keys)</_description>
+        <description>Compaq Internet Keyboard (18 keys)</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>cymotionlinux</name>
-        <_description>Cherry CyMotion Master Linux</_description>
+        <description>Cherry CyMotion Master Linux</description>
         <vendor>Cherry</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>armada</name>
-        <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description>
+        <description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>presario</name>
-        <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description>
+        <description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>ipaq</name>
-        <_description>Compaq iPaq Keyboard</_description>
+        <description>Compaq iPaq Keyboard</description>
         <vendor>Compaq</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dell</name>
-        <_description>Dell</_description>
+        <description>Dell</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dellsk8125</name>
-        <_description>Dell SK-8125</_description>
+        <description>Dell SK-8125</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dellsk8135</name>
-        <_description>Dell SK-8135</_description>
+        <description>Dell SK-8135</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dellusbmm</name>
-        <_description>Dell USB Multimedia Keyboard</_description>
+        <description>Dell USB Multimedia Keyboard</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>inspiron</name>
-        <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description>
+        <description>Dell Laptop/notebook Inspiron 6xxx/8xxx</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>precision_m</name>
-        <_description>Dell Laptop/notebook Precision M series</_description>
+        <description>Dell Laptop/notebook Precision M series</description>
         <vendor>Dell</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dexxa</name>
-        <_description>Dexxa Wireless Desktop Keyboard</_description>
+        <description>Dexxa Wireless Desktop Keyboard</description>
         <vendor>Dexxa</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>diamond</name>
-        <_description>Diamond 9801 / 9802 series</_description>
+        <description>Diamond 9801 / 9802 series</description>
         <vendor>Diamond</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>dtk2000</name>
-        <_description>DTK2000</_description>
+        <description>DTK2000</description>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>ennyah_dkb1008</name>
-        <_description>Ennyah DKB-1008</_description>
+        <description>Ennyah DKB-1008</description>
         <vendor>Ennyah</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>fscaa1667g</name>
-        <_description>Fujitsu-Siemens Computers AMILO laptop</_description>
+        <description>Fujitsu-Siemens Computers AMILO laptop</description>
         <vendor>Fujitsu-Siemens</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>genius</name>
-        <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description>
+        <description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
         <vendor>Genius</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>geniuscomfy</name>
-        <_description>Genius Comfy KB-12e</_description>
+        <description>Genius Comfy KB-12e</description>
         <vendor>Genius</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>geniuscomfy2</name>
-        <_description>Genius Comfy KB-21e-Scroll</_description>
+        <description>Genius Comfy KB-21e-Scroll</description>
         <vendor>Genius</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>geniuskb19e</name>
-        <_description>Genius KB-19e NB</_description>
+        <description>Genius KB-19e NB</description>
         <vendor>Genius</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>geniuskkb2050hs</name>
-        <_description>Genius KKB-2050HS</_description>
+        <description>Genius KKB-2050HS</description>
         <vendor>Genius</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>gyration</name>
-        <_description>Gyration</_description>
+        <description>Gyration</description>
         <vendor>Gyration</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>htcdream</name>
-        <_description>HTC Dream</_description>
+        <description>HTC Dream</description>
         <vendor>HTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>kinesis</name>
-        <_description>Kinesis</_description>
+        <description>Kinesis</description>
         <vendor>Kinesis</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logitech_base</name>
-        <_description>Logitech Generic Keyboard</_description>
+        <description>Logitech Generic Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logitech_g15</name>
-        <_description>Logitech G15 extra keys via G15daemon</_description>
+        <description>Logitech G15 extra keys via G15daemon</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpi6</name>
-        <_description>Hewlett-Packard Internet Keyboard</_description>
+        <description>Hewlett-Packard Internet Keyboard</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hp250x</name>
-        <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description>
+        <description>Hewlett-Packard SK-250x Multimedia Keyboard</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpxe3gc</name>
-        <_description>Hewlett-Packard Omnibook XE3 GC</_description>
+        <description>Hewlett-Packard Omnibook XE3 GC</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpxe3gf</name>
-        <_description>Hewlett-Packard Omnibook XE3 GF</_description>
+        <description>Hewlett-Packard Omnibook XE3 GF</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpxt1000</name>
-        <_description>Hewlett-Packard Omnibook XT1000</_description>
+        <description>Hewlett-Packard Omnibook XT1000</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpdv5</name>
-        <_description>Hewlett-Packard Pavilion dv5</_description>
+        <description>Hewlett-Packard Pavilion dv5</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpzt11xx</name>
-        <_description>Hewlett-Packard Pavilion ZT11xx</_description>
+        <description>Hewlett-Packard Pavilion ZT11xx</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hp500fa</name>
-        <_description>Hewlett-Packard Omnibook 500 FA</_description>
+        <description>Hewlett-Packard Omnibook 500 FA</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hp5xx</name>
-        <_description>Hewlett-Packard Omnibook 5xx</_description>
+        <description>Hewlett-Packard Omnibook 5xx</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpnx9020</name>
-        <_description>Hewlett-Packard nx9020</_description>
+        <description>Hewlett-Packard nx9020</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hp6000</name>
-        <_description>Hewlett-Packard Omnibook 6000/6100</_description>
+        <description>Hewlett-Packard Omnibook 6000/6100</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>honeywell_euroboard</name>
-        <_description>Honeywell Euroboard</_description>
+        <description>Honeywell Euroboard</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hpmini110</name>
-        <_description>Hewlett-Packard Mini 110 Notebook</_description>
+        <description>Hewlett-Packard Mini 110 Notebook</description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>rapidaccess</name>
-        <_description>IBM Rapid Access</_description>
+        <description>IBM Rapid Access</description>
         <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>rapidaccess2</name>
-        <_description>IBM Rapid Access II</_description>
+        <description>IBM Rapid Access II</description>
         <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>thinkpad</name>
-        <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
+        <description>IBM ThinkPad 560Z/600/600E/A22E</description>
         <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>thinkpad60</name>
-        <_description>IBM ThinkPad R60/T60/R61/T61</_description>
+        <description>IBM ThinkPad R60/T60/R61/T61</description>
         <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>thinkpadz60</name>
-        <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>
+        <description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</description>
         <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>ibm_spacesaver</name>
-        <_description>IBM Space Saver</_description>
+        <description>IBM Space Saver</description>
         <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiaccess</name>
-        <_description>Logitech Access Keyboard</_description>
+        <description>Logitech Access Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiclx300</name>
-        <_description>Logitech Cordless Desktop LX-300</_description>
+        <description>Logitech Cordless Desktop LX-300</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logii350</name>
-        <_description>Logitech Internet 350 Keyboard</_description>
+        <description>Logitech Internet 350 Keyboard</description>
         <vendor>Logitech</vendor>
         <hwList> <hwId>046d:c313</hwId></hwList>
       </configItem>
@@ -633,665 +633,665 @@
     <model>
       <configItem>
         <name>logimel</name>
-        <_description>Logitech Media Elite Keyboard</_description>
+        <description>Logitech Media Elite Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicd</name>
-        <_description>Logitech Cordless Desktop</_description>
+        <description>Logitech Cordless Desktop</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicd_it</name>
-        <_description>Logitech Cordless Desktop iTouch</_description>
+        <description>Logitech Cordless Desktop iTouch</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicd_nav</name>
-        <_description>Logitech Cordless Desktop Navigator</_description>
+        <description>Logitech Cordless Desktop Navigator</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicd_opt</name>
-        <_description>Logitech Cordless Desktop Optical</_description>
+        <description>Logitech Cordless Desktop Optical</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicda</name>
-        <_description>Logitech Cordless Desktop (alternate option)</_description>
+        <description>Logitech Cordless Desktop (alternate option)</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicdpa2</name>
-        <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description>
+        <description>Logitech Cordless Desktop Pro (alternate option 2)</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicfn</name>
-        <_description>Logitech Cordless Freedom/Desktop Navigator</_description>
+        <description>Logitech Cordless Freedom/Desktop Navigator</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicdn</name>
-        <_description>Logitech Cordless Desktop Navigator</_description>
+        <description>Logitech Cordless Desktop Navigator</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiitc</name>
-        <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description>
+        <description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiik</name>
-        <_description>Logitech Internet Keyboard</_description>
+        <description>Logitech Internet Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>itouch</name>
-        <_description>Logitech iTouch</_description>
+        <description>Logitech iTouch</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logicink</name>
-        <_description>Logitech Internet Navigator Keyboard</_description>
+        <description>Logitech Internet Navigator Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiex110</name>
-        <_description>Logitech Cordless Desktop EX110</_description>
+        <description>Logitech Cordless Desktop EX110</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiinkse</name>
-        <_description>Logitech iTouch Internet Navigator Keyboard SE</_description>
+        <description>Logitech iTouch Internet Navigator Keyboard SE</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiinkseusb</name>
-        <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description>
+        <description>Logitech iTouch Internet Navigator Keyboard SE (USB)</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiultrax</name>
-        <_description>Logitech Ultra-X Keyboard</_description>
+        <description>Logitech Ultra-X Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logiultraxc</name>
-        <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description>
+        <description>Logitech Ultra-X Cordless Media Desktop Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logidinovo</name>
-        <_description>Logitech diNovo Keyboard</_description>
+        <description>Logitech diNovo Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>logidinovoedge</name>
-        <_description>Logitech diNovo Edge Keyboard</_description>
+        <description>Logitech diNovo Edge Keyboard</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>mx1998</name>
-        <_description>Memorex MX1998</_description>
+        <description>Memorex MX1998</description>
         <vendor>Memorex</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>mx2500</name>
-        <_description>Memorex MX2500 EZ-Access Keyboard</_description>
+        <description>Memorex MX2500 EZ-Access Keyboard</description>
         <vendor>Memorex</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>mx2750</name>
-        <_description>Memorex MX2750</_description>
+        <description>Memorex MX2750</description>
         <vendor>Memorex</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoft4000</name>
-        <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description>
+        <description>Microsoft Natural Wireless Ergonomic Keyboard 4000</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoft7000</name>
-        <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
+        <description>Microsoft Natural Wireless Ergonomic Keyboard 7000</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftinet</name>
-        <_description>Microsoft Internet Keyboard</_description>
+        <description>Microsoft Internet Keyboard</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftpro</name>
-        <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description>
+        <description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftprousb</name>
-        <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description>
+        <description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftprooem</name>
-        <_description>Microsoft Natural Keyboard Pro OEM</_description>
+        <description>Microsoft Natural Keyboard Pro OEM</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>vsonku306</name>
-        <_description>ViewSonic KU-306 Internet Keyboard</_description>
+        <description>ViewSonic KU-306 Internet Keyboard</description>
         <vendor>ViewSonic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftprose</name>
-        <_description>Microsoft Internet Keyboard Pro, Swedish</_description>
+        <description>Microsoft Internet Keyboard Pro, Swedish</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftoffice</name>
-        <_description>Microsoft Office Keyboard</_description>
+        <description>Microsoft Office Keyboard</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftmult</name> 
-        <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
+        <description>Microsoft Wireless Multimedia Keyboard 1.0A</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftelite</name> 
-        <_description>Microsoft Natural Keyboard Elite</_description>
+        <description>Microsoft Natural Keyboard Elite</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>microsoftccurve2k</name> 
-        <_description>Microsoft Comfort Curve Keyboard 2000</_description>
+        <description>Microsoft Comfort Curve Keyboard 2000</description>
         <vendor>Microsoft Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>oretec</name>
-        <_description>Ortek MCK-800 MM/Internet keyboard</_description>
+        <description>Ortek MCK-800 MM/Internet keyboard</description>
         <vendor>Ortek</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>propeller</name>
-        <_description>Propeller Voyager (KTEZ-1000)</_description>
+        <description>Propeller Voyager (KTEZ-1000)</description>
         <vendor>KeyTronic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>qtronix</name>
-        <_description>QTronix Scorpius 98N+</_description>
+        <description>QTronix Scorpius 98N+</description>
         <vendor>QTronix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>samsung4500</name>
-        <_description>Samsung SDM 4500P</_description>
+        <description>Samsung SDM 4500P</description>
         <vendor>Samsung</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>samsung4510</name>
-        <_description>Samsung SDM 4510P</_description>
+        <description>Samsung SDM 4510P</description>
         <vendor>Samsung</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sanwaskbkg3</name>
-        <_description>Sanwa Supply SKB-KG3</_description>
+        <description>Sanwa Supply SKB-KG3</description>
         <vendor>Sanwa Supply Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk1300</name>
-        <_description>SK-1300</_description>
+        <description>SK-1300</description>
         <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk2500</name>
-        <_description>SK-2500</_description>
+        <description>SK-2500</description>
         <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk6200</name>
-        <_description>SK-6200</_description>
+        <description>SK-6200</description>
         <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk7100</name>
-        <_description>SK-7100</_description>
+        <description>SK-7100</description>
         <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sp_inet</name>
-        <_description>Super Power Multimedia Keyboard</_description>
+        <description>Super Power Multimedia Keyboard</description>
         <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sven</name>
-        <_description>SVEN Ergonomic 2500</_description>
+        <description>SVEN Ergonomic 2500</description>
         <vendor>SVEN</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sven303</name>
-        <_description>SVEN Slim 303</_description>
+        <description>SVEN Slim 303</description>
         <vendor>SVEN</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>symplon</name>
-        <_description>Symplon PaceBook (tablet PC)</_description>
+        <description>Symplon PaceBook (tablet PC)</description>
         <vendor>Symplon</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>toshiba_s3000</name>
-        <_description>Toshiba Satellite S3000</_description>
+        <description>Toshiba Satellite S3000</description>
         <vendor>Toshiba</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>trust</name>
-        <_description>Trust Wireless Keyboard Classic</_description>
+        <description>Trust Wireless Keyboard Classic</description>
         <vendor>Trust</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>trustda</name>
-        <_description>Trust Direct Access Keyboard</_description>
+        <description>Trust Direct Access Keyboard</description>
         <vendor>Trust</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>trust_slimline</name>
-        <_description>Trust Slimline</_description>
+        <description>Trust Slimline</description>
         <vendor>Trust</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2020</name>
-        <_description>TypeMatrix EZ-Reach 2020</_description>
+        <description>TypeMatrix EZ-Reach 2020</description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030PS2</name>
-        <_description>TypeMatrix EZ-Reach 2030 PS2</_description>
+        <description>TypeMatrix EZ-Reach 2030 PS2</description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030USB</name>
-        <_description>TypeMatrix EZ-Reach 2030 USB</_description>
+        <description>TypeMatrix EZ-Reach 2030 USB</description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030USB-102</name>
-        <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</_description>
+        <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030USB-106</name>
-        <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</_description>
+        <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>yahoo</name>
-        <_description>Yahoo! Internet Keyboard</_description>
+        <description>Yahoo! Internet Keyboard</description>
         <vendor>Yahoo!</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macbook78</name>
-        <_description>MacBook/MacBook Pro</_description>
+        <description>MacBook/MacBook Pro</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macbook79</name>
-        <_description>MacBook/MacBook Pro (Intl)</_description>
+        <description>MacBook/MacBook Pro (Intl)</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macintosh</name>
-        <_description>Macintosh</_description>
+        <description>Macintosh</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macintosh_old</name>
-        <_description>Macintosh Old</_description>
+        <description>Macintosh Old</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macintosh_hhk</name>
-        <_description>Happy Hacking Keyboard for Mac</_description>
+        <description>Happy Hacking Keyboard for Mac</description>
         <vendor>Fujitsu</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>acer_c300</name>
-        <_description>Acer C300</_description>
+        <description>Acer C300</description>
         <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>acer_ferrari4k</name>
-        <_description>Acer Ferrari 4000</_description>
+        <description>Acer Ferrari 4000</description>
         <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>acer_laptop</name>
-        <_description>Acer Laptop</_description>
+        <description>Acer Laptop</description>
         <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>asus_laptop</name>
-        <_description>Asus Laptop</_description>
+        <description>Asus Laptop</description>
         <vendor>Asus</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>apple</name>
-        <_description>Apple</_description>
+        <description>Apple</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>apple_laptop</name>
-        <_description>Apple Laptop</_description>
+        <description>Apple Laptop</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>applealu_ansi</name>
-        <_description>Apple Aluminium Keyboard (ANSI)</_description>
+        <description>Apple Aluminium Keyboard (ANSI)</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>applealu_iso</name>
-        <_description>Apple Aluminium Keyboard (ISO)</_description>
+        <description>Apple Aluminium Keyboard (ISO)</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>applealu_jis</name>
-        <_description>Apple Aluminium Keyboard (JIS)</_description>
+        <description>Apple Aluminium Keyboard (JIS)</description>
         <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>silvercrest</name>
-        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
+        <description>SILVERCREST Multimedia Wireless Keyboard</description>
         <vendor>Silvercrest</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>emachines</name>
-        <_description>Laptop/notebook eMachines m68xx</_description>
+        <description>Laptop/notebook eMachines m68xx</description>
         <vendor>eMachines</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>benqx</name>
-        <_description>BenQ X-Touch</_description>
+        <description>BenQ X-Touch</description>
         <vendor>BenQ</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>benqx730</name>
-        <_description>BenQ X-Touch 730</_description>
+        <description>BenQ X-Touch 730</description>
         <vendor>BenQ</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>benqx800</name>
-        <_description>BenQ X-Touch 800</_description>
+        <description>BenQ X-Touch 800</description>
         <vendor>BenQ</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>hhk</name>
-        <_description>Happy Hacking Keyboard</_description>
+        <description>Happy Hacking Keyboard</description>
         <vendor>Fujitsu</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>classmate</name>
-        <_description>Classmate PC</_description>
+        <description>Classmate PC</description>
         <vendor>Intel</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>olpc</name>
-        <_description>OLPC</_description>
+        <description>OLPC</description>
         <vendor>OLPC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type7_usb</name>
-        <_description>Sun Type 7 USB</_description>
+        <description>Sun Type 7 USB</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type7_euro_usb</name>
-        <_description>Sun Type 7 USB (European layout)</_description>
+        <description>Sun Type 7 USB (European layout)</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type7_unix_usb</name>
-        <_description>Sun Type 7 USB (Unix layout)</_description>
+        <description>Sun Type 7 USB (Unix layout)</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type7_jp_usb</name>
-        <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description>
+        <description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type6_usb</name>
-        <_description>Sun Type 6/7 USB</_description>
+        <description>Sun Type 6/7 USB</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type6_euro_usb</name>
-        <_description>Sun Type 6/7 USB (European layout)</_description>
+        <description>Sun Type 6/7 USB (European layout)</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type6_unix_usb</name>
-        <_description>Sun Type 6 USB (Unix layout)</_description>
+        <description>Sun Type 6 USB (Unix layout)</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type6_jp_usb</name>
-        <_description>Sun Type 6 USB (Japanese layout)</_description>
+        <description>Sun Type 6 USB (Japanese layout)</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sun_type6_jp</name>
-        <_description>Sun Type 6 (Japanese layout)</_description>
+        <description>Sun Type 6 (Japanese layout)</description>
         <vendor>Sun Microsystems</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>targa_v811</name>
-        <_description>Targa Visionary 811</_description>
+        <description>Targa Visionary 811</description>
         <vendor>Targa</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>unitekkb1925</name>
-        <_description>Unitek KB-1925</_description>
+        <description>Unitek KB-1925</description>
         <vendor>Unitek Group</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>compalfl90</name>
-        <_description>FL90</_description>
+        <description>FL90</description>
         <vendor>Compal Electronics Inc.</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>creativedw7000</name>
-        <_description>Creative Desktop Wireless 7000</_description>
+        <description>Creative Desktop Wireless 7000</description>
         <vendor>Creative</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
        <name>htcdream</name>
-       <_description>Htc Dream phone</_description>
+       <description>Htc Dream phone</description>
        <vendor>htc</vendor>
      </configItem>
     </model>
@@ -1300,9 +1300,9 @@
     <layout>
       <configItem>
         <name>us</name>
-        <!-- Keyboard indicator for English layouts -->
-        <_shortDescription>en</_shortDescription>
-        <_description>English (US)</_description>
+        
+        <shortDescription>en</shortDescription>
+        <description>English (US)</description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -1311,9 +1311,9 @@
         <variant>
           <configItem>
             <name>chr</name>
-            <!-- Keyboard indicator for Cherokee layouts -->
-            <_shortDescription>chr</_shortDescription>
-            <_description>Cherokee</_description>
+            
+            <shortDescription>chr</shortDescription>
+            <description>Cherokee</description>
             <languageList>
               <iso639Id>chr</iso639Id>
             </languageList>
@@ -1322,75 +1322,75 @@
         <variant>
           <configItem>
             <name>euro</name>
-            <_description>English (US, with euro on 5)</_description>
+            <description>English (US, with euro on 5)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>English (US, international with dead keys)</_description>
+            <description>English (US, international with dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt-intl</name>
-            <_description>English (US, alternative international)</_description>
+            <description>English (US, alternative international)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>English (Colemak)</_description>
+            <description>English (Colemak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>English (Dvorak)</_description>
+            <description>English (Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>English (Dvorak, international with dead keys)</_description>
+            <description>English (Dvorak, international with dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-alt-intl</name>
-            <_description>English (Dvorak alternative international no dead keys)</_description>
+            <description>English (Dvorak alternative international no dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-l</name>
-            <_description>English (left handed Dvorak)</_description>
+            <description>English (left handed Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-r</name>
-            <_description>English (right handed Dvorak)</_description>
+            <description>English (right handed Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-classic</name>
-            <_description>English (classic Dvorak)</_description>
+            <description>English (classic Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>English (programmer Dvorak)</_description>
+            <description>English (programmer Dvorak)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <!-- Keyboard indicator for Russian layouts -->
-            <_shortDescription>ru</_shortDescription>
-            <_description>Russian (US, phonetic)</_description>
+            
+            <shortDescription>ru</shortDescription>
+            <description>Russian (US, phonetic)</description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -1399,13 +1399,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>English (Macintosh)</_description>
+            <description>English (Macintosh)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>altgr-intl</name>
-            <_description>English (international AltGr dead keys)</_description>
+            <description>English (international AltGr dead keys)</description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>fra</iso639Id>
                           <iso639Id>ger</iso639Id></languageList>
@@ -1414,13 +1414,13 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>English (the divide/multiply keys toggle the layout)</_description>
+            <description>English (the divide/multiply keys toggle the layout)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hbs</name>
-            <_description>Serbo-Croatian (US)</_description>
+            <description>Serbo-Croatian (US)</description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>bos</iso639Id>
                           <iso639Id>hbs</iso639Id>
@@ -1431,13 +1431,13 @@
         <variant>
           <configItem>
             <name>workman</name>
-            <_description>English (Workman)</_description>
+            <description>English (Workman)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>workman-intl</name>
-            <_description>English (Workman, international with dead keys)</_description>
+            <description>English (Workman, international with dead keys)</description>
            </configItem>
          </variant>
       </variantList>
@@ -1445,17 +1445,17 @@
     <layout>
       <configItem>
         <name>af</name>
-        <!-- Keyboard indicator for Afghani layouts -->
-        <_shortDescription>fa</_shortDescription>
-        <_description>Afghani</_description>
+        
+        <shortDescription>fa</shortDescription>
+        <description>Afghani</description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ps</name>
-            <!-- Keyboard indicator for Pashto layouts -->
-            <_shortDescription>ps</_shortDescription>
-            <_description>Pashto</_description>
+            
+            <shortDescription>ps</shortDescription>
+            <description>Pashto</description>
             <languageList>
               <iso639Id>pus</iso639Id>
             </languageList>
@@ -1464,9 +1464,9 @@
         <variant>
           <configItem>
             <name>uz</name>
-            <!-- Keyboard indicator for Uzbek layouts -->
-            <_shortDescription>uz</_shortDescription>
-            <_description>Uzbek (Afghanistan)</_description>
+            
+            <shortDescription>uz</shortDescription>
+            <description>Uzbek (Afghanistan)</description>
             <languageList>
               <iso639Id>uzb</iso639Id>
             </languageList>
@@ -1475,9 +1475,9 @@
         <variant>
           <configItem>
             <name>olpc-ps</name>
-            <!-- Keyboard indicator for Pashto layouts -->
-            <_shortDescription>ps</_shortDescription>
-            <_description>Pashto (Afghanistan, OLPC)</_description>
+            
+            <shortDescription>ps</shortDescription>
+            <description>Pashto (Afghanistan, OLPC)</description>
             <languageList>
               <iso639Id>pus</iso639Id>
             </languageList>
@@ -1486,17 +1486,17 @@
         <variant>
           <configItem>
             <name>fa-olpc</name>
-            <!-- Keyboard indicator for Persian layouts -->
-            <_shortDescription>fa</_shortDescription>
-            <_description>Persian (Afghanistan, Dari OLPC)</_description>
+            
+            <shortDescription>fa</shortDescription>
+            <description>Persian (Afghanistan, Dari OLPC)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uz-olpc</name>
-            <!-- Keyboard indicator for Uzbek layouts -->
-            <_shortDescription>uz</_shortDescription>
-            <_description>Uzbek (Afghanistan, OLPC)</_description>
+            
+            <shortDescription>uz</shortDescription>
+            <description>Uzbek (Afghanistan, OLPC)</description>
             <languageList>
               <iso639Id>uzb</iso639Id>
             </languageList>
@@ -1507,9 +1507,9 @@
     <layout>
       <configItem>
         <name>ara</name>
-        <!-- Keyboard indicator for Arabic layouts -->
-        <_shortDescription>ar</_shortDescription>
-        <_description>Arabic</_description>
+        
+        <shortDescription>ar</shortDescription>
+        <description>Arabic</description>
         <countryList>
           <iso3166Id>AE</iso3166Id>
           <iso3166Id>BH</iso3166Id>
@@ -1539,37 +1539,37 @@
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>Arabic (azerty)</_description>
+            <description>Arabic (azerty)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>azerty_digits</name>
-            <_description>Arabic (azerty/digits)</_description>
+            <description>Arabic (azerty/digits)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>digits</name>
-            <_description>Arabic (digits)</_description>
+            <description>Arabic (digits)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Arabic (qwerty)</_description>
+            <description>Arabic (qwerty)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_digits</name>
-            <_description>Arabic (qwerty/digits)</_description>
+            <description>Arabic (qwerty/digits)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>buckwalter</name>
-            <_description>Arabic (Buckwalter)</_description>
+            <description>Arabic (Buckwalter)</description>
           </configItem>
         </variant>
       </variantList>
@@ -1577,9 +1577,9 @@
     <layout>
       <configItem>
         <name>al</name>
-        <!-- Keyboard indicator for Albanian layouts -->
-        <_shortDescription>sq</_shortDescription>
-        <_description>Albanian</_description>
+        
+        <shortDescription>sq</shortDescription>
+        <description>Albanian</description>
         <languageList>
           <iso639Id>alb</iso639Id>
         </languageList>
@@ -1589,9 +1589,9 @@
     <layout>
       <configItem>
         <name>am</name>
-        <!-- Keyboard indicator for Armenian layouts -->
-        <_shortDescription>hy</_shortDescription>
-        <_description>Armenian</_description>
+        
+        <shortDescription>hy</shortDescription>
+        <description>Armenian</description>
         <languageList>
           <iso639Id>hye</iso639Id>
         </languageList>
@@ -1600,31 +1600,31 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Armenian (phonetic)</_description>
+            <description>Armenian (phonetic)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic-alt</name>
-            <_description>Armenian (alternative phonetic)</_description>
+            <description>Armenian (alternative phonetic)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern</name>
-            <_description>Armenian (eastern)</_description>
+            <description>Armenian (eastern)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>western</name>
-            <_description>Armenian (western)</_description>
+            <description>Armenian (western)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern-alt</name>
-            <_description>Armenian (alternative eastern)</_description>
+            <description>Armenian (alternative eastern)</description>
           </configItem>
         </variant>
       </variantList>
@@ -1632,9 +1632,9 @@
     <layout>
       <configItem>
         <name>at</name>
-        <!-- Keyboard indicator for German layouts -->
-        <_shortDescription>de</_shortDescription>
-        <_description>German (Austria)</_description>
+        
+        <shortDescription>de</shortDescription>
+        <description>German (Austria)</description>
         <languageList>
           <iso639Id>ger</iso639Id>
         </languageList>
@@ -1643,19 +1643,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>German (Austria, eliminate dead keys)</_description>
+            <description>German (Austria, eliminate dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>German (Austria, Sun dead keys)</_description>
+            <description>German (Austria, Sun dead keys)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>German (Austria, Macintosh)</_description>
+            <description>German (Austria, Macintosh)</description>
           </configItem>
         </variant>
       </variantList>
@@ -1663,9 +1663,9 @@
     <layout>
       <configItem>
         <name>az</name>
-        <!-- Keyboard indicator for Azerbaijani layouts -->
-        <_shortDescription>az</_shortDescription>
-        <_description>Azerbaijani</_description>
+        
+        <shortDescription>az</shortDescription>
+        <description>Azerbaijani</description>
         <languageList>
           <iso639Id>aze</iso639Id>
         </languageList>
@@ -1674,7 +1674,7 @@
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Azerbaijani (Cyrillic)</_description>
+            <description>Azerbaijani (Cyrillic)</description>
           </configItem>
         </variant>
       </variantList>
@@ -1682,9 +1682,9 @@
     <layout>
       <configItem>
         <name>by</name>
-        <!-- Keyboard indicator for Belarusian layouts -->
-        <_shortDescription>by</_shortDescription>
-        <_description>Belarusian</_description>
+        
+        <shortDescription>by</shortDescription>
+        <description>Belarusian</description>
         <languageList>
           <iso639Id>bel</iso639Id>
         </languageList>
@@ -1693,13 +1693,13 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Belarusian (legacy)</_description>
+            <description>Belarusian (legacy)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Belarusian (Latin)</_description>
+            <description>Belarusian (Latin)</description>
           </configItem>
         </variant>
       </variantList>
@@ -1707,9 +1707,9 @@
     <layout>
       <configItem>
         <name>be</name>
-