diff options
Diffstat (limited to 'package/xkeyboard-config/patches/patch-rules_evdev_xml_in')
| -rw-r--r-- | package/xkeyboard-config/patches/patch-rules_evdev_xml_in | 7654 |
1 files changed, 7654 insertions, 0 deletions
diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in new file mode 100644 index 000000000..57eb6df34 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in @@ -0,0 +1,7654 @@ +--- 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> +- <!-- Keyboard indicator for Belgian layouts --> +- <_shortDescription>be</_shortDescription> +- <_description>Belgian</_description> ++ ++ <shortDescription>be</shortDescription> ++ <description>Belgian</description> + <languageList><iso639Id>ger</iso639Id> + <iso639Id>nld</iso639Id> + <iso639Id>fra</iso639Id></languageList> +@@ -1718,43 +1718,43 @@ + <variant> + <configItem> + <name>oss</name> +- <_description>Belgian (alternative)</_description> ++ <description>Belgian (alternative)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_latin9</name> +- <_description>Belgian (alternative, Latin-9 only)</_description> ++ <description>Belgian (alternative, Latin-9 only)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_sundeadkeys</name> +- <_description>Belgian (alternative, Sun dead keys)</_description> ++ <description>Belgian (alternative, Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>iso-alternate</name> +- <_description>Belgian (ISO alternate)</_description> ++ <description>Belgian (ISO alternate)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Belgian (eliminate dead keys)</_description> ++ <description>Belgian (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>Belgian (Sun dead keys)</_description> ++ <description>Belgian (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>wang</name> +- <_description>Belgian (Wang model 724 azerty)</_description> ++ <description>Belgian (Wang model 724 azerty)</description> + </configItem> + </variant> + </variantList> +@@ -1762,9 +1762,9 @@ + <layout> + <configItem> + <name>bd</name> +- <!-- Keyboard indicator for Bangla layouts --> +- <_shortDescription>bn</_shortDescription> +- <_description>Bangla</_description> ++ ++ <shortDescription>bn</shortDescription> ++ <description>Bangla</description> + <languageList> + <iso639Id>ben</iso639Id> + </languageList> +@@ -1773,7 +1773,7 @@ + <variant> + <configItem> + <name>probhat</name> +- <_description>Bangla (Probhat)</_description> ++ <description>Bangla (Probhat)</description> + </configItem> + </variant> + </variantList> +@@ -1781,17 +1781,17 @@ + <layout> + <configItem> + <name>in</name> +- <!-- Keyboard indicator for Indian layouts --> +- <_shortDescription>in</_shortDescription> +- <_description>Indian</_description> ++ ++ <shortDescription>in</shortDescription> ++ <description>Indian</description> + </configItem> + <variantList> + <variant> + <configItem> + <name>ben</name> +- <!-- Keyboard indicator for Bangla layouts --> +- <_shortDescription>bn</_shortDescription> +- <_description>Bangla (India)</_description> ++ ++ <shortDescription>bn</shortDescription> ++ <description>Bangla (India)</description> + <languageList> + <iso639Id>ben</iso639Id> + </languageList> +@@ -1800,9 +1800,9 @@ + <variant> + <configItem> + <name>ben_probhat</name> +- <!-- Keyboard indicator for Bangla layouts --> +- <_shortDescription>bn</_shortDescription> +- <_description>Bangla (India, Probhat)</_description> ++ ++ <shortDescription>bn</shortDescription> ++ <description>Bangla (India, Probhat)</description> + <languageList> + <iso639Id>ben</iso639Id> + </languageList> +@@ -1811,28 +1811,28 @@ + <variant> + <configItem> + <name>ben_baishakhi</name> +- <_description>Bangla (India, Baishakhi)</_description> ++ <description>Bangla (India, Baishakhi)</description> + <languageList><iso639Id>ben</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>ben_bornona</name> +- <_description>Bangla (India, Bornona)</_description> ++ <description>Bangla (India, Bornona)</description> + <languageList><iso639Id>ben</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>ben_gitanjali</name> +- <_description>Bangla (India, Uni Gitanjali)</_description> ++ <description>Bangla (India, Uni Gitanjali)</description> + <languageList><iso639Id>ben</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>ben_inscript</name> +- <_description>Bangla (India, Baishakhi Inscript)</_description> ++ <description>Bangla (India, Baishakhi Inscript)</description> + <languageList><iso639Id>ben</iso639Id></languageList> + </configItem> + </variant> +@@ -1846,9 +1846,9 @@ + <variant> + <configItem> + <name>guj</name> +- <!-- Keyboard indicator for Gujarati layouts --> +- <_shortDescription>gu</_shortDescription> +- <_description>Gujarati</_description> ++ ++ <shortDescription>gu</shortDescription> ++ <description>Gujarati</description> + <languageList> + <iso639Id>guj</iso639Id> + </languageList> +@@ -1857,9 +1857,9 @@ + <variant> + <configItem> + <name>guru</name> +- <!-- Keyboard indicator for Punjabi layouts --> +- <_shortDescription>pa</_shortDescription> +- <_description>Punjabi (Gurmukhi)</_description> ++ ++ <shortDescription>pa</shortDescription> ++ <description>Punjabi (Gurmukhi)</description> + <languageList> + <iso639Id>pan</iso639Id> + </languageList> +@@ -1868,9 +1868,9 @@ + <variant> + <configItem> + <name>jhelum</name> +- <!-- Keyboard indicator for Punjabi layouts --> +- <_shortDescription>pa</_shortDescription> +- <_description>Punjabi (Gurmukhi Jhelum)</_description> ++ ++ <shortDescription>pa</shortDescription> ++ <description>Punjabi (Gurmukhi Jhelum)</description> + <languageList> + <iso639Id>pan</iso639Id> + </languageList> +@@ -1879,9 +1879,9 @@ + <variant> + <configItem> + <name>kan</name> +- <!-- Keyboard indicator for Kannada layouts --> +- <_shortDescription>kn</_shortDescription> +- <_description>Kannada</_description> ++ ++ <shortDescription>kn</shortDescription> ++ <description>Kannada</description> + <languageList> + <iso639Id>kan</iso639Id> + </languageList> +@@ -1890,9 +1890,9 @@ + <variant> + <configItem> + <name>kan-kagapa</name> +- <!-- Keyboard indicator for Kannada layouts --> +- <_shortDescription>kn</_shortDescription> +- <_description>Kannada (KaGaPa phonetic)</_description> ++ ++ <shortDescription>kn</shortDescription> ++ <description>Kannada (KaGaPa phonetic)</description> + <languageList> + <iso639Id>kan</iso639Id> + </languageList> +@@ -1901,9 +1901,9 @@ + <variant> + <configItem> + <name>mal</name> +- <!-- Keyboard indicator for Malayalam layouts --> +- <_shortDescription>ml</_shortDescription> +- <_description>Malayalam</_description> ++ ++ <shortDescription>ml</shortDescription> ++ <description>Malayalam</description> + <languageList> + <iso639Id>mal</iso639Id> + </languageList> +@@ -1912,9 +1912,9 @@ + <variant> + <configItem> + <name>mal_lalitha</name> +- <!-- Keyboard indicator for Malayalam layouts --> +- <_shortDescription>ml</_shortDescription> +- <_description>Malayalam (Lalitha)</_description> ++ ++ <shortDescription>ml</shortDescription> ++ <description>Malayalam (Lalitha)</description> + <languageList> + <iso639Id>mal</iso639Id> + </languageList> +@@ -1923,18 +1923,18 @@ + <variant> + <configItem> + <name>mal_enhanced</name> +- <!-- Keyboard indicator for Malayalam layouts --> +- <_shortDescription>ml</_shortDescription> +- <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description> ++ ++ <shortDescription>ml</shortDescription> ++ <description>Malayalam (enhanced Inscript with Rupee Sign)</description> + <languageList><iso639Id>mal</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>ori</name> +- <!-- Keyboard indicator for Oriya layouts --> +- <_shortDescription>or</_shortDescription> +- <_description>Oriya</_description> ++ ++ <shortDescription>or</shortDescription> ++ <description>Oriya</description> + <languageList> + <iso639Id>ori</iso639Id> + </languageList> +@@ -1943,9 +1943,9 @@ + <variant> + <configItem> + <name>tam_unicode</name> +- <!-- Keyboard indicator for Tamil layouts --> +- <_shortDescription>ta</_shortDescription> +- <_description>Tamil (Unicode)</_description> ++ ++ <shortDescription>ta</shortDescription> ++ <description>Tamil (Unicode)</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -1954,9 +1954,9 @@ + <variant> + <configItem> + <name>tam_keyboard_with_numerals</name> +- <!-- Keyboard indicator for Tamil layouts --> +- <_shortDescription>ta</_shortDescription> +- <_description>Tamil (keyboard with numerals)</_description> ++ ++ <shortDescription>ta</shortDescription> ++ <description>Tamil (keyboard with numerals)</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -1965,9 +1965,9 @@ + <variant> + <configItem> + <name>tam_TAB</name> +- <!-- Keyboard indicator for Tamil layouts --> +- <_shortDescription>ta</_shortDescription> +- <_description>Tamil (TAB typewriter)</_description> ++ ++ <shortDescription>ta</shortDescription> ++ <description>Tamil (TAB typewriter)</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -1976,9 +1976,9 @@ + <variant> + <configItem> + <name>tam_TSCII</name> +- <!-- Keyboard indicator for Tamil layouts --> +- <_shortDescription>ta</_shortDescription> +- <_description>Tamil (TSCII typewriter)</_description> ++ ++ <shortDescription>ta</shortDescription> ++ <description>Tamil (TSCII typewriter)</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -1987,9 +1987,9 @@ + <variant> + <configItem> + <name>tam</name> +- <!-- Keyboard indicator for Tamil layouts --> +- <_shortDescription>ta</_shortDescription> +- <_description>Tamil</_description> ++ ++ <shortDescription>ta</shortDescription> ++ <description>Tamil</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -1998,9 +1998,9 @@ + <variant> + <configItem> + <name>tel</name> +- <!-- Keyboard indicator for Telugu layouts --> +- <_shortDescription>te</_shortDescription> +- <_description>Telugu</_description> ++ ++ <shortDescription>te</shortDescription> ++ <description>Telugu</description> + <languageList> + <iso639Id>tel</iso639Id> + </languageList> +@@ -2009,9 +2009,9 @@ + <variant> + <configItem> + <name>tel-kagapa</name> +- <!-- Keyboard indicator for Telugu layouts --> +- <_shortDescription>te</_shortDescription> +- <_description>Telugu (KaGaPa phonetic)</_description> ++ ++ <shortDescription>te</shortDescription> ++ <description>Telugu (KaGaPa phonetic)</description> + <languageList> + <iso639Id>tel</iso639Id> + </languageList> +@@ -2020,9 +2020,9 @@ + <variant> + <configItem> + <name>urd-phonetic</name> +- <!-- Keyboard indicator for Urdu layouts --> +- <_shortDescription>ur</_shortDescription> +- <_description>Urdu (phonetic)</_description> ++ ++ <shortDescription>ur</shortDescription> ++ <description>Urdu (phonetic)</description> + <languageList> + <iso639Id>urd</iso639Id> + </languageList> +@@ -2031,9 +2031,9 @@ + <variant> + <configItem> + <name>urd-phonetic3</name> +- <!-- Keyboard indicator for Urdu layouts --> +- <_shortDescription>ur</_shortDescription> +- <_description>Urdu (alternative phonetic)</_description> ++ ++ <shortDescription>ur</shortDescription> ++ <description>Urdu (alternative phonetic)</description> + <languageList> + <iso639Id>urd</iso639Id> + </languageList> +@@ -2042,9 +2042,9 @@ + <variant> + <configItem> + <name>urd-winkeys</name> +- <!-- Keyboard indicator for Urdu layouts --> +- <_shortDescription>ur</_shortDescription> +- <_description>Urdu (WinKeys)</_description> ++ ++ <shortDescription>ur</shortDescription> ++ <description>Urdu (WinKeys)</description> + <languageList> + <iso639Id>urd</iso639Id> + </languageList> +@@ -2053,9 +2053,9 @@ + <variant> + <configItem> + <name>bolnagri</name> +- <!-- Keyboard indicator for Hindi layouts --> +- <_shortDescription>hi</_shortDescription> +- <_description>Hindi (Bolnagri)</_description> ++ ++ <shortDescription>hi</shortDescription> ++ <description>Hindi (Bolnagri)</description> + <languageList> + <iso639Id>hin</iso639Id> + </languageList> +@@ -2064,9 +2064,9 @@ + <variant> + <configItem> + <name>hin-wx</name> +- <!-- Keyboard indicator for Hindi layouts --> +- <_shortDescription>hi</_shortDescription> +- <_description>Hindi (Wx)</_description> ++ ++ <shortDescription>hi</shortDescription> ++ <description>Hindi (Wx)</description> + <languageList> + <iso639Id>hin</iso639Id> + </languageList> +@@ -2075,9 +2075,9 @@ + <variant> + <configItem> + <name>hin-kagapa</name> +- <!-- Keyboard indicator for Hindi layouts --> +- <_shortDescription>hi</_shortDescription> +- <_description>Hindi (KaGaPa phonetic)</_description> ++ ++ <shortDescription>hi</shortDescription> ++ <description>Hindi (KaGaPa phonetic)</description> + <languageList> + <iso639Id>hin</iso639Id> + </languageList> +@@ -2086,9 +2086,9 @@ + <variant> + <configItem> + <name>san-kagapa</name> +- <!-- Keyboard indicator for Sanskrit layouts --> +- <_shortDescription>sa</_shortDescription> +- <_description>Sanskrit (KaGaPa phonetic)</_description> ++ ++ <shortDescription>sa</shortDescription> ++ <description>Sanskrit (KaGaPa phonetic)</description> + <languageList> + <iso639Id>san</iso639Id> + </languageList> +@@ -2097,9 +2097,9 @@ + <variant> + <configItem> + <name>mar-kagapa</name> +- <!-- Keyboard indicator for Marathi layouts --> +- <_shortDescription>mr</_shortDescription> +- <_description>Marathi (KaGaPa phonetic)</_description> ++ ++ <shortDescription>mr</shortDescription> ++ <description>Marathi (KaGaPa phonetic)</description> + <languageList> + <iso639Id>mar</iso639Id> + </languageList> +@@ -2108,9 +2108,9 @@ + <variant> + <configItem> + <name>eng</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (India, with RupeeSign)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (India, with RupeeSign)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -2121,9 +2121,9 @@ + <layout> + <configItem> + <name>ba</name> +- <!-- Keyboard indicator for Bosnian layouts --> +- <_shortDescription>bs</_shortDescription> +- <_description>Bosnian</_description> ++ ++ <shortDescription>bs</shortDescription> ++ <description>Bosnian</description> + <languageList> + <iso639Id>bos</iso639Id> + </languageList> +@@ -2132,25 +2132,25 @@ + <variant> + <configItem> + <name>alternatequotes</name> +- <_description>Bosnian (use guillemets for quotes)</_description> ++ <description>Bosnian (use guillemets for quotes)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>unicode</name> +- <_description>Bosnian (use Bosnian digraphs)</_description> ++ <description>Bosnian (use Bosnian digraphs)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>unicodeus</name> +- <_description>Bosnian (US keyboard with Bosnian digraphs)</_description> ++ <description>Bosnian (US keyboard with Bosnian digraphs)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us</name> +- <_description>Bosnian (US keyboard with Bosnian letters)</_description> ++ <description>Bosnian (US keyboard with Bosnian letters)</description> + </configItem> + </variant> + </variantList> +@@ -2158,9 +2158,9 @@ + <layout> + <configItem> + <name>br</name> +- <!-- Keyboard indicator for Portuguese layouts --> +- <_shortDescription>pt</_shortDescription> +- <_description>Portuguese (Brazil)</_description> ++ ++ <shortDescription>pt</shortDescription> ++ <description>Portuguese (Brazil)</description> + <languageList> + <iso639Id>por</iso639Id> + </languageList> +@@ -2169,31 +2169,31 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Portuguese (Brazil, eliminate dead keys)</_description> ++ <description>Portuguese (Brazil, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Portuguese (Brazil, Dvorak)</_description> ++ <description>Portuguese (Brazil, Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nativo</name> +- <_description>Portuguese (Brazil, Nativo)</_description> ++ <description>Portuguese (Brazil, Nativo)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nativo-us</name> +- <_description>Portuguese (Brazil, Nativo for US keyboards)</_description> ++ <description>Portuguese (Brazil, Nativo for US keyboards)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nativo-epo</name> +- <_description>Esperanto (Brazil, Nativo)</_description> ++ <description>Esperanto (Brazil, Nativo)</description> + <languageList> + <iso639Id>epo</iso639Id> + </languageList> +@@ -2204,9 +2204,9 @@ + <layout> + <configItem> + <name>bg</name> +- <!-- Keyboard indicator for Bulgarian layouts --> +- <_shortDescription>bg</_shortDescription> +- <_description>Bulgarian</_description> ++ ++ <shortDescription>bg</shortDescription> ++ <description>Bulgarian</description> + <languageList> + <iso639Id>bul</iso639Id> + </languageList> +@@ -2215,13 +2215,13 @@ + <variant> + <configItem> + <name>phonetic</name> +- <_description>Bulgarian (traditional phonetic)</_description> ++ <description>Bulgarian (traditional phonetic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>bas_phonetic</name> +- <_description>Bulgarian (new phonetic)</_description> ++ <description>Bulgarian (new phonetic)</description> + </configItem> + </variant> + </variantList> +@@ -2229,17 +2229,17 @@ + <layout> + <configItem> + <name>ma</name> +- <!-- Keyboard indicator for Arabic layouts --> +- <_shortDescription>ar</_shortDescription> +- <_description>Arabic (Morocco)</_description> ++ ++ <shortDescription>ar</shortDescription> ++ <description>Arabic (Morocco)</description> + </configItem> + <variantList> + <variant> + <configItem> + <name>french</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Morocco)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Morocco)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -2248,9 +2248,9 @@ + <variant> + <configItem> + <name>tifinagh</name> +- <!-- Keyboard indicator for Berber layouts --> +- <_shortDescription>ber</_shortDescription> +- <_description>Berber (Morocco, Tifinagh)</_description> ++ ++ <shortDescription>ber</shortDescription> ++ <description>Berber (Morocco, Tifinagh)</description> + <languageList> + <iso639Id>ber</iso639Id> + </languageList> +@@ -2259,9 +2259,9 @@ + <variant> + <configItem> + <name>tifinagh-alt</name> +- <!-- Keyboard indicator for Berber layouts --> +- <_shortDescription>ber</_shortDescription> +- <_description>Berber (Morocco, Tifinagh alternative)</_description> ++ ++ <shortDescription>ber</shortDescription> ++ <description>Berber (Morocco, Tifinagh alternative)</description> + <languageList> + <iso639Id>ber</iso639Id> + </languageList> +@@ -2270,9 +2270,9 @@ + <variant> + <configItem> + <name>tifinagh-alt-phonetic</name> +- <!-- Keyboard indicator for Berber layouts --> +- <_shortDescription>ber</_shortDescription> +- <_description>Berber (Morocco, Tifinagh alternative phonetic)</_description> ++ ++ <shortDescription>ber</shortDescription> ++ <description>Berber (Morocco, Tifinagh alternative phonetic)</description> + <languageList> + <iso639Id>ber</iso639Id> + </languageList> +@@ -2281,9 +2281,9 @@ + <variant> + <configItem> + <name>tifinagh-extended</name> +- <!-- Keyboard indicator for Berber layouts --> +- <_shortDescription>ber</_shortDescription> +- <_description>Berber (Morocco, Tifinagh extended)</_description> ++ ++ <shortDescription>ber</shortDescription> ++ <description>Berber (Morocco, Tifinagh extended)</description> + <languageList> + <iso639Id>ber</iso639Id> + </languageList> +@@ -2292,9 +2292,9 @@ + <variant> + <configItem> + <name>tifinagh-phonetic</name> +- <!-- Keyboard indicator for Berber layouts --> +- <_shortDescription>ber</_shortDescription> +- <_description>Berber (Morocco, Tifinagh phonetic)</_description> ++ ++ <shortDescription>ber</shortDescription> ++ <description>Berber (Morocco, Tifinagh phonetic)</description> + <languageList> + <iso639Id>ber</iso639Id> + </languageList> +@@ -2303,9 +2303,9 @@ + <variant> + <configItem> + <name>tifinagh-extended-phonetic</name> +- <!-- Keyboard indicator for Berber layouts --> +- <_shortDescription>ber</_shortDescription> +- <_description>Berber (Morocco, Tifinagh extended phonetic)</_description> ++ ++ <shortDescription>ber</shortDescription> ++ <description>Berber (Morocco, Tifinagh extended phonetic)</description> + <languageList> + <iso639Id>ber</iso639Id> + </languageList> +@@ -2316,23 +2316,23 @@ + <layout> + <configItem> + <name>cm</name> +- <!-- Keyboard indicator for Cameroon layouts --> +- <_shortDescription>cm</_shortDescription> +- <_description>English (Cameroon)</_description> ++ ++ <shortDescription>cm</shortDescription> ++ <description>English (Cameroon)</description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>french</name> +- <_description>French (Cameroon)</_description> ++ <description>French (Cameroon)</description> + <languageList><iso639Id>fra</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty</name> +- <_description>Cameroon Multilingual (qwerty)</_description> ++ <description>Cameroon Multilingual (qwerty)</description> + <languageList> + <iso639Id>eng</iso639Id> + <iso639Id>bas</iso639Id> +@@ -2369,7 +2369,7 @@ + <variant> + <configItem> + <name>azerty</name> +- <_description>Cameroon Multilingual (azerty)</_description> ++ <description>Cameroon Multilingual (azerty)</description> + <languageList> + <iso639Id>fra</iso639Id> + <iso639Id>bas</iso639Id> +@@ -2406,7 +2406,7 @@ + <variant> + <configItem> + <name>dvorak</name> +- <_description>Cameroon Multilingual (Dvorak)</_description> ++ <description>Cameroon Multilingual (Dvorak)</description> + </configItem> + </variant> + </variantList> +@@ -2414,9 +2414,9 @@ + <layout> + <configItem> + <name>mm</name> +- <!-- Keyboard indicator for Burmese layouts --> +- <_shortDescription>my</_shortDescription> +- <_description>Burmese</_description> ++ ++ <shortDescription>my</shortDescription> ++ <description>Burmese</description> + <languageList> + <iso639Id>mya</iso639Id> + </languageList> +@@ -2426,9 +2426,9 @@ + <layout> + <configItem> + <name>ca</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Canada)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Canada)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -2437,43 +2437,43 @@ + <variant> + <configItem> + <name>fr-dvorak</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Canada, Dvorak)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Canada, Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>fr-legacy</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Canada, legacy)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Canada, legacy)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>multix</name> +- <_description>Canadian Multilingual</_description> ++ <description>Canadian Multilingual</description> + </configItem> + </variant> + <variant> + <configItem> + <name>multi</name> +- <_description>Canadian Multilingual (first part)</_description> ++ <description>Canadian Multilingual (first part)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>multi-2gr</name> +- <_description>Canadian Multilingual (second part)</_description> ++ <description>Canadian Multilingual (second part)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ike</name> +- <!-- Keyboard indicator for Inuktikut layouts --> +- <_shortDescription>ike</_shortDescription> +- <_description>Inuktitut</_description> ++ ++ <shortDescription>ike</shortDescription> ++ <description>Inuktitut</description> + <languageList> + <iso639Id>iku</iso639Id> + </languageList> +@@ -2482,9 +2482,9 @@ + <variant> + <configItem> + <name>eng</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (Canada)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (Canada)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -2495,9 +2495,9 @@ + <layout> + <configItem> + <name>cd</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Democratic Republic of the Congo)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Democratic Republic of the Congo)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -2507,9 +2507,9 @@ + <layout> + <configItem> + <name>cn</name> +- <!-- Keyboard indicator for Chinese layouts --> +- <_shortDescription>zh</_shortDescription> +- <_description>Chinese</_description> ++ ++ <shortDescription>zh</shortDescription> ++ <description>Chinese</description> + <languageList> + <iso639Id>chi</iso639Id> + </languageList> +@@ -2518,7 +2518,7 @@ + <variant> + <configItem> + <name>tib</name> +- <_description>Tibetan</_description> ++ <description>Tibetan</description> + <languageList> + <iso639Id>tib</iso639Id> + </languageList> +@@ -2527,7 +2527,7 @@ + <variant> + <configItem> + <name>tib_asciinum</name> +- <_description>Tibetan (with ASCII numerals)</_description> ++ <description>Tibetan (with ASCII numerals)</description> + <languageList> + <iso639Id>tib</iso639Id> + </languageList> +@@ -2536,8 +2536,8 @@ + <variant> + <configItem> + <name>ug</name> +- <_shortDescription>ug</_shortDescription> +- <_description>Uyghur</_description> ++ <shortDescription>ug</shortDescription> ++ <description>Uyghur</description> + <languageList> + <iso639Id>ug</iso639Id> + </languageList> +@@ -2548,9 +2548,9 @@ + <layout> + <configItem> + <name>hr</name> +- <!-- Keyboard indicator for Croatian layouts --> +- <_shortDescription>hr</_shortDescription> +- <_description>Croatian</_description> ++ ++ <shortDescription>hr</shortDescription> ++ <description>Croatian</description> + <languageList> + <iso639Id>hrv</iso639Id> + </languageList> +@@ -2559,25 +2559,25 @@ + <variant> + <configItem> + <name>alternatequotes</name> +- <_description>Croatian (use guillemets for quotes)</_description> ++ <description>Croatian (use guillemets for quotes)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>unicode</name> +- <_description>Croatian (use Croatian digraphs)</_description> ++ <description>Croatian (use Croatian digraphs)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>unicodeus</name> +- <_description>Croatian (US keyboard with Croatian digraphs)</_description> ++ <description>Croatian (US keyboard with Croatian digraphs)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us</name> +- <_description>Croatian (US keyboard with Croatian letters)</_description> ++ <description>Croatian (US keyboard with Croatian letters)</description> + </configItem> + </variant> + </variantList> +@@ -2585,9 +2585,9 @@ + <layout> + <configItem> + <name>cz</name> +- <!-- Keyboard indicator for Chech layouts --> +- <_shortDescription>cs</_shortDescription> +- <_description>Czech</_description> ++ ++ <shortDescription>cs</shortDescription> ++ <description>Czech</description> + <languageList> + <iso639Id>cze</iso639Id> + </languageList> +@@ -2596,31 +2596,31 @@ + <variant> + <configItem> + <name>bksl</name> +- <_description>Czech (with <\|> key)</_description> ++ <description>Czech (with <\|> key)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty</name> +- <_description>Czech (qwerty)</_description> ++ <description>Czech (qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty_bksl</name> +- <_description>Czech (qwerty, extended Backslash)</_description> ++ <description>Czech (qwerty, extended Backslash)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ucw</name> +- <_description>Czech (UCW layout, accented letters only)</_description> ++ <description>Czech (UCW layout, accented letters only)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak-ucw</name> +- <_description>Czech (US Dvorak with CZ UCW support)</_description> ++ <description>Czech (US Dvorak with CZ UCW support)</description> + </configItem> + </variant> + </variantList> +@@ -2628,9 +2628,9 @@ + <layout> + <configItem> + <name>dk</name> +- <!-- Keyboard indicator for Danish layouts --> +- <_shortDescription>da</_shortDescription> +- <_description>Danish</_description> ++ ++ <shortDescription>da</shortDescription> ++ <description>Danish</description> + <languageList> + <iso639Id>dan</iso639Id> + </languageList> +@@ -2639,25 +2639,25 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Danish (eliminate dead keys)</_description> ++ <description>Danish (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Danish (Macintosh)</_description> ++ <description>Danish (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac_nodeadkeys</name> +- <_description>Danish (Macintosh, eliminate dead keys)</_description> ++ <description>Danish (Macintosh, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Danish (Dvorak)</_description> ++ <description>Danish (Dvorak)</description> + </configItem> + </variant> + </variantList> +@@ -2665,9 +2665,9 @@ + <layout> + <configItem> + <name>nl</name> +- <!-- Keyboard indicator for Dutch layouts --> +- <_shortDescription>nl</_shortDescription> +- <_description>Dutch</_description> ++ ++ <shortDescription>nl</shortDescription> ++ <description>Dutch</description> + <languageList> + <iso639Id>nld</iso639Id> + </languageList> +@@ -2676,19 +2676,19 @@ + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>Dutch (Sun dead keys)</_description> ++ <description>Dutch (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Dutch (Macintosh)</_description> ++ <description>Dutch (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>std</name> +- <_description>Dutch (standard)</_description> ++ <description>Dutch (standard)</description> + </configItem> + </variant> + </variantList> +@@ -2696,9 +2696,9 @@ + <layout> + <configItem> + <name>bt</name> +- <!-- Keyboard indicator for Dzongkha layouts --> +- <_shortDescription>dz</_shortDescription> +- <_description>Dzongkha</_description> ++ ++ <shortDescription>dz</shortDescription> ++ <description>Dzongkha</description> + <languageList> + <iso639Id>dzo</iso639Id> + </languageList> +@@ -2707,9 +2707,9 @@ + <layout> + <configItem> + <name>ee</name> +- <!-- Keyboard indicator for Estonian layouts --> +- <_shortDescription>et</_shortDescription> +- <_description>Estonian</_description> ++ ++ <shortDescription>et</shortDescription> ++ <description>Estonian</description> + <languageList> + <iso639Id>est</iso639Id> + </languageList> +@@ -2718,19 +2718,19 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Estonian (eliminate dead keys)</_description> ++ <description>Estonian (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Estonian (Dvorak)</_description> ++ <description>Estonian (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us</name> +- <_description>Estonian (US keyboard with Estonian letters)</_description> ++ <description>Estonian (US keyboard with Estonian letters)</description> + </configItem> + </variant> + </variantList> +@@ -2738,9 +2738,9 @@ + <layout> + <configItem> + <name>ir</name> +- <!-- Keyboard indicator for Persian layouts --> +- <_shortDescription>fa</_shortDescription> +- <_description>Persian</_description> ++ ++ <shortDescription>fa</shortDescription> ++ <description>Persian</description> + <languageList> + <iso639Id>per</iso639Id> + </languageList> +@@ -2749,15 +2749,15 @@ + <variant> + <configItem> + <name>pes_keypad</name> +- <_description>Persian (with Persian Keypad)</_description> ++ <description>Persian (with Persian Keypad)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ku</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iran, Latin Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iran, Latin Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2766,9 +2766,9 @@ + <variant> + <configItem> + <name>ku_f</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iran, F)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iran, F)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2777,9 +2777,9 @@ + <variant> + <configItem> + <name>ku_alt</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iran, Latin Alt-Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iran, Latin Alt-Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2788,9 +2788,9 @@ + <variant> + <configItem> + <name>ku_ara</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iran, Arabic-Latin)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iran, Arabic-Latin)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2801,9 +2801,9 @@ + <layout> + <configItem> + <name>iq</name> +- <!-- Keyboard indicator for Iraqi layouts --> +- <_shortDescription>ar</_shortDescription> +- <_description>Iraqi</_description> ++ ++ <shortDescription>ar</shortDescription> ++ <description>Iraqi</description> + <languageList><iso639Id>ara</iso639Id> + <iso639Id>kur</iso639Id></languageList> + </configItem> +@@ -2811,9 +2811,9 @@ + <variant> + <configItem> + <name>ku</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iraq, Latin Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iraq, Latin Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2822,9 +2822,9 @@ + <variant> + <configItem> + <name>ku_f</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iraq, F)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iraq, F)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2833,9 +2833,9 @@ + <variant> + <configItem> + <name>ku_alt</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iraq, Latin Alt-Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iraq, Latin Alt-Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2844,9 +2844,9 @@ + <variant> + <configItem> + <name>ku_ara</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Iraq, Arabic-Latin)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Iraq, Arabic-Latin)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -2857,9 +2857,9 @@ + <layout> + <configItem> + <name>fo</name> +- <!-- Keyboard indicator for Faroese layouts --> +- <_shortDescription>fo</_shortDescription> +- <_description>Faroese</_description> ++ ++ <shortDescription>fo</shortDescription> ++ <description>Faroese</description> + <languageList> + <iso639Id>fao</iso639Id> + </languageList> +@@ -2868,7 +2868,7 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Faroese (eliminate dead keys)</_description> ++ <description>Faroese (eliminate dead keys)</description> + </configItem> + </variant> + </variantList> +@@ -2876,9 +2876,9 @@ + <layout> + <configItem> + <name>fi</name> +- <!-- Keyboard indicator for Finnish layouts --> +- <_shortDescription>fi</_shortDescription> +- <_description>Finnish</_description> ++ ++ <shortDescription>fi</shortDescription> ++ <description>Finnish</description> + <languageList> + <iso639Id>fin</iso639Id> + </languageList> +@@ -2887,26 +2887,26 @@ + <variant> + <configItem> + <name>classic</name> +- <_description>Finnish (classic)</_description> ++ <description>Finnish (classic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Finnish (classic, eliminate dead keys)</_description> ++ <description>Finnish (classic, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>smi</name> +- <_description>Northern Saami (Finland)</_description> ++ <description>Northern Saami (Finland)</description> + <languageList><iso639Id>sme</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Finnish (Macintosh)</_description> ++ <description>Finnish (Macintosh)</description> + </configItem> + </variant> + </variantList> +@@ -2914,9 +2914,9 @@ + <layout> + <configItem> + <name>fr</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -2925,91 +2925,91 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>French (eliminate dead keys)</_description> ++ <description>French (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>French (Sun dead keys)</_description> ++ <description>French (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss</name> +- <_description>French (alternative)</_description> ++ <description>French (alternative)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_latin9</name> +- <_description>French (alternative, Latin-9 only)</_description> ++ <description>French (alternative, Latin-9 only)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_nodeadkeys</name> +- <_description>French (alternative, eliminate dead keys)</_description> ++ <description>French (alternative, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_sundeadkeys</name> +- <_description>French (alternative, Sun dead keys)</_description> ++ <description>French (alternative, Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latin9</name> +- <_description>French (legacy, alternative)</_description> ++ <description>French (legacy, alternative)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latin9_nodeadkeys</name> +- <_description>French (legacy, alternative, eliminate dead keys)</_description> ++ <description>French (legacy, alternative, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latin9_sundeadkeys</name> +- <_description>French (legacy, alternative, Sun dead keys)</_description> ++ <description>French (legacy, alternative, Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>bepo</name> +- <_description>French (Bepo, ergonomic, Dvorak way)</_description> ++ <description>French (Bepo, ergonomic, Dvorak way)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>bepo_latin9</name> +- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</_description> ++ <description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>French (Dvorak)</_description> ++ <description>French (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>French (Macintosh)</_description> ++ <description>French (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>bre</name> +- <_description>French (Breton)</_description> ++ <description>French (Breton)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>oci</name> +- <_description>Occitan</_description> ++ <description>Occitan</description> + <languageList> + <iso639Id>oci</iso639Id> + </languageList> +@@ -3018,7 +3018,7 @@ + <variant> + <configItem> + <name>geo</name> +- <_description>Georgian (France, AZERTY Tskapo)</_description> ++ <description>Georgian (France, AZERTY Tskapo)</description> + <languageList> + <iso639Id>geo</iso639Id> + </languageList> +@@ -3029,9 +3029,9 @@ + <layout> + <configItem> + <name>gh</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (Ghana)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (Ghana)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -3040,15 +3040,15 @@ + <variant> + <configItem> + <name>generic</name> +- <_description>English (Ghana, multilingual)</_description> ++ <description>English (Ghana, multilingual)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>akan</name> +- <!-- Keyboard indicator for Akan layouts --> +- <_shortDescription>ak</_shortDescription> +- <_description>Akan</_description> ++ ++ <shortDescription>ak</shortDescription> ++ <description>Akan</description> + <languageList> + <iso639Id>aka</iso639Id> + </languageList> +@@ -3057,9 +3057,9 @@ + <variant> + <configItem> + <name>ewe</name> +- <!-- Keyboard indicator for Ewe layouts --> +- <_shortDescription>ee</_shortDescription> +- <_description>Ewe</_description> ++ ++ <shortDescription>ee</shortDescription> ++ <description>Ewe</description> + <languageList> + <iso639Id>ewe</iso639Id> + </languageList> +@@ -3068,9 +3068,9 @@ + <variant> + <configItem> + <name>fula</name> +- <!-- Keyboard indicator for Fula layouts --> +- <_shortDescription>ff</_shortDescription> +- <_description>Fula</_description> ++ ++ <shortDescription>ff</shortDescription> ++ <description>Fula</description> + <languageList> + <iso639Id>ful</iso639Id> + </languageList> +@@ -3079,9 +3079,9 @@ + <variant> + <configItem> + <name>ga</name> +- <!-- Keyboard indicator for Ga layouts --> +- <_shortDescription>gaa</_shortDescription> +- <_description>Ga</_description> ++ ++ <shortDescription>gaa</shortDescription> ++ <description>Ga</description> + <languageList> + <iso639Id>gaa</iso639Id> + </languageList> +@@ -3090,9 +3090,9 @@ + <variant> + <configItem> + <name>hausa</name> +- <!-- Keyboard indicator for Hausa layouts --> +- <_shortDescription>ha</_shortDescription> +- <_description>Hausa</_description> ++ ++ <shortDescription>ha</shortDescription> ++ <description>Hausa</description> + <languageList> + <iso639Id>hau</iso639Id> + </languageList> +@@ -3101,9 +3101,9 @@ + <variant> + <configItem> + <name>avn</name> +- <!-- Keyboard indicator for Avatime layouts --> +- <_shortDescription>avn</_shortDescription> +- <_description>Avatime</_description> ++ ++ <shortDescription>avn</shortDescription> ++ <description>Avatime</description> + <languageList> + <iso639Id>avn</iso639Id> + </languageList> +@@ -3112,7 +3112,7 @@ + <variant> + <configItem> + <name>gillbt</name> +- <_description>English (Ghana, GILLBT)</_description> ++ <description>English (Ghana, GILLBT)</description> + </configItem> + </variant> + </variantList> +@@ -3120,9 +3120,9 @@ + <layout> + <configItem> + <name>gn</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Guinea)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Guinea)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -3132,9 +3132,9 @@ + <layout> + <configItem> + <name>ge</name> +- <!-- Keyboard indicator for Georgian layouts --> +- <_shortDescription>ka</_shortDescription> +- <_description>Georgian</_description> ++ ++ <shortDescription>ka</shortDescription> ++ <description>Georgian</description> + <languageList> + <iso639Id>geo</iso639Id> + </languageList> +@@ -3143,21 +3143,21 @@ + <variant> + <configItem> + <name>ergonomic</name> +- <_description>Georgian (ergonomic)</_description> ++ <description>Georgian (ergonomic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mess</name> +- <_description>Georgian (MESS)</_description> ++ <description>Georgian (MESS)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ru</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian (Georgia)</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian (Georgia)</description> + <languageList> + <iso639Id>rus</iso639Id> + </languageList> +@@ -3166,7 +3166,7 @@ + <variant> + <configItem> + <name>os</name> +- <_description>Ossetian (Georgia)</_description> ++ <description>Ossetian (Georgia)</description> + <languageList> + <iso639Id>oss</iso639Id> + </languageList> +@@ -3177,9 +3177,9 @@ + <layout> + <configItem> + <name>de</name> +- <!-- Keyboard indicator for German layouts --> +- <_shortDescription>de</_shortDescription> +- <_description>German</_description> ++ ++ <shortDescription>de</shortDescription> ++ <description>German</description> + <languageList> + <iso639Id>ger</iso639Id> + </languageList> +@@ -3188,75 +3188,75 @@ + <variant> + <configItem> + <name>deadacute</name> +- <_description>German (dead acute)</_description> ++ <description>German (dead acute)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>deadgraveacute</name> +- <_description>German (dead grave acute)</_description> ++ <description>German (dead grave acute)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>German (eliminate dead keys)</_description> ++ <description>German (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>T3</name> +- <_description>German (T3)</_description> ++ <description>German (T3)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ro</name> +- <_description>Romanian (Germany)</_description> ++ <description>Romanian (Germany)</description> + <languageList><iso639Id>rum</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>ro_nodeadkeys</name> +- <_description>Romanian (Germany, eliminate dead keys)</_description> ++ <description>Romanian (Germany, eliminate dead keys)</description> + <languageList><iso639Id>rum</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>German (Dvorak)</_description> ++ <description>German (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>German (Sun dead keys)</_description> ++ <description>German (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>neo</name> +- <_description>German (Neo 2)</_description> ++ <description>German (Neo 2)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>German (Macintosh)</_description> ++ <description>German (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac_nodeadkeys</name> +- <_description>German (Macintosh, eliminate dead keys)</_description> ++ <description>German (Macintosh, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dsb</name> +- <_description>Lower Sorbian</_description> ++ <description>Lower Sorbian</description> + <languageList> + <iso639Id>dsb</iso639Id> + </languageList> +@@ -3265,7 +3265,7 @@ + <variant> + <configItem> + <name>dsb_qwertz</name> +- <_description>Lower Sorbian (qwertz)</_description> ++ <description>Lower Sorbian (qwertz)</description> + <languageList> + <iso639Id>dsb</iso639Id> + </languageList> +@@ -3274,15 +3274,15 @@ + <variant> + <configItem> + <name>qwerty</name> +- <_description>German (qwerty)</_description> ++ <description>German (qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ru</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian (Germany, phonetic)</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian (Germany, phonetic)</description> + <languageList> + <iso639Id>rus</iso639Id> + </languageList> +@@ -3291,7 +3291,7 @@ + <variant> + <configItem> + <name>legacy</name> +- <_description>German (legacy)</_description> ++ <description>German (legacy)</description> + </configItem> + </variant> + </variantList> +@@ -3299,9 +3299,9 @@ + <layout> + <configItem> + <name>gr</name> +- <!-- Keyboard indicator for Greek layouts --> +- <_shortDescription>gr</_shortDescription> +- <_description>Greek</_description> ++ ++ <shortDescription>gr</shortDescription> ++ <description>Greek</description> + <languageList> + <iso639Id>gre</iso639Id> + </languageList> +@@ -3310,25 +3310,25 @@ + <variant> + <configItem> + <name>simple</name> +- <_description>Greek (simple)</_description> ++ <description>Greek (simple)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>extended</name> +- <_description>Greek (extended)</_description> ++ <description>Greek (extended)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Greek (eliminate dead keys)</_description> ++ <description>Greek (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>polytonic</name> +- <_description>Greek (polytonic)</_description> ++ <description>Greek (polytonic)</description> + </configItem> + </variant> + </variantList> +@@ -3336,9 +3336,9 @@ + <layout> + <configItem> + <name>hu</name> +- <!-- Keyboard indicator for Hungarian layouts --> +- <_shortDescription>hu</_shortDescription> +- <_description>Hungarian</_description> ++ ++ <shortDescription>hu</shortDescription> ++ <description>Hungarian</description> + <languageList> + <iso639Id>hun</iso639Id> + </languageList> +@@ -3347,115 +3347,115 @@ + <variant> + <configItem> + <name>standard</name> +- <_description>Hungarian (standard)</_description> ++ <description>Hungarian (standard)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Hungarian (eliminate dead keys)</_description> ++ <description>Hungarian (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty</name> +- <_description>Hungarian (qwerty)</_description> ++ <description>Hungarian (qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwertz_comma_dead</name> +- <_description>Hungarian (101/qwertz/comma/dead keys)</_description> ++ <description>Hungarian (101/qwertz/comma/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwertz_comma_nodead</name> +- <_description>Hungarian (101/qwertz/comma/eliminate dead keys)</_description> ++ <description>Hungarian (101/qwertz/comma/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwertz_dot_dead</name> +- <_description>Hungarian (101/qwertz/dot/dead keys)</_description> ++ <description>Hungarian (101/qwertz/dot/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwertz_dot_nodead</name> +- <_description>Hungarian (101/qwertz/dot/eliminate dead keys)</_description> ++ <description>Hungarian (101/qwertz/dot/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwerty_comma_dead</name> +- <_description>Hungarian (101/qwerty/comma/dead keys)</_description> ++ <description>Hungarian (101/qwerty/comma/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwerty_comma_nodead</name> +- <_description>Hungarian (101/qwerty/comma/eliminate dead keys)</_description> ++ <description>Hungarian (101/qwerty/comma/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwerty_dot_dead</name> +- <_description>Hungarian (101/qwerty/dot/dead keys)</_description> ++ <description>Hungarian (101/qwerty/dot/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>101_qwerty_dot_nodead</name> +- <_description>Hungarian (101/qwerty/dot/eliminate dead keys)</_description> ++ <description>Hungarian (101/qwerty/dot/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwertz_comma_dead</name> +- <_description>Hungarian (102/qwertz/comma/dead keys)</_description> ++ <description>Hungarian (102/qwertz/comma/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwertz_comma_nodead</name> +- <_description>Hungarian (102/qwertz/comma/eliminate dead keys)</_description> ++ <description>Hungarian (102/qwertz/comma/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwertz_dot_dead</name> +- <_description>Hungarian (102/qwertz/dot/dead keys)</_description> ++ <description>Hungarian (102/qwertz/dot/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwertz_dot_nodead</name> +- <_description>Hungarian (102/qwertz/dot/eliminate dead keys)</_description> ++ <description>Hungarian (102/qwertz/dot/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwerty_comma_dead</name> +- <_description>Hungarian (102/qwerty/comma/dead keys)</_description> ++ <description>Hungarian (102/qwerty/comma/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwerty_comma_nodead</name> +- <_description>Hungarian (102/qwerty/comma/eliminate dead keys)</_description> ++ <description>Hungarian (102/qwerty/comma/eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwerty_dot_dead</name> +- <_description>Hungarian (102/qwerty/dot/dead keys)</_description> ++ <description>Hungarian (102/qwerty/dot/dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>102_qwerty_dot_nodead</name> +- <_description>Hungarian (102/qwerty/dot/eliminate dead keys)</_description> ++ <description>Hungarian (102/qwerty/dot/eliminate dead keys)</description> + </configItem> + </variant> + </variantList> +@@ -3463,9 +3463,9 @@ + <layout> + <configItem> + <name>is</name> +- <!-- Keyboard indicator for Icelandic layouts --> +- <_shortDescription>is</_shortDescription> +- <_description>Icelandic</_description> ++ ++ <shortDescription>is</shortDescription> ++ <description>Icelandic</description> + <languageList> + <iso639Id>ice</iso639Id> + </languageList> +@@ -3474,25 +3474,25 @@ + <variant> + <configItem> + <name>Sundeadkeys</name> +- <_description>Icelandic (Sun dead keys)</_description> ++ <description>Icelandic (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Icelandic (eliminate dead keys)</_description> ++ <description>Icelandic (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Icelandic (Macintosh)</_description> ++ <description>Icelandic (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Icelandic (Dvorak)</_description> ++ <description>Icelandic (Dvorak)</description> + </configItem> + </variant> + </variantList> +@@ -3500,9 +3500,9 @@ + <layout> + <configItem> + <name>il</name> +- <!-- Keyboard indicator for Hebrew layouts --> +- <_shortDescription>he</_shortDescription> +- <_description>Hebrew</_description> ++ ++ <shortDescription>he</shortDescription> ++ <description>Hebrew</description> + <languageList> + <iso639Id>heb</iso639Id> + </languageList> +@@ -3511,19 +3511,19 @@ + <variant> + <configItem> + <name>lyx</name> +- <_description>Hebrew (lyx)</_description> ++ <description>Hebrew (lyx)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>phonetic</name> +- <_description>Hebrew (phonetic)</_description> ++ <description>Hebrew (phonetic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>biblical</name> +- <_description>Hebrew (Biblical, Tiro)</_description> ++ <description>Hebrew (Biblical, Tiro)</description> + </configItem> + </variant> + </variantList> +@@ -3531,9 +3531,9 @@ + <layout> + <configItem> + <name>it</name> +- <!-- Keyboard indicator for Italian layouts --> +- <_shortDescription>it</_shortDescription> +- <_description>Italian</_description> ++ ++ <shortDescription>it</shortDescription> ++ <description>Italian</description> + <languageList> + <iso639Id>ita</iso639Id> + </languageList> +@@ -3542,25 +3542,25 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Italian (eliminate dead keys)</_description> ++ <description>Italian (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Italian (Macintosh)</_description> ++ <description>Italian (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us</name> +- <_description>Italian (US keyboard with Italian letters)</_description> ++ <description>Italian (US keyboard with Italian letters)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>geo</name> +- <_description>Georgian (Italy)</_description> ++ <description>Georgian (Italy)</description> + <languageList> + <iso639Id>geo</iso639Id> + </languageList> +@@ -3569,7 +3569,7 @@ + <variant> + <configItem> + <name>ibm</name> +- <_description>Italian (IBM 142)</_description> ++ <description>Italian (IBM 142)</description> + </configItem> + </variant> + </variantList> +@@ -3577,9 +3577,9 @@ + <layout> + <configItem> + <name>jp</name> +- <!-- Keyboard indicator for Japanese layouts --> +- <_shortDescription>ja</_shortDescription> +- <_description>Japanese</_description> ++ ++ <shortDescription>ja</shortDescription> ++ <description>Japanese</description> + <languageList> + <iso639Id>jpn</iso639Id> + </languageList> +@@ -3588,31 +3588,31 @@ + <variant> + <configItem> + <name>kana</name> +- <_description>Japanese (Kana)</_description> ++ <description>Japanese (Kana)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>kana86</name> +- <_description>Japanese (Kana 86)</_description> ++ <description>Japanese (Kana 86)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>OADG109A</name> +- <_description>Japanese (OADG 109A)</_description> ++ <description>Japanese (OADG 109A)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Japanese (Macintosh)</_description> ++ <description>Japanese (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Japanese (Dvorak)</_description> ++ <description>Japanese (Dvorak)</description> + </configItem> + </variant> + </variantList> +@@ -3620,9 +3620,9 @@ + <layout> + <configItem> + <name>kg</name> +- <!-- Keyboard indicator for Kyrgyz layouts --> +- <_shortDescription>ki</_shortDescription> +- <_description>Kyrgyz</_description> ++ ++ <shortDescription>ki</shortDescription> ++ <description>Kyrgyz</description> + <languageList> + <iso639Id>kir</iso639Id> + </languageList> +@@ -3631,7 +3631,7 @@ + <variant> + <configItem> + <name>phonetic</name> +- <_description>Kyrgyz (phonetic)</_description> ++ <description>Kyrgyz (phonetic)</description> + </configItem> + </variant> + </variantList> +@@ -3639,9 +3639,9 @@ + <layout> + <configItem> + <name>kh</name> +- <!-- Keyboard indicator for Khmer layouts --> +- <_shortDescription>km</_shortDescription> +- <_description>Khmer (Cambodia)</_description> ++ ++ <shortDescription>km</shortDescription> ++ <description>Khmer (Cambodia)</description> + <languageList> + <iso639Id>khm</iso639Id> + </languageList> +@@ -3651,9 +3651,9 @@ + <layout> + <configItem> + <name>kz</name> +- <!-- Keyboard indicator for Kazakh layouts --> +- <_shortDescription>kk</_shortDescription> +- <_description>Kazakh</_description> ++ ++ <shortDescription>kk</shortDescription> ++ <description>Kazakh</description> + <languageList> + <iso639Id>kaz</iso639Id> + </languageList> +@@ -3662,9 +3662,9 @@ + <variant> + <configItem> + <name>ruskaz</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian (Kazakhstan, with Kazakh)</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian (Kazakhstan, with Kazakh)</description> + <languageList><iso639Id>kaz</iso639Id> + <iso639Id>rus</iso639Id></languageList> + </configItem> +@@ -3672,7 +3672,7 @@ + <variant> + <configItem> + <name>kazrus</name> +- <_description>Kazakh (with Russian)</_description> ++ <description>Kazakh (with Russian)</description> + <languageList><iso639Id>kaz</iso639Id> + <iso639Id>rus</iso639Id></languageList> + </configItem> +@@ -3682,9 +3682,9 @@ + <layout> + <configItem> + <name>la</name> +- <!-- Keyboard indicator for Lao layouts --> +- <_shortDescription>lo</_shortDescription> +- <_description>Lao</_description> ++ ++ <shortDescription>lo</shortDescription> ++ <description>Lao</description> + <languageList> + <iso639Id>lao</iso639Id> + </languageList> +@@ -3693,7 +3693,7 @@ + <variant> + <configItem> + <name>stea</name> +- <_description>Lao (STEA proposed standard layout)</_description> ++ <description>Lao (STEA proposed standard layout)</description> + <languageList><iso639Id>lao</iso639Id> + </languageList> + </configItem> +@@ -3703,9 +3703,9 @@ + <layout> + <configItem> + <name>latam</name> +- <!-- Keyboard indicator for Spanish layouts --> +- <_shortDescription>es</_shortDescription> +- <_description>Spanish (Latin American)</_description> ++ ++ <shortDescription>es</shortDescription> ++ <description>Spanish (Latin American)</description> + <countryList> + <iso3166Id>AR</iso3166Id> + <iso3166Id>BO</iso3166Id> +@@ -3737,19 +3737,19 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Spanish (Latin American, eliminate dead keys)</_description> ++ <description>Spanish (Latin American, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>deadtilde</name> +- <_description>Spanish (Latin American, include dead tilde)</_description> ++ <description>Spanish (Latin American, include dead tilde)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>Spanish (Latin American, Sun dead keys)</_description> ++ <description>Spanish (Latin American, Sun dead keys)</description> + </configItem> + </variant> + </variantList> +@@ -3757,9 +3757,9 @@ + <layout> + <configItem> + <name>lt</name> +- <!-- Keyboard indicator for Lithuanian layouts --> +- <_shortDescription>lt</_shortDescription> +- <_description>Lithuanian</_description> ++ ++ <shortDescription>lt</shortDescription> ++ <description>Lithuanian</description> + <languageList> + <iso639Id>lit</iso639Id> + </languageList> +@@ -3768,31 +3768,31 @@ + <variant> + <configItem> + <name>std</name> +- <_description>Lithuanian (standard)</_description> ++ <description>Lithuanian (standard)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us</name> +- <_description>Lithuanian (US keyboard with Lithuanian letters)</_description> ++ <description>Lithuanian (US keyboard with Lithuanian letters)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ibm</name> +- <_description>Lithuanian (IBM LST 1205-92)</_description> ++ <description>Lithuanian (IBM LST 1205-92)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>lekp</name> +- <_description>Lithuanian (LEKP)</_description> ++ <description>Lithuanian (LEKP)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>lekpa</name> +- <_description>Lithuanian (LEKPa)</_description> ++ <description>Lithuanian (LEKPa)</description> + </configItem> + </variant> + </variantList> +@@ -3800,9 +3800,9 @@ + <layout> + <configItem> + <name>lv</name> +- <!-- Keyboard indicator for Latvian layouts --> +- <_shortDescription>lv</_shortDescription> +- <_description>Latvian</_description> ++ ++ <shortDescription>lv</shortDescription> ++ <description>Latvian</description> + <languageList> + <iso639Id>lav</iso639Id> + </languageList> +@@ -3811,37 +3811,37 @@ + <variant> + <configItem> + <name>apostrophe</name> +- <_description>Latvian (apostrophe variant)</_description> ++ <description>Latvian (apostrophe variant)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>tilde</name> +- <_description>Latvian (tilde variant)</_description> ++ <description>Latvian (tilde variant)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>fkey</name> +- <_description>Latvian (F variant)</_description> ++ <description>Latvian (F variant)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>modern</name> +- <_description>Latvian (modern)</_description> ++ <description>Latvian (modern)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ergonomic</name> +- <_description>Latvian (ergonomic, ŪGJRMV)</_description> ++ <description>Latvian (ergonomic, ŪGJRMV)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>adapted</name> +- <_description>Latvian (adapted)</_description> ++ <description>Latvian (adapted)</description> + </configItem> + </variant> + </variantList> +@@ -3849,9 +3849,9 @@ + <layout> + <configItem> + <name>mao</name> +- <!-- Keyboard indicator for Maori layouts --> +- <_shortDescription>mi</_shortDescription> +- <_description>Maori</_description> ++ ++ <shortDescription>mi</shortDescription> ++ <description>Maori</description> + <languageList> + <iso639Id>mao</iso639Id> + </languageList> +@@ -3861,9 +3861,9 @@ + <layout> + <configItem> + <name>me</name> +- <!-- Keyboard indicator for Montenegrin layouts --> +- <_shortDescription>sr</_shortDescription> +- <_description>Montenegrin</_description> ++ ++ <shortDescription>sr</shortDescription> ++ <description>Montenegrin</description> + <languageList> + <iso639Id>srp</iso639Id> + </languageList> +@@ -3872,43 +3872,43 @@ + <variant> + <configItem> + <name>cyrillic</name> +- <_description>Montenegrin (Cyrillic)</_description> ++ <description>Montenegrin (Cyrillic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>cyrillicyz</name> +- <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description> ++ <description>Montenegrin (Cyrillic, Z and ZHE swapped)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinunicode</name> +- <_description>Montenegrin (Latin Unicode)</_description> ++ <description>Montenegrin (Latin Unicode)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinyz</name> +- <_description>Montenegrin (Latin qwerty)</_description> ++ <description>Montenegrin (Latin qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinunicodeyz</name> +- <_description>Montenegrin (Latin Unicode qwerty)</_description> ++ <description>Montenegrin (Latin Unicode qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>cyrillicalternatequotes</name> +- <_description>Montenegrin (Cyrillic with guillemets)</_description> ++ <description>Montenegrin (Cyrillic with guillemets)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinalternatequotes</name> +- <_description>Montenegrin (Latin with guillemets)</_description> ++ <description>Montenegrin (Latin with guillemets)</description> + </configItem> + </variant> + </variantList> +@@ -3916,9 +3916,9 @@ + <layout> + <configItem> + <name>mk</name> +- <!-- Keyboard indicator for Macedonian layouts --> +- <_shortDescription>mk</_shortDescription> +- <_description>Macedonian</_description> ++ ++ <shortDescription>mk</shortDescription> ++ <description>Macedonian</description> + <languageList> + <iso639Id>mkd</iso639Id> + </languageList> +@@ -3927,7 +3927,7 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Macedonian (eliminate dead keys)</_description> ++ <description>Macedonian (eliminate dead keys)</description> + </configItem> + </variant> + </variantList> +@@ -3935,9 +3935,9 @@ + <layout> + <configItem> + <name>mt</name> +- <!-- Keyboard indicator for Maltese layouts --> +- <_shortDescription>mt</_shortDescription> +- <_description>Maltese</_description> ++ ++ <shortDescription>mt</shortDescription> ++ <description>Maltese</description> + <languageList> + <iso639Id>mlt</iso639Id> + </languageList> +@@ -3946,7 +3946,7 @@ + <variant> + <configItem> + <name>us</name> +- <_description>Maltese (with US layout)</_description> ++ <description>Maltese (with US layout)</description> + </configItem> + </variant> + </variantList> +@@ -3954,9 +3954,9 @@ + <layout> + <configItem> + <name>mn</name> +- <!-- Keyboard indicator for Mongolian layouts --> +- <_shortDescription>mn</_shortDescription> +- <_description>Mongolian</_description> ++ ++ <shortDescription>mn</shortDescription> ++ <description>Mongolian</description> + <languageList> + <iso639Id>mon</iso639Id> + </languageList> +@@ -3966,9 +3966,9 @@ + <layout> + <configItem> + <name>no</name> +- <!-- Keyboard indicator for Norwegian layouts --> +- <_shortDescription>no</_shortDescription> +- <_description>Norwegian</_description> ++ ++ <shortDescription>no</shortDescription> ++ <description>Norwegian</description> + <languageList> + <iso639Id>nor</iso639Id> + <iso639Id>nob</iso639Id> +@@ -3979,19 +3979,19 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Norwegian (eliminate dead keys)</_description> ++ <description>Norwegian (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Norwegian (Dvorak)</_description> ++ <description>Norwegian (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>smi</name> +- <_description>Northern Saami (Norway)</_description> ++ <description>Northern Saami (Norway)</description> + <languageList> + <iso639Id>sme</iso639Id> + </languageList> +@@ -4000,7 +4000,7 @@ + <variant> + <configItem> + <name>smi_nodeadkeys</name> +- <_description>Northern Saami (Norway, eliminate dead keys)</_description> ++ <description>Northern Saami (Norway, eliminate dead keys)</description> + <languageList> + <iso639Id>sme</iso639Id> + </languageList> +@@ -4009,19 +4009,19 @@ + <variant> + <configItem> + <name>mac</name> +- <_description>Norwegian (Macintosh)</_description> ++ <description>Norwegian (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac_nodeadkeys</name> +- <_description>Norwegian (Macintosh, eliminate dead keys)</_description> ++ <description>Norwegian (Macintosh, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>colemak</name> +- <_description>Norwegian (Colemak)</_description> ++ <description>Norwegian (Colemak)</description> + </configItem> + </variant> + </variantList> +@@ -4029,9 +4029,9 @@ + <layout> + <configItem> + <name>pl</name> +- <!-- Keyboard indicator for Polish layouts --> +- <_shortDescription>pl</_shortDescription> +- <_description>Polish</_description> ++ ++ <shortDescription>pl</shortDescription> ++ <description>Polish</description> + <languageList> + <iso639Id>pol</iso639Id> + </languageList> +@@ -4040,37 +4040,37 @@ + <variant> + <configItem> + <name>legacy</name> +- <_description>Polish (legacy)</_description> ++ <description>Polish (legacy)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>qwertz</name> +- <_description>Polish (qwertz)</_description> ++ <description>Polish (qwertz)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Polish (Dvorak)</_description> ++ <description>Polish (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak_quotes</name> +- <_description>Polish (Dvorak, Polish quotes on quotemark key)</_description> ++ <description>Polish (Dvorak, Polish quotes on quotemark key)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak_altquotes</name> +- <_description>Polish (Dvorak, Polish quotes on key 1)</_description> ++ <description>Polish (Dvorak, Polish quotes on key 1)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>csb</name> +- <_description>Kashubian</_description> ++ <description>Kashubian</description> + <languageList> + <iso639Id>csb</iso639Id> + </languageList> +@@ -4086,9 +4086,9 @@ + <variant> + <configItem> + <name>ru_phonetic_dvorak</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian (Poland, phonetic Dvorak)</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian (Poland, phonetic Dvorak)</description> + <languageList> + <iso639Id>rus</iso639Id> + </languageList> +@@ -4097,7 +4097,7 @@ + <variant> + <configItem> + <name>dvp</name> +- <_description>Polish (programmer Dvorak)</_description> ++ <description>Polish (programmer Dvorak)</description> + </configItem> + </variant> + </variantList> +@@ -4105,9 +4105,9 @@ + <layout> + <configItem> + <name>pt</name> +- <!-- Keyboard indicator for Portuguese layouts --> +- <_shortDescription>pt</_shortDescription> +- <_description>Portuguese</_description> ++ ++ <shortDescription>pt</shortDescription> ++ <description>Portuguese</description> + <languageList> + <iso639Id>por</iso639Id> + </languageList> +@@ -4116,49 +4116,49 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Portuguese (eliminate dead keys)</_description> ++ <description>Portuguese (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>Portuguese (Sun dead keys)</_description> ++ <description>Portuguese (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Portuguese (Macintosh)</_description> ++ <description>Portuguese (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac_nodeadkeys</name> +- <_description>Portuguese (Macintosh, eliminate dead keys)</_description> ++ <description>Portuguese (Macintosh, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac_sundeadkeys</name> +- <_description>Portuguese (Macintosh, Sun dead keys)</_description> ++ <description>Portuguese (Macintosh, Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nativo</name> +- <_description>Portuguese (Nativo)</_description> ++ <description>Portuguese (Nativo)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nativo-us</name> +- <_description>Portuguese (Nativo for US keyboards)</_description> ++ <description>Portuguese (Nativo for US keyboards)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>nativo-epo</name> +- <_description>Esperanto (Portugal, Nativo)</_description> ++ <description>Esperanto (Portugal, Nativo)</description> + <languageList> + <iso639Id>epo</iso639Id> + </languageList> +@@ -4169,9 +4169,9 @@ + <layout> + <configItem> + <name>ro</name> +- <!-- Keyboard indicator for Romanian layouts --> +- <_shortDescription>ro</_shortDescription> +- <_description>Romanian</_description> ++ ++ <shortDescription>ro</shortDescription> ++ <description>Romanian</description> + <languageList> + <iso639Id>rum</iso639Id> + </languageList> +@@ -4180,25 +4180,25 @@ + <variant> + <configItem> + <name>cedilla</name> +- <_description>Romanian (cedilla)</_description> ++ <description>Romanian (cedilla)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>std</name> +- <_description>Romanian (standard)</_description> ++ <description>Romanian (standard)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>std_cedilla</name> +- <_description>Romanian (standard cedilla)</_description> ++ <description>Romanian (standard cedilla)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>winkeys</name> +- <_description>Romanian (WinKeys)</_description> ++ <description>Romanian (WinKeys)</description> + </configItem> + </variant> + </variantList> +@@ -4206,9 +4206,9 @@ + <layout> + <configItem> + <name>ru</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian</description> + <languageList> + <iso639Id>rus</iso639Id> + </languageList> +@@ -4217,37 +4217,37 @@ + <variant> + <configItem> + <name>phonetic</name> +- <_description>Russian (phonetic)</_description> ++ <description>Russian (phonetic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>phonetic_winkeys</name> +- <_description>Russian (phonetic WinKeys)</_description> ++ <description>Russian (phonetic WinKeys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>typewriter</name> +- <_description>Russian (typewriter)</_description> ++ <description>Russian (typewriter)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>legacy</name> +- <_description>Russian (legacy)</_description> ++ <description>Russian (legacy)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>typewriter-legacy</name> +- <_description>Russian (typewriter, legacy)</_description> ++ <description>Russian (typewriter, legacy)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>tt</name> +- <_description>Tatar</_description> ++ <description>Tatar</description> + <languageList> + <iso639Id>tat</iso639Id> + </languageList> +@@ -4256,7 +4256,7 @@ + <variant> + <configItem> + <name>os_legacy</name> +- <_description>Ossetian (legacy)</_description> ++ <description>Ossetian (legacy)</description> + <languageList> + <iso639Id>oss</iso639Id> + </languageList> +@@ -4265,7 +4265,7 @@ + <variant> + <configItem> + <name>os_winkeys</name> +- <_description>Ossetian (WinKeys)</_description> ++ <description>Ossetian (WinKeys)</description> + <languageList> + <iso639Id>oss</iso639Id> + </languageList> +@@ -4274,7 +4274,7 @@ + <variant> + <configItem> + <name>cv</name> +- <_description>Chuvash</_description> ++ <description>Chuvash</description> + <languageList> + <iso639Id>chv</iso639Id> + </languageList> +@@ -4283,7 +4283,7 @@ + <variant> + <configItem> + <name>cv_latin</name> +- <_description>Chuvash (Latin)</_description> ++ <description>Chuvash (Latin)</description> + <languageList> + <iso639Id>chv</iso639Id> + </languageList> +@@ -4292,7 +4292,7 @@ + <variant> + <configItem> + <name>udm</name> +- <_description>Udmurt</_description> ++ <description>Udmurt</description> + <languageList> + <iso639Id>udm</iso639Id> + </languageList> +@@ -4301,7 +4301,7 @@ + <variant> + <configItem> + <name>kom</name> +- <_description>Komi</_description> ++ <description>Komi</description> + <languageList> + <iso639Id>kom</iso639Id> + </languageList> +@@ -4310,7 +4310,7 @@ + <variant> + <configItem> + <name>sah</name> +- <_description>Yakut</_description> ++ <description>Yakut</description> + <languageList> + <iso639Id>sah</iso639Id> + </languageList> +@@ -4319,7 +4319,7 @@ + <variant> + <configItem> + <name>xal</name> +- <_description>Kalmyk</_description> ++ <description>Kalmyk</description> + <languageList> + <iso639Id>xal</iso639Id> + </languageList> +@@ -4328,19 +4328,19 @@ + <variant> + <configItem> + <name>dos</name> +- <_description>Russian (DOS)</_description> ++ <description>Russian (DOS)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>Russian (Macintosh)</_description> ++ <description>Russian (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>srp</name> +- <_description>Serbian (Russia)</_description> ++ <description>Serbian (Russia)</description> + <languageList><iso639Id>rus</iso639Id> + <iso639Id>srp</iso639Id></languageList> + </configItem> +@@ -4348,7 +4348,7 @@ + <variant> + <configItem> + <name>bak</name> +- <_description>Bashkirian</_description> ++ <description>Bashkirian</description> + <languageList> + <iso639Id>bak</iso639Id> + </languageList> +@@ -4357,7 +4357,7 @@ + <variant> + <configItem> + <name>chm</name> +- <_description>Mari</_description> ++ <description>Mari</description> + <languageList> + <iso639Id>chm</iso639Id> + </languageList> +@@ -4368,9 +4368,9 @@ + <layout> + <configItem> + <name>rs</name> +- <!-- Keyboard indicator for Serbian layouts --> +- <_shortDescription>sr</_shortDescription> +- <_description>Serbian</_description> ++ ++ <shortDescription>sr</shortDescription> ++ <description>Serbian</description> + <languageList> + <iso639Id>srp</iso639Id> + </languageList> +@@ -4379,49 +4379,49 @@ + <variant> + <configItem> + <name>yz</name> +- <_description>Serbian (Cyrillic, Z and ZHE swapped)</_description> ++ <description>Serbian (Cyrillic, Z and ZHE swapped)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latin</name> +- <_description>Serbian (Latin)</_description> ++ <description>Serbian (Latin)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinunicode</name> +- <_description>Serbian (Latin Unicode)</_description> ++ <description>Serbian (Latin Unicode)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinyz</name> +- <_description>Serbian (Latin qwerty)</_description> ++ <description>Serbian (Latin qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinunicodeyz</name> +- <_description>Serbian (Latin Unicode qwerty)</_description> ++ <description>Serbian (Latin Unicode qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>alternatequotes</name> +- <_description>Serbian (Cyrillic with guillemets)</_description> ++ <description>Serbian (Cyrillic with guillemets)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>latinalternatequotes</name> +- <_description>Serbian (Latin with guillemets)</_description> ++ <description>Serbian (Latin with guillemets)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>rue</name> +- <_description>Pannonian Rusyn</_description> ++ <description>Pannonian Rusyn</description> + <languageList> + <iso639Id>rue</iso639Id> + </languageList> +@@ -4432,9 +4432,9 @@ + <layout> + <configItem> + <name>si</name> +- <!-- Keyboard indicator for Slovenian layouts --> +- <_shortDescription>sl</_shortDescription> +- <_description>Slovenian</_description> ++ ++ <shortDescription>sl</shortDescription> ++ <description>Slovenian</description> + <languageList> + <iso639Id>slv</iso639Id> + </languageList> +@@ -4443,13 +4443,13 @@ + <variant> + <configItem> + <name>alternatequotes</name> +- <_description>Slovenian (use guillemets for quotes)</_description> ++ <description>Slovenian (use guillemets for quotes)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us</name> +- <_description>Slovenian (US keyboard with Slovenian letters)</_description> ++ <description>Slovenian (US keyboard with Slovenian letters)</description> + </configItem> + </variant> + </variantList> +@@ -4457,9 +4457,9 @@ + <layout> + <configItem> + <name>sk</name> +- <!-- Keyboard indicator for Slovak layouts --> +- <_shortDescription>sk</_shortDescription> +- <_description>Slovak</_description> ++ ++ <shortDescription>sk</shortDescription> ++ <description>Slovak</description> + <languageList> + <iso639Id>slo</iso639Id> + </languageList> +@@ -4468,19 +4468,19 @@ + <variant> + <configItem> + <name>bksl</name> +- <_description>Slovak (extended Backslash)</_description> ++ <description>Slovak (extended Backslash)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty</name> +- <_description>Slovak (qwerty)</_description> ++ <description>Slovak (qwerty)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty_bksl</name> +- <_description>Slovak (qwerty, extended Backslash)</_description> ++ <description>Slovak (qwerty, extended Backslash)</description> + </configItem> + </variant> + </variantList> +@@ -4488,9 +4488,9 @@ + <layout> + <configItem> + <name>es</name> +- <!-- Keyboard indicator for Spanish layouts --> +- <_shortDescription>es</_shortDescription> +- <_description>Spanish</_description> ++ ++ <shortDescription>es</shortDescription> ++ <description>Spanish</description> + <languageList> + <iso639Id>spa</iso639Id> + </languageList> +@@ -4499,31 +4499,31 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Spanish (eliminate dead keys)</_description> ++ <description>Spanish (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>deadtilde</name> +- <_description>Spanish (include dead tilde)</_description> ++ <description>Spanish (include dead tilde)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>Spanish (Sun dead keys)</_description> ++ <description>Spanish (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Spanish (Dvorak)</_description> ++ <description>Spanish (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ast</name> +- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L)</_description> ++ <description>Asturian (Spain, with bottom-dot H and bottom-dot L)</description> + <languageList> + <iso639Id>ast</iso639Id> + </languageList> +@@ -4532,7 +4532,7 @@ + <variant> + <configItem> + <name>cat</name> +- <_description>Catalan (Spain, with middle-dot L)</_description> ++ <description>Catalan (Spain, with middle-dot L)</description> + <languageList> + <iso639Id>cat</iso639Id> + </languageList> +@@ -4541,7 +4541,7 @@ + <variant> + <configItem> + <name>mac</name> +- <_description>Spanish (Macintosh)</_description> ++ <description>Spanish (Macintosh)</description> + </configItem> + </variant> + </variantList> +@@ -4549,9 +4549,9 @@ + <layout> + <configItem> + <name>se</name> +- <!-- Keyboard indicator for Swedish layouts --> +- <_shortDescription>sv</_shortDescription> +- <_description>Swedish</_description> ++ ++ <shortDescription>sv</shortDescription> ++ <description>Swedish</description> + <languageList> + <iso639Id>swe</iso639Id> + </languageList> +@@ -4560,21 +4560,21 @@ + <variant> + <configItem> + <name>nodeadkeys</name> +- <_description>Swedish (eliminate dead keys)</_description> ++ <description>Swedish (eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>Swedish (Dvorak)</_description> ++ <description>Swedish (Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>rus</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian (Sweden, phonetic)</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian (Sweden, phonetic)</description> + <languageList> + <iso639Id>rus</iso639Id> + </languageList> +@@ -4583,9 +4583,9 @@ + <variant> + <configItem> + <name>rus_nodeadkeys</name> +- <!-- Keyboard indicator for Russian layouts --> +- <_shortDescription>ru</_shortDescription> +- <_description>Russian (Sweden, phonetic, eliminate dead keys)</_description> ++ ++ <shortDescription>ru</shortDescription> ++ <description>Russian (Sweden, phonetic, eliminate dead keys)</description> + <languageList> + <iso639Id>rus</iso639Id> + </languageList> +@@ -4594,7 +4594,7 @@ + <variant> + <configItem> + <name>smi</name> +- <_description>Northern Saami (Sweden)</_description> ++ <description>Northern Saami (Sweden)</description> + <languageList> + <iso639Id>sme</iso639Id> + </languageList> +@@ -4603,19 +4603,19 @@ + <variant> + <configItem> + <name>mac</name> +- <_description>Swedish (Macintosh)</_description> ++ <description>Swedish (Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>svdvorak</name> +- <_description>Swedish (Svdvorak)</_description> ++ <description>Swedish (Svdvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>swl</name> +- <_description>Swedish Sign Language</_description> ++ <description>Swedish Sign Language</description> + <languageList><iso639Id>swl</iso639Id></languageList> + </configItem> + </variant> +@@ -4624,9 +4624,9 @@ + <layout> + <configItem> + <name>ch</name> +- <!-- Keyboard indicator for German layouts --> +- <_shortDescription>de</_shortDescription> +- <_description>German (Switzerland)</_description> ++ ++ <shortDescription>de</shortDescription> ++ <description>German (Switzerland)</description> + <languageList><iso639Id>ger</iso639Id> + <iso639Id>gsw</iso639Id></languageList> + </configItem> +@@ -4634,31 +4634,31 @@ + <variant> + <configItem> + <name>legacy</name> +- <_description>German (Switzerland, legacy)</_description> ++ <description>German (Switzerland, legacy)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>de_nodeadkeys</name> +- <!-- Keyboard indicator for German layouts --> +- <_shortDescription>de</_shortDescription> +- <_description>German (Switzerland, eliminate dead keys)</_description> ++ ++ <shortDescription>de</shortDescription> ++ <description>German (Switzerland, eliminate dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>de_sundeadkeys</name> +- <!-- Keyboard indicator for German layouts --> +- <_shortDescription>de</_shortDescription> +- <_description>German (Switzerland, Sun dead keys)</_description> ++ ++ <shortDescription>de</shortDescription> ++ <description>German (Switzerland, Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>fr</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Switzerland)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Switzerland)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -4667,9 +4667,9 @@ + <variant> + <configItem> + <name>fr_nodeadkeys</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Switzerland, eliminate dead keys)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Switzerland, eliminate dead keys)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -4678,9 +4678,9 @@ + <variant> + <configItem> + <name>fr_sundeadkeys</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Switzerland, Sun dead keys)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Switzerland, Sun dead keys)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -4689,9 +4689,9 @@ + <variant> + <configItem> + <name>fr_mac</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Switzerland, Macintosh)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Switzerland, Macintosh)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -4700,9 +4700,9 @@ + <variant> + <configItem> + <name>de_mac</name> +- <!-- Keyboard indicator for German layouts --> +- <_shortDescription>de</_shortDescription> +- <_description>German (Switzerland, Macintosh)</_description> ++ ++ <shortDescription>de</shortDescription> ++ <description>German (Switzerland, Macintosh)</description> + </configItem> + </variant> + </variantList> +@@ -4710,9 +4710,9 @@ + <layout> + <configItem> + <name>sy</name> +- <!-- Keyboard indicator for Arabic layouts --> +- <_shortDescription>ar</_shortDescription> +- <_description>Arabic (Syria)</_description> ++ ++ <shortDescription>ar</shortDescription> ++ <description>Arabic (Syria)</description> + <languageList> + <iso639Id>syr</iso639Id> + </languageList> +@@ -4721,25 +4721,25 @@ + <variant> + <configItem> + <name>syc</name> +- <!-- Keyboard indicator for Syriac layouts --> +- <_shortDescription>syc</_shortDescription> +- <_description>Syriac</_description> ++ ++ <shortDescription>syc</shortDescription> ++ <description>Syriac</description> + </configItem> + </variant> + <variant> + <configItem> + <name>syc_phonetic</name> +- <!-- Keyboard indicator for Syriac layouts --> +- <_shortDescription>syc</_shortDescription> +- <_description>Syriac (phonetic)</_description> ++ ++ <shortDescription>syc</shortDescription> ++ <description>Syriac (phonetic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ku</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Syria, Latin Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Syria, Latin Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -4748,9 +4748,9 @@ + <variant> + <configItem> + <name>ku_f</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Syria, F)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Syria, F)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -4759,9 +4759,9 @@ + <variant> + <configItem> + <name>ku_alt</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Syria, Latin Alt-Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Syria, Latin Alt-Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -4772,9 +4772,9 @@ + <layout> + <configItem> + <name>tj</name> +- <!-- Keyboard indicator for Tajik layouts --> +- <_shortDescription>tg</_shortDescription> +- <_description>Tajik</_description> ++ ++ <shortDescription>tg</shortDescription> ++ <description>Tajik</description> + <languageList> + <iso639Id>tgk</iso639Id> + </languageList> +@@ -4783,7 +4783,7 @@ + <variant> + <configItem> + <name>legacy</name> +- <_description>Tajik (legacy)</_description> ++ <description>Tajik (legacy)</description> + </configItem> + </variant> + </variantList> +@@ -4791,9 +4791,9 @@ + <layout> + <configItem> + <name>lk</name> +- <!-- Keyboard indicator for Sinhala layouts --> +- <_shortDescription>si</_shortDescription> +- <_description>Sinhala (phonetic)</_description> ++ ++ <shortDescription>si</shortDescription> ++ <description>Sinhala (phonetic)</description> + <languageList> + <iso639Id>sin</iso639Id> + </languageList> +@@ -4802,9 +4802,9 @@ + <variant> + <configItem> + <name>tam_unicode</name> +- <!-- Keyboard indicator for Tamil layouts --> +- <_shortDescription>ta</_shortDescription> +- <_description>Tamil (Sri Lanka, Unicode)</_description> ++ ++ <shortDescription>ta</shortDescription> ++ <description>Tamil (Sri Lanka, Unicode)</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -4813,7 +4813,7 @@ + <variant> + <configItem> + <name>tam_TAB</name> +- <_description>Tamil (Sri Lanka, TAB Typewriter)</_description> ++ <description>Tamil (Sri Lanka, TAB Typewriter)</description> + <languageList> + <iso639Id>tam</iso639Id> + </languageList> +@@ -4824,9 +4824,9 @@ + <layout> + <configItem> + <name>th</name> +- <!-- Keyboard indicator for Thai layouts --> +- <_shortDescription>th</_shortDescription> +- <_description>Thai</_description> ++ ++ <shortDescription>th</shortDescription> ++ <description>Thai</description> + <languageList> + <iso639Id>tha</iso639Id> + </languageList> +@@ -4835,13 +4835,13 @@ + <variant> + <configItem> + <name>tis</name> +- <_description>Thai (TIS-820.2538)</_description> ++ <description>Thai (TIS-820.2538)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>pat</name> +- <_description>Thai (Pattachote)</_description> ++ <description>Thai (Pattachote)</description> + </configItem> + </variant> + </variantList> +@@ -4849,9 +4849,9 @@ + <layout> + <configItem> + <name>tr</name> +- <!-- Keyboard indicator for Turkish layouts --> +- <_shortDescription>tr</_shortDescription> +- <_description>Turkish</_description> ++ ++ <shortDescription>tr</shortDescription> ++ <description>Turkish</description> + <languageList> + <iso639Id>tur</iso639Id> + </languageList> +@@ -4860,27 +4860,27 @@ + <variant> + <configItem> + <name>f</name> +- <_description>Turkish (F)</_description> ++ <description>Turkish (F)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>alt</name> +- <_description>Turkish (Alt-Q)</_description> ++ <description>Turkish (Alt-Q)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sundeadkeys</name> +- <_description>Turkish (Sun dead keys)</_description> ++ <description>Turkish (Sun dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ku</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Turkey, Latin Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Turkey, Latin Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -4889,9 +4889,9 @@ + <variant> + <configItem> + <name>ku_f</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Turkey, F)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Turkey, F)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -4900,9 +4900,9 @@ + <variant> + <configItem> + <name>ku_alt</name> +- <!-- Keyboard indicator for Kurdish layouts --> +- <_shortDescription>ku</_shortDescription> +- <_description>Kurdish (Turkey, Latin Alt-Q)</_description> ++ ++ <shortDescription>ku</shortDescription> ++ <description>Kurdish (Turkey, Latin Alt-Q)</description> + <languageList> + <iso639Id>kur</iso639Id> + </languageList> +@@ -4911,15 +4911,15 @@ + <variant> + <configItem> + <name>intl</name> +- <_description>Turkish (international with dead keys)</_description> ++ <description>Turkish (international with dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>crh</name> +- <!-- Keyboard indicator for Crimean Tatar layouts --> +- <_shortDescription>crh</_shortDescription> +- <_description>Crimean Tatar (Turkish Q)</_description> ++ ++ <shortDescription>crh</shortDescription> ++ <description>Crimean Tatar (Turkish Q)</description> + <languageList> + <iso639Id>crh</iso639Id> + </languageList> +@@ -4928,9 +4928,9 @@ + <variant> + <configItem> + <name>crh_f</name> +- <!-- Keyboard indicator for Crimean Tatar layouts --> +- <_shortDescription>crh</_shortDescription> +- <_description>Crimean Tatar (Turkish F)</_description> ++ ++ <shortDescription>crh</shortDescription> ++ <description>Crimean Tatar (Turkish F)</description> + <languageList> + <iso639Id>crh</iso639Id> + </languageList> +@@ -4939,9 +4939,9 @@ + <variant> + <configItem> + <name>crh_alt</name> +- <!-- Keyboard indicator for Crimean Tatar layouts --> +- <_shortDescription>crh</_shortDescription> +- <_description>Crimean Tatar (Turkish Alt-Q)</_description> ++ ++ <shortDescription>crh</shortDescription> ++ <description>Crimean Tatar (Turkish Alt-Q)</description> + <languageList> + <iso639Id>crh</iso639Id> + </languageList> +@@ -4952,9 +4952,9 @@ + <layout> + <configItem> + <name>tw</name> +- <!-- Keyboard indicator for Taiwanese layouts --> +- <_shortDescription>zh</_shortDescription> +- <_description>Taiwanese</_description> ++ ++ <shortDescription>zh</shortDescription> ++ <description>Taiwanese</description> + <languageList> + <iso639Id>fox</iso639Id> + </languageList> +@@ -4963,7 +4963,7 @@ + <variant> + <configItem> + <name>indigenous</name> +- <_description>Taiwanese (indigenous)</_description> ++ <description>Taiwanese (indigenous)</description> + <languageList> + <iso639Id>ami</iso639Id> + <iso639Id>tay</iso639Id> +@@ -4987,9 +4987,9 @@ + <variant> + <configItem> + <name>saisiyat</name> +- <!-- Keyboard indicator for Saisiyat layouts --> +- <_shortDescription>xsy</_shortDescription> +- <_description>Saisiyat (Taiwan)</_description> ++ ++ <shortDescription>xsy</shortDescription> ++ <description>Saisiyat (Taiwan)</description> + <languageList> + <iso639Id>xsy</iso639Id> + </languageList> +@@ -5000,9 +5000,9 @@ + <layout> + <configItem> + <name>ua</name> +- <!-- Keyboard indicator for Ukranian layouts --> +- <_shortDescription>uk</_shortDescription> +- <_description>Ukrainian</_description> ++ ++ <shortDescription>uk</shortDescription> ++ <description>Ukrainian</description> + <languageList> + <iso639Id>ukr</iso639Id> + </languageList> +@@ -5011,43 +5011,43 @@ + <variant> + <configItem> + <name>phonetic</name> +- <_description>Ukrainian (phonetic)</_description> ++ <description>Ukrainian (phonetic)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>typewriter</name> +- <_description>Ukrainian (typewriter)</_description> ++ <description>Ukrainian (typewriter)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>winkeys</name> +- <_description>Ukrainian (WinKeys)</_description> ++ <description>Ukrainian (WinKeys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>legacy</name> +- <_description>Ukrainian (legacy)</_description> ++ <description>Ukrainian (legacy)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>rstu</name> +- <_description>Ukrainian (standard RSTU)</_description> ++ <description>Ukrainian (standard RSTU)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>rstu_ru</name> +- <_description>Russian (Ukraine, standard RSTU)</_description> ++ <description>Russian (Ukraine, standard RSTU)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>homophonic</name> +- <_description>Ukrainian (homophonic)</_description> ++ <description>Ukrainian (homophonic)</description> + </configItem> + </variant> + </variantList> +@@ -5055,9 +5055,9 @@ + <layout> + <configItem> + <name>gb</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (UK)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (UK)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -5066,43 +5066,43 @@ + <variant> + <configItem> + <name>extd</name> +- <_description>English (UK, extended WinKeys)</_description> ++ <description>English (UK, extended WinKeys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>intl</name> +- <_description>English (UK, international with dead keys)</_description> ++ <description>English (UK, international with dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak</name> +- <_description>English (UK, Dvorak)</_description> ++ <description>English (UK, Dvorak)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorakukp</name> +- <_description>English (UK, Dvorak with UK punctuation)</_description> ++ <description>English (UK, Dvorak with UK punctuation)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac</name> +- <_description>English (UK, Macintosh)</_description> ++ <description>English (UK, Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>mac_intl</name> +- <_description>English (UK, Macintosh international)</_description> ++ <description>English (UK, Macintosh international)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>colemak</name> +- <_description>English (UK, Colemak)</_description> ++ <description>English (UK, Colemak)</description> + </configItem> + </variant> + </variantList> +@@ -5110,9 +5110,9 @@ + <layout> + <configItem> + <name>uz</name> +- <!-- Keyboard indicator for Uzbek layouts --> +- <_shortDescription>uz</_shortDescription> +- <_description>Uzbek</_description> ++ ++ <shortDescription>uz</shortDescription> ++ <description>Uzbek</description> + <languageList> + <iso639Id>uzb</iso639Id> + </languageList> +@@ -5121,7 +5121,7 @@ + <variant> + <configItem> + <name>latin</name> +- <_description>Uzbek (Latin)</_description> ++ <description>Uzbek (Latin)</description> + </configItem> + </variant> + </variantList> +@@ -5129,9 +5129,9 @@ + <layout> + <configItem> + <name>vn</name> +- <!-- Keyboard indicator for Vietnamese layouts --> +- <_shortDescription>vi</_shortDescription> +- <_description>Vietnamese</_description> ++ ++ <shortDescription>vi</shortDescription> ++ <description>Vietnamese</description> + <languageList> + <iso639Id>vie</iso639Id> + </languageList> +@@ -5141,9 +5141,9 @@ + <layout> + <configItem> + <name>kr</name> +- <!-- Keyboard indicator for Korean layouts --> +- <_shortDescription>ko</_shortDescription> +- <_description>Korean</_description> ++ ++ <shortDescription>ko</shortDescription> ++ <description>Korean</description> + <languageList> + <iso639Id>kor</iso639Id> + </languageList> +@@ -5152,7 +5152,7 @@ + <variant> + <configItem> + <name>kr104</name> +- <_description>Korean (101/104 key compatible)</_description> ++ <description>Korean (101/104 key compatible)</description> + </configItem> + </variant> + </variantList> +@@ -5160,9 +5160,9 @@ + <layout> + <configItem> + <name>nec_vndr/jp</name> +- <!-- Keyboard indicator for Japanese layouts --> +- <_shortDescription>ja</_shortDescription> +- <_description>Japanese (PC-98xx Series)</_description> ++ ++ <shortDescription>ja</shortDescription> ++ <description>Japanese (PC-98xx Series)</description> + <countryList> + <iso3166Id>JP</iso3166Id> + </countryList> +@@ -5175,9 +5175,9 @@ + <layout> + <configItem> + <name>ie</name> +- <!-- Keyboard indicator for Irish layouts --> +- <_shortDescription>ie</_shortDescription> +- <_description>Irish</_description> ++ ++ <shortDescription>ie</shortDescription> ++ <description>Irish</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -5186,7 +5186,7 @@ + <variant> + <configItem> + <name>CloGaelach</name> +- <_description>CloGaelach</_description> ++ <description>CloGaelach</description> + <languageList> + <iso639Id>gle</iso639Id> + </languageList> +@@ -5195,13 +5195,13 @@ + <variant> + <configItem> + <name>UnicodeExpert</name> +- <_description>Irish (UnicodeExpert)</_description> ++ <description>Irish (UnicodeExpert)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ogam</name> +- <_description>Ogham</_description> ++ <description>Ogham</description> + <languageList> + <iso639Id>sga</iso639Id> + </languageList> +@@ -5210,7 +5210,7 @@ + <variant> + <configItem> + <name>ogam_is434</name> +- <_description>Ogham (IS434)</_description> ++ <description>Ogham (IS434)</description> + <languageList> + <iso639Id>sga</iso639Id> + </languageList> +@@ -5221,9 +5221,9 @@ + <layout> + <configItem> + <name>pk</name> +- <!-- Keyboard indicator for Urdu layouts --> +- <_shortDescription>ur</_shortDescription> +- <_description>Urdu (Pakistan)</_description> ++ ++ <shortDescription>ur</shortDescription> ++ <description>Urdu (Pakistan)</description> + <languageList> + <iso639Id>urd</iso639Id> + </languageList> +@@ -5232,20 +5232,20 @@ + <variant> + <configItem> + <name>urd-crulp</name> +- <_description>Urdu (Pakistan, CRULP)</_description> ++ <description>Urdu (Pakistan, CRULP)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-nla</name> +- <_description>Urdu (Pakistan, NLA)</_description> ++ <description>Urdu (Pakistan, NLA)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>ara</name> +- <_shortDescription>ar</_shortDescription> +- <_description>Arabic (Pakistan)</_description> ++ <shortDescription>ar</shortDescription> ++ <description>Arabic (Pakistan)</description> + <languageList> + <iso639Id>ara</iso639Id> + </languageList> +@@ -5254,9 +5254,9 @@ + <variant> + <configItem> + <name>snd</name> +- <!-- Keyboard indicator for Sindhi layouts --> +- <_shortDescription>sd</_shortDescription> +- <_description>Sindhi</_description> ++ ++ <shortDescription>sd</shortDescription> ++ <description>Sindhi</description> + <languageList> + <iso639Id>snd</iso639Id> + </languageList> +@@ -5267,9 +5267,9 @@ + <layout> + <configItem> + <name>mv</name> +- <!-- Keyboard indicator for Dhivehi layouts --> +- <_shortDescription>dv</_shortDescription> +- <_description>Dhivehi</_description> ++ ++ <shortDescription>dv</shortDescription> ++ <description>Dhivehi</description> + <languageList> + <iso639Id>div</iso639Id> + </languageList> +@@ -5279,9 +5279,9 @@ + <layout> + <configItem> + <name>za</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (South Africa)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (South Africa)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -5290,9 +5290,9 @@ + <layout> + <configItem> + <name>epo</name> +- <!-- Keyboard indicator for Esperanto layouts --> +- <_shortDescription>eo</_shortDescription> +- <_description>Esperanto</_description> ++ ++ <shortDescription>eo</shortDescription> ++ <description>Esperanto</description> + <languageList> + <iso639Id>epo</iso639Id> + </languageList> +@@ -5301,7 +5301,7 @@ + <variant> + <configItem> + <name>legacy</name> +- <_description>Esperanto (displaced semicolon and quote, obsolete)</_description> ++ <description>Esperanto (displaced semicolon and quote, obsolete)</description> + </configItem> + </variant> + </variantList> +@@ -5309,9 +5309,9 @@ + <layout> + <configItem> + <name>np</name> +- <!-- Keyboard indicator for Nepali layouts --> +- <_shortDescription>ne</_shortDescription> +- <_description>Nepali</_description> ++ ++ <shortDescription>ne</shortDescription> ++ <description>Nepali</description> + <languageList> + <iso639Id>nep</iso639Id> + </languageList> +@@ -5320,9 +5320,9 @@ + <layout> + <configItem> + <name>ng</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (Nigeria)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (Nigeria)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -5331,9 +5331,9 @@ + <variant> + <configItem> + <name>igbo</name> +- <!-- Keyboard indicator for Igbo layouts --> +- <_shortDescription>ig</_shortDescription> +- <_description>Igbo</_description> ++ ++ <shortDescription>ig</shortDescription> ++ <description>Igbo</description> + <languageList> + <iso639Id>ibo</iso639Id> + </languageList> +@@ -5342,9 +5342,9 @@ + <variant> + <configItem> + <name>yoruba</name> +- <!-- Keyboard indicator for Yoruba layouts --> +- <_shortDescription>yo</_shortDescription> +- <_description>Yoruba</_description> ++ ++ <shortDescription>yo</shortDescription> ++ <description>Yoruba</description> + <languageList> + <iso639Id>yor</iso639Id> + </languageList> +@@ -5353,9 +5353,9 @@ + <variant> + <configItem> + <name>hausa</name> +- <!-- Keyboard indicator for Hausa layouts --> +- <_shortDescription>ha</_shortDescription> +- <_description>Hausa</_description> ++ ++ <shortDescription>ha</shortDescription> ++ <description>Hausa</description> + <languageList> + <iso639Id>hau</iso639Id> + </languageList> +@@ -5366,9 +5366,9 @@ + <layout> + <configItem> + <name>et</name> +- <!-- Keyboard indicator for Amharic layouts --> +- <_shortDescription>am</_shortDescription> +- <_description>Amharic</_description> ++ ++ <shortDescription>am</shortDescription> ++ <description>Amharic</description> + <languageList> + <iso639Id>amh</iso639Id> + </languageList> +@@ -5378,9 +5378,9 @@ + <layout> + <configItem> + <name>sn</name> +- <!-- Keyboard indicator for Wolof layouts --> +- <_shortDescription>wo</_shortDescription> +- <_description>Wolof</_description> ++ ++ <shortDescription>wo</shortDescription> ++ <description>Wolof</description> + <languageList> + <iso639Id>wol</iso639Id> + </languageList> +@@ -5390,21 +5390,21 @@ + <layout> + <configItem> + <name>brai</name> +- <!-- Keyboard indicator for Braille layouts --> +- <_shortDescription>brl</_shortDescription> +- <_description>Braille</_description> ++ ++ <shortDescription>brl</shortDescription> ++ <description>Braille</description> + </configItem> + <variantList> + <variant> + <configItem> + <name>left_hand</name> +- <_description>Braille (left hand)</_description> ++ <description>Braille (left hand)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>right_hand</name> +- <_description>Braille (right hand)</_description> ++ <description>Braille (right hand)</description> + </configItem> + </variant> + </variantList> +@@ -5412,9 +5412,9 @@ + <layout> + <configItem> + <name>tm</name> +- <!-- Keyboard indicator for Turkmen layouts --> +- <_shortDescription>tk</_shortDescription> +- <_description>Turkmen</_description> ++ ++ <shortDescription>tk</shortDescription> ++ <description>Turkmen</description> + <languageList> + <iso639Id>tuk</iso639Id> + </languageList> +@@ -5423,7 +5423,7 @@ + <variant> + <configItem> + <name>alt</name> +- <_description>Turkmen (Alt-Q)</_description> ++ <description>Turkmen (Alt-Q)</description> + </configItem> + </variant> + </variantList> +@@ -5431,9 +5431,9 @@ + <layout> + <configItem> + <name>ml</name> +- <!-- Keyboard indicator for Bambara layouts --> +- <_shortDescription>bm</_shortDescription> +- <_description>Bambara</_description> ++ ++ <shortDescription>bm</shortDescription> ++ <description>Bambara</description> + <languageList> + <iso639Id>bam</iso639Id> + </languageList> +@@ -5442,9 +5442,9 @@ + <variant> + <configItem> + <name>fr-oss</name> +- <!-- Keyboard indicator for French layouts --> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Mali, alternative)</_description> ++ ++ <shortDescription>fr</shortDescription> ++ <description>French (Mali, alternative)</description> + <languageList> + <iso639Id>fra</iso639Id> + </languageList> +@@ -5453,9 +5453,9 @@ + <variant> + <configItem> + <name>us-mac</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (Mali, US Macintosh)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (Mali, US Macintosh)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -5464,9 +5464,9 @@ + <variant> + <configItem> + <name>us-intl</name> +- <!-- Keyboard indicator for English layouts --> +- <_shortDescription>en</_shortDescription> +- <_description>English (Mali, US international)</_description> ++ ++ <shortDescription>en</shortDescription> ++ <description>English (Mali, US international)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -5477,9 +5477,9 @@ + <layout> + <configItem> + <name>tz</name> +- <!-- Keyboard indicator for Swahili layouts --> +- <_shortDescription>sw</_shortDescription> +- <_description>Swahili (Tanzania)</_description> ++ ++ <shortDescription>sw</shortDescription> ++ <description>Swahili (Tanzania)</description> + <languageList> + <iso639Id>swa</iso639Id> + </languageList> +@@ -5488,9 +5488,9 @@ + <layout> + <configItem> + <name>ke</name> +- <!-- Keyboard indicator for Swahili layouts --> +- <_shortDescription>sw</_shortDescription> +- <_description>Swahili (Kenya)</_description> ++ ++ <shortDescription>sw</shortDescription> ++ <description>Swahili (Kenya)</description> + <languageList> + <iso639Id>swa</iso639Id> + </languageList> +@@ -5499,9 +5499,9 @@ + <variant> + <configItem> + <name>kik</name> +- <!-- Keyboard indicator for Kikuyu layouts --> +- <_shortDescription>ki</_shortDescription> +- <_description>Kikuyu</_description> ++ ++ <shortDescription>ki</shortDescription> ++ <description>Kikuyu</description> + <languageList> + <iso639Id>kik</iso639Id> + </languageList> +@@ -5512,9 +5512,9 @@ + <layout> + <configItem> + <name>bw</name> +- <!-- Keyboard indicator for Tswana layouts --> +- <_shortDescription>tn</_shortDescription> +- <_description>Tswana</_description> ++ ++ <shortDescription>tn</shortDescription> ++ <description>Tswana</description> + <languageList> + <iso639Id>tsn</iso639Id> + </languageList> +@@ -5523,9 +5523,9 @@ + <layout> + <configItem> + <name>ph</name> +- <!-- Keyboard indicator for Filipino layouts --> +- <_shortDescription>ph</_shortDescription> +- <_description>Filipino</_description> ++ ++ <shortDescription>ph</shortDescription> ++ <description>Filipino</description> + <languageList><iso639Id>eng</iso639Id> + <iso639Id>bik</iso639Id> + <iso639Id>ceb</iso639Id> +@@ -5542,7 +5542,7 @@ + <variant> + <configItem> + <name>qwerty-bay</name> +- <_description>Filipino (QWERTY Baybayin)</_description> ++ <description>Filipino (QWERTY Baybayin)</description> + <languageList><iso639Id>bik</iso639Id> + <iso639Id>ceb</iso639Id> + <iso639Id>fil</iso639Id> +@@ -5558,13 +5558,13 @@ + <variant> + <configItem> + <name>capewell-dvorak</name> +- <_description>Filipino (Capewell-Dvorak Latin)</_description> ++ <description>Filipino (Capewell-Dvorak Latin)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>capewell-dvorak-bay</name> +- <_description>Filipino (Capewell-Dvorak Baybayin)</_description> ++ <description>Filipino (Capewell-Dvorak Baybayin)</description> + <languageList><iso639Id>bik</iso639Id> + <iso639Id>ceb</iso639Id> + <iso639Id>fil</iso639Id> +@@ -5580,13 +5580,13 @@ + <variant> + <configItem> + <name>capewell-qwerf2k6</name> +- <_description>Filipino (Capewell-QWERF 2006 Latin)</_description> ++ <description>Filipino (Capewell-QWERF 2006 Latin)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>capewell-qwerf2k6-bay</name> +- <_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description> ++ <description>Filipino (Capewell-QWERF 2006 Baybayin)</description> + <languageList><iso639Id>bik</iso639Id> + <iso639Id>ceb</iso639Id> + <iso639Id>fil</iso639Id> +@@ -5602,13 +5602,13 @@ + <variant> + <configItem> + <name>colemak</name> +- <_description>Filipino (Colemak Latin)</_description> ++ <description>Filipino (Colemak Latin)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>colemak-bay</name> +- <_description>Filipino (Colemak Baybayin)</_description> ++ <description>Filipino (Colemak Baybayin)</description> + <languageList><iso639Id>bik</iso639Id> + <iso639Id>ceb</iso639Id> + <iso639Id>fil</iso639Id> +@@ -5624,13 +5624,13 @@ + <variant> + <configItem> + <name>dvorak</name> +- <_description>Filipino (Dvorak Latin)</_description> ++ <description>Filipino (Dvorak Latin)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak-bay</name> +- <_description>Filipino (Dvorak Baybayin)</_description> ++ <description>Filipino (Dvorak Baybayin)</description> + <languageList><iso639Id>bik</iso639Id> + <iso639Id>ceb</iso639Id> + <iso639Id>fil</iso639Id> +@@ -5648,16 +5648,16 @@ + <layout> + <configItem> + <name>md</name> +- <_shortDescription>md</_shortDescription> +- <_description>Moldavian</_description> ++ <shortDescription>md</shortDescription> ++ <description>Moldavian</description> + <languageList><iso639Id>rum</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>gag</name> +- <_shortDescription>gag</_shortDescription> +- <_description>Moldavian (Gagauz)</_description> ++ <shortDescription>gag</shortDescription> ++ <description>Moldavian (Gagauz)</description> + <languageList><iso639Id>gag</iso639Id></languageList> + </configItem> + </variant> +@@ -5666,1183 +5666,1142 @@ + </layoutList> + <optionList> + <group allowMultipleSelection="true"> +- <!-- The key combination used to switch between groups --> ++ + <configItem> + <name>grp</name> +- <_description>Switching to another layout</_description> ++ <description>Switching to another layout</description> + </configItem> + <option> + <configItem> + <name>grp:switch</name> +- <_description>Right Alt (while pressed)</_description> ++ <description>Right Alt (while pressed)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lswitch</name> +- <_description>Left Alt (while pressed)</_description> ++ <description>Left Alt (while pressed)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lwin_switch</name> +- <_description>Left Win (while pressed)</_description> ++ <description>Left Win (while pressed)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:rwin_switch</name> +- <_description>Right Win (while pressed)</_description> ++ <description>Right Win (while pressed)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:win_switch</name> +- <_description>Any Win key (while pressed)</_description> ++ <description>Any Win key (while pressed)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:caps_switch</name> +- <_description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</_description> ++ <description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:rctrl_switch</name> +- <_description>Right Ctrl (while pressed)</_description> ++ <description>Right Ctrl (while pressed)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:toggle</name> +- <_description>Right Alt</_description> ++ <description>Right Alt</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lalt_toggle</name> +- <_description>Left Alt</_description> ++ <description>Left Alt</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:caps_toggle</name> +- <_description>Caps Lock</_description> ++ <description>Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:shift_caps_toggle</name> +- <_description>Shift+Caps Lock</_description> ++ <description>Shift+Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:shift_caps_switch</name> +- <_description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</_description> ++ <description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:win_menu_switch</name> +- <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description> ++ <description>Left Win (to first layout), Right Win/Menu (to last layout)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lctrl_rctrl_switch</name> +- <_description>Left Ctrl (to first layout), Right Ctrl (to last layout)</_description> ++ <description>Left Ctrl (to first layout), Right Ctrl (to last layout)</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:alt_caps_toggle</name> +- <_description>Alt+Caps Lock</_description> ++ <description>Alt+Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:shifts_toggle</name> +- <_description>Both Shift keys together</_description> ++ <description>Both Shift keys together</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:alts_toggle</name> +- <_description>Both Alt keys together</_description> ++ <description>Both Alt keys together</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:ctrls_toggle</name> +- <_description>Both Ctrl keys together</_description> ++ <description>Both Ctrl keys together</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:ctrl_shift_toggle</name> +- <_description>Ctrl+Shift</_description> ++ <description>Ctrl+Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lctrl_lshift_toggle</name> +- <_description>Left Ctrl+Left Shift</_description> ++ <description>Left Ctrl+Left Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:rctrl_rshift_toggle</name> +- <_description>Right Ctrl+Right Shift</_description> ++ <description>Right Ctrl+Right Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:ctrl_alt_toggle</name> +- <_description>Alt+Ctrl</_description> ++ <description>Alt+Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:alt_shift_toggle</name> +- <_description>Alt+Shift</_description> ++ <description>Alt+Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lalt_lshift_toggle</name> +- <_description>Left Alt+Left Shift</_description> ++ <description>Left Alt+Left Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:alt_space_toggle</name> +- <_description>Alt+Space</_description> ++ <description>Alt+Space</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:menu_toggle</name> +- <_description>Menu</_description> ++ <description>Menu</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lwin_toggle</name> +- <_description>Left Win</_description> ++ <description>Left Win</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:rwin_toggle</name> +- <_description>Right Win</_description> ++ <description>Right Win</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lshift_toggle</name> +- <_description>Left Shift</_description> ++ <description>Left Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:rshift_toggle</name> +- <_description>Right Shift</_description> ++ <description>Right Shift</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lctrl_toggle</name> +- <_description>Left Ctrl</_description> ++ <description>Left Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:rctrl_toggle</name> +- <_description>Right Ctrl</_description> ++ <description>Right Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:sclk_toggle</name> +- <_description>Scroll Lock</_description> ++ <description>Scroll Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>grp:lctrl_lwin_rctrl_menu</name> +- <_description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</_description> ++ <description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> +- <!-- The key combination used to choose the 3rd (and 4th, together with Shift) +- level of symbols --> ++ + <configItem> + <name>lv3</name> +- <_description>Key to choose 3rd level</_description> ++ <description>Key to choose 3rd level</description> + </configItem> + <option> + <configItem> + <name>lv3:switch</name> +- <_description>Right Ctrl</_description> ++ <description>Right Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:menu_switch</name> +- <_description>Menu</_description> ++ <description>Menu</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:win_switch</name> +- <_description>Any Win key</_description> ++ <description>Any Win key</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:lwin_switch</name> +- <_description>Left Win</_description> ++ <description>Left Win</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:rwin_switch</name> +- <_description>Right Win</_description> ++ <description>Right Win</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:alt_switch</name> +- <_description>Any Alt key</_description> ++ <description>Any Alt key</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:lalt_switch</name> +- <_description>Left Alt</_description> ++ <description>Left Alt</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:ralt_switch</name> +- <_description>Right Alt</_description> ++ <description>Right Alt</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:ralt_switch_multikey</name> +- <_description>Right Alt, Shift+Right Alt key is Compose</_description> ++ <description>Right Alt, Shift+Right Alt key is Compose</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:ralt_alt</name> +- <_description>Right Alt key never chooses 3rd level</_description> ++ <description>Right Alt key never chooses 3rd level</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:enter_switch</name> +- <_description>Enter on keypad</_description> ++ <description>Enter on keypad</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:caps_switch</name> +- <_description>Caps Lock</_description> ++ <description>Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:bksl_switch</name> +- <_description>Backslash</_description> ++ <description>Backslash</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:lsgt_switch</name> +- <_description><Less/Greater></_description> ++ <description><Less/Greater></description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:caps_switch_latch</name> +- <_description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> ++ <description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:bksl_switch_latch</name> +- <_description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> ++ <description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:lsgt_switch_latch</name> +- <_description><Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> ++ <description><Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> +- <!-- Tweaking the position of the "Ctrl" key --> ++ + <configItem> + <name>ctrl</name> +- <_description>Ctrl key position</_description> ++ <description>Ctrl key position</description> + </configItem> + <option> + <configItem> + <name>ctrl:nocaps</name> +- <_description>Caps Lock as Ctrl</_description> ++ <description>Caps Lock as Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:lctrl_meta</name> +- <_description>Left Ctrl as Meta</_description> ++ <description>Left Ctrl as Meta</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:swapcaps</name> +- <_description>Swap Ctrl and Caps Lock</_description> ++ <description>Swap Ctrl and Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:ac_ctrl</name> +- <_description>At left of 'A'</_description> ++ <description>At left of 'A'</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:aa_ctrl</name> +- <_description>At bottom left</_description> ++ <description>At bottom left</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:rctrl_ralt</name> +- <_description>Right Ctrl as Right Alt</_description> ++ <description>Right Ctrl as Right Alt</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:menu_rctrl</name> +- <_description>Menu as Right Ctrl</_description> ++ <description>Menu as Right Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:ctrl_ralt</name> +- <_description>Right Alt as Right Ctrl</_description> ++ <description>Right Alt as Right Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:swap_lalt_lctl</name> +- <_description>Swap Left Alt key with Left Ctrl key</_description> ++ <description>Swap Left Alt key with Left Ctrl key</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:swap_lwin_lctl</name> +- <_description>Swap Left Win key with Left Ctrl key</_description> ++ <description>Swap Left Win key with Left Ctrl key</description> + </configItem> + </option> + <option> + <configItem> + <name>ctrl:swap_lalt_lctl_lwin</name> +- <_description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</_description> ++ <description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> +- <!-- Using startard LEDs to indicate the alternative (not first) group(s) --> ++ + <configItem> + <name>grp_led</name> +- <_description>Use keyboard LED to show alternative layout</_description> ++ <description>Use keyboard LED to show alternative layout</description> + </configItem> + <option> + <configItem> + <name>grp_led:num</name> +- <_description>Num Lock</_description> ++ <description>Num Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>grp_led:caps</name> +- <_description>Caps Lock</_description> ++ <description>Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>grp_led:scroll</name> +- <_description>Scroll Lock</_description> ++ <description>Scroll Lock</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="false"> +- <!-- Select a keypad type --> ++ + <configItem> + <name>keypad</name> +- <_description>Layout of numeric keypad</_description> ++ <description>Layout of numeric keypad</description> + </configItem> + <option> + <configItem> + <name>keypad:legacy</name> +- <_description>Legacy</_description> ++ <description>Legacy</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:oss</name> +- <_description>Unicode additions (arrows and math operators)</_description> ++ <description>Unicode additions (arrows and math operators)</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:future</name> +- <_description>Unicode additions (arrows and math operators; math operators on default level)</_description> ++ <description>Unicode additions (arrows and math operators; math operators on default level)</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:legacy_wang</name> +- <_description>Legacy Wang 724</_description> ++ <description>Legacy Wang 724</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:oss_wang</name> +- <_description>Wang 724 keypad with Unicode additions (arrows and math operators)</_description> ++ <description>Wang 724 keypad with Unicode additions (arrows and math operators)</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:future_wang</name> +- <_description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</_description> ++ <description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:hex</name> +- <_description>Hexadecimal</_description> ++ <description>Hexadecimal</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:atm</name> +- <_description>ATM/phone-style</_description> ++ <description>ATM/phone-style</description> + </configItem> + </option> + </group> +- <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place --> ++ + <group allowMultipleSelection="false"> +- <!-- Select a keypad KPDL variant --> ++ + <configItem> + <name>kpdl</name> +- <_description>Numeric keypad delete key behaviour</_description> ++ <description>Numeric keypad delete key behaviour</description> + </configItem> + <option> + <configItem> +- <!-- Actually, with KP_DECIMAL, as the old keypad(dot) --> ++ + <name>kpdl:dot</name> +- <_description>Legacy key with dot</_description> ++ <description>Legacy key with dot</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:comma</name> +- <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) --> +- <_description>Legacy key with comma</_description> ++ ++ <description>Legacy key with comma</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:dotoss</name> +- <_description>Four-level key with dot</_description> ++ <description>Four-level key with dot</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:dotoss_latin9</name> +- <_description>Four-level key with dot, Latin-9 only</_description> ++ <description>Four-level key with dot, Latin-9 only</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:commaoss</name> +- <_description>Four-level key with comma</_description> ++ <description>Four-level key with comma</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:momayyezoss</name> +- <_description>Four-level key with momayyez</_description> ++ <description>Four-level key with momayyez</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:kposs</name> +- <!-- This assumes the KP_ abstract symbols are actually useful for some apps +- The description needs to be rewritten --> +- <_description>Four-level key with abstract separators</_description> ++ ++ <description>Four-level key with abstract separators</description> + </configItem> + </option> + <option> + <configItem> + <name>kpdl:semi</name> +- <_description>Semicolon on third level</_description> ++ <description>Semicolon on third level</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="false"> +- <!-- Caps Lock tweaks. +- "Internal" capitalization means capitalization using some internal tables. +- Otherwise "as Shift" - means using next group. --> ++ + <configItem> + <name>caps</name> +- <_description>Caps Lock key behavior</_description> ++ <description>Caps Lock key behavior</description> + </configItem> + <option> + <configItem> + <name>caps:internal</name> +- <_description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</_description> ++ <description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:internal_nocancel</name> +- <_description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</_description> ++ <description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:shift</name> +- <_description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</_description> ++ <description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:shift_nocancel</name> +- <_description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</_description> ++ <description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:capslock</name> +- <_description>Caps Lock toggles normal capitalization of alphabetic characters</_description> ++ <description>Caps Lock toggles normal capitalization of alphabetic characters</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:numlock</name> +- <_description>Make Caps Lock an additional Num Lock</_description> ++ <description>Make Caps Lock an additional Num Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:swapescape</name> +- <_description>Swap ESC and Caps Lock</_description> ++ <description>Swap ESC and Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:escape</name> +- <_description>Make Caps Lock an additional ESC</_description> ++ <description>Make Caps Lock an additional ESC</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:backspace</name> +- <_description>Make Caps Lock an additional Backspace</_description> ++ <description>Make Caps Lock an additional Backspace</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:super</name> +- <_description>Make Caps Lock an additional Super</_description> ++ <description>Make Caps Lock an additional Super</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:hyper</name> +- <_description>Make Caps Lock an additional Hyper</_description> ++ <description>Make Caps Lock an additional Hyper</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:shiftlock</name> +- <_description>Caps Lock toggles ShiftLock (affects all keys)</_description> ++ <description>Caps Lock toggles ShiftLock (affects all keys)</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:none</name> +- <_description>Caps Lock is disabled</_description> ++ <description>Caps Lock is disabled</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:ctrl_modifier</name> +- <_description>Make Caps Lock an additional Ctrl</_description> ++ <description>Make Caps Lock an additional Ctrl</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="false"> +- <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) --> ++ + <configItem> + <name>altwin</name> +- <_description>Alt/Win key behavior</_description> ++ <description>Alt/Win key behavior</description> + </configItem> + <option> + <configItem> + <name>altwin:menu</name> +- <_description>Add the standard behavior to Menu key</_description> ++ <description>Add the standard behavior to Menu key</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:meta_alt</name> +- <_description>Alt and Meta are on Alt keys</_description> ++ <description>Alt and Meta are on Alt keys</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:alt_win</name> +- <_description>Alt is mapped to Win keys (and the usual Alt keys)</_description> ++ <description>Alt is mapped to Win keys (and the usual Alt keys)</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:ctrl_win</name> +- <_description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</_description> ++ <description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:ctrl_alt_win</name> +- <_description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</_description> ++ <description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:meta_win</name> +- <_description>Meta is mapped to Win keys</_description> ++ <description>Meta is mapped to Win keys</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:left_meta_win</name> +- <_description>Meta is mapped to Left Win</_description> ++ <description>Meta is mapped to Left Win</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:hyper_win</name> +- <_description>Hyper is mapped to Win-keys</_description> ++ <description>Hyper is mapped to Win-keys</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:alt_super_win</name> +- <_description>Alt is mapped to Right Win, Super to Menu</_description> ++ <description>Alt is mapped to Right Win, Super to Menu</description> + </configItem> + </option> + <option> + <configItem> + <name>altwin:swap_alt_win</name> +- <_description>Alt is swapped with Win</_description> ++ <description>Alt is swapped with Win</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> +- <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys --> ++ + <configItem> + <name>Compose key</name> +- <_description>Position of Compose key</_description> ++ <description>Position of Compose key</description> + </configItem> + <option> + <configItem> + <name>compose:ralt</name> +- <_description>Right Alt</_description> ++ <description>Right Alt</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:lwin</name> +- <_description>Left Win</_description> ++ <description>Left Win</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:lwin-altgr</name> +- <_description>3rd level of Left Win</_description> ++ <description>3rd level of Left Win</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:rwin</name> +- <_description>Right Win</_description> ++ <description>Right Win</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:rwin-altgr</name> +- <_description>3rd level of Right Win</_description> ++ <description>3rd level of Right Win</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:menu</name> +- <_description>Menu</_description> ++ <description>Menu</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:menu-altgr</name> +- <_description>3rd level of Menu</_description> ++ <description>3rd level of Menu</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:lctrl</name> +- <_description>Left Ctrl</_description> ++ <description>Left Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:lctrl-altgr</name> +- <_description>3rd level of Left Ctrl</_description> ++ <description>3rd level of Left Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:rctrl</name> +- <_description>Right Ctrl</_description> ++ <description>Right Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:rctrl-altgr</name> +- <_description>3rd level of Right Ctrl</_description> ++ <description>3rd level of Right Ctrl</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:caps</name> +- <_description>Caps Lock</_description> ++ <description>Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:caps-altgr</name> +- <_description>3rd level of Caps Lock</_description> ++ <description>3rd level of Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:102</name> +- <_description><Less/Greater></_description> ++ <description><Less/Greater></description> + </configItem> + </option> + <option> + <configItem> + <name>compose:102-altgr</name> +- <_description>3rd level of <Less/Greater></_description> ++ <description>3rd level of <Less/Greater></description> + </configItem> + </option> + <option> + <configItem> + <name>compose:paus</name> +- <_description>Pause</_description> ++ <description>Pause</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:prsc</name> +- <_description>PrtSc</_description> ++ <description>PrtSc</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:sclk</name> +- <_description>Scroll Lock</_description> ++ <description>Scroll Lock</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>compat</name> +- <_description>Miscellaneous compatibility options</_description> ++ <description>Miscellaneous compatibility options</description> + </configItem> + <option> + <configItem> + <name>numpad:pc</name> +- <_description>Default numeric keypad keys</_description> ++ <description>Default numeric keypad keys</description> + </configItem> + </option> + <option> + <configItem> + <name>numpad:mac</name> +- <_description>Numeric keypad keys always enter digits (as in Mac OS)</_description> ++ <description>Numeric keypad keys always enter digits (as in Mac OS)</description> + </configItem> + </option> + <option> + <configItem> + <name>numpad:microsoft</name> +- <_description>Shift with numeric keypad keys works as in MS Windows</_description> ++ <description>Shift with numeric keypad keys works as in MS Windows</description> + </configItem> + </option> + <option> + <configItem> + <name>numpad:shift3</name> +- <_description>Shift does not cancel Num Lock, chooses 3rd level instead</_description> ++ <description>Shift does not cancel Num Lock, chooses 3rd level instead</description> + </configItem> + </option> + <option> + <configItem> + <name>srvrkeys:none</name> +- <_description>Special keys (Ctrl+Alt+<key>) handled in a server</_description> ++ <description>Special keys (Ctrl+Alt+<key>) handled in a server</description> + </configItem> + </option> + <option> + <configItem> + <name>apple:alupckeys</name> +- <_description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</_description> ++ <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</description> + </configItem> + </option> + <option> + <configItem> + <name>shift:breaks_caps</name> +- <_description>Shift cancels Caps Lock</_description> ++ <description>Shift cancels Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>misc:typo</name> +- <_description>Enable extra typographic characters</_description> ++ <description>Enable extra typographic characters</description> + </configItem> + </option> + <option> + <configItem> + <name>shift:both_capslock</name> +- <_description>Both Shift keys together toggle Caps Lock</_description> ++ <description>Both Shift keys together toggle Caps Lock</description> + </configItem> + </option> + <option> + <configItem> + <name>shift:both_capslock_cancel</name> +- <_description>Both Shift keys together activate Caps Lock, one Shift key deactivates</_description> ++ <description>Both Shift keys together activate Caps Lock, one Shift key deactivates</description> + </configItem> + </option> + <option> + <configItem> + <name>shift:both_shiftlock</name> +- <_description>Both Shift keys together toggle ShiftLock</_description> ++ <description>Both Shift keys together toggle ShiftLock</description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:pointerkeys</name> +- <_description>Shift + NumLock toggles PointerKeys</_description> ++ <description>Shift + NumLock toggles PointerKeys</description> + </configItem> + </option> + <option> + <configItem> + <name>grab:break_actions</name> +- <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description> ++ <description>Allow breaking grabs with keyboard actions (warning: security risk)</description> + </configItem> + </option> + <option> + <configItem> + <name>grab:debug_actions</name> +- <_description>Allow grab and window tree logging</_description> ++ <description>Allow grab and window tree logging</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> +- <!-- Special shortcuts for the Euro character --> ++ + <configItem> + <name>currencysign</name> +- <_description>Adding currency signs to certain keys</_description> ++ <description>Adding currency signs to certain keys</description> + </configItem> + <option> + <configItem> + <name>eurosign:e</name> +- <_description>Euro on E</_description> ++ <description>Euro on E</description> + </configItem> + </option> + <option> + <configItem> + <name>eurosign:2</name> +- <_description>Euro on 2</_description> ++ <description>Euro on 2</description> + </configItem> + </option> + <option> + <configItem> + <name>eurosign:4</name> +- <_description>Euro on 4</_description> ++ <description>Euro on 4</description> + </configItem> + </option> + <option> + <configItem> + <name>eurosign:5</name> +- <_description>Euro on 5</_description> ++ <description>Euro on 5</description> + </configItem> + </option> + <option> + <configItem> + <name>rupeesign:4</name> +- <_description>Rupee on 4</_description> ++ <description>Rupee on 4</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>lv5</name> +- <_description>Key to choose 5th level</_description> ++ <description>Key to choose 5th level</description> + </configItem> + <option> + <configItem> + <name>lv5:lsgt_switch_lock</name> +- <_description><Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> ++ <description><Less/Greater> 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> ++ <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> ++ <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><Less/Greater> chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> +- </configItem> +- </option> +- <option> +- <configItem> +- <name>lv5:ralt_switch_lock_cancel</name> +- <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> +- </configItem> +- </option> +- <option> +- <configItem> +- <name>lv5:lwin_switch_lock_cancel</name> +- <_description>Left Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> +- </configItem> +- </option> +- <option> +- <configItem> +- <name>lv5:rwin_switch_lock_cancel</name> +- <_description>Right Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> +- </configItem> +- </option> +- <option> +- <configItem> +- <name>lv5:lsgt_switch_lock_cancel</name> +- <_description><Less/Greater> chooses 5th level, acts as onetime lock lock when pressed together with another 5th-level-chooser</_description> +- </configItem> +- </option> +- <option> +- <configItem> +- <name>lv5:ralt_switch_lock_cancel</name> +- <_description>Right Alt chooses 5th level, acts as onetime lock 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> +---> ++ + </group> + <group allowMultipleSelection="false"> +- <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level --> ++ + <configItem> + <name>nbsp</name> +- <_description>Using space key to input non-breakable space character</_description> ++ <description>Using space key to input non-breakable space character</description> + </configItem> + <option> + <configItem> + <name>nbsp:none</name> +- <_description>Usual space at any level</_description> ++ <description>Usual space at any level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level2</name> +- <_description>Non-breakable space character at second level</_description> ++ <description>Non-breakable space character at second level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level3</name> +- <_description>Non-breakable space character at third level</_description> ++ <description>Non-breakable space character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level3s</name> +- <_description>Non-breakable space character at third level, nothing at fourth level</_description> ++ <description>Non-breakable space character at third level, nothing at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level3n</name> +- <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description> ++ <description>Non-breakable space character at third level, thin non-breakable space character at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level4</name> +- <_description>Non-breakable space character at fourth level</_description> ++ <description>Non-breakable space character at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level4n</name> +- <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> ++ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:level4nl</name> +- <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> ++ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2</name> +- <_description>Zero-width non-joiner character at second level</_description> ++ <description>Zero-width non-joiner character at second level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2zwj3</name> +- <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level</_description> ++ <description>Zero-width non-joiner character at second level, zero-width joiner character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2zwj3nb4</name> +- <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</_description> ++ <description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3</name> +- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level</_description> ++ <description>Zero-width non-joiner character at second level, non-breakable space character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3s</name> +- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</_description> ++ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3zwj4</name> +- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</_description> ++ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3nnb4</name> +- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</_description> ++ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj3zwj4</name> +- <_description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</_description> ++ <description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>japan</name> +- <_description>Japanese keyboard options</_description> ++ <description>Japanese keyboard options</description> + </configItem> + <option> + <configItem> + <name>japan:kana_lock</name> +- <_description>Kana Lock key is locking</_description> ++ <description>Kana Lock key is locking</description> + </configItem> + </option> + <option> + <configItem> + <name>japan:nicola_f_bs</name> +- <_description>NICOLA-F style Backspace</_description> ++ <description>NICOLA-F style Backspace</description> + </configItem> + </option> + <option> + <configItem> + <name>japan:hztg_escape</name> +- <_description>Make Zenkaku Hankaku an additional ESC</_description> ++ <description>Make Zenkaku Hankaku an additional ESC</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="false"> + <configItem> + <name>esperanto</name> +- <_description>Adding Esperanto supersigned letters</_description> ++ <description>Adding Esperanto supersigned letters</description> + </configItem> + <option> + <configItem> + <name>esperanto:qwerty</name> +- <_description>To the corresponding key in a Qwerty layout</_description> ++ <description>To the corresponding key in a Qwerty layout</description> + </configItem> + </option> + <option> + <configItem> + <name>esperanto:dvorak</name> +- <_description>To the corresponding key in a Dvorak layout</_description> ++ <description>To the corresponding key in a Dvorak layout</description> + </configItem> + </option> + <option> + <configItem> + <name>esperanto:colemak</name> +- <_description>To the corresponding key in a Colemak layout</_description> ++ <description>To the corresponding key in a Colemak layout</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>solaris</name> +- <_description>Maintain key compatibility with old Solaris keycodes</_description> ++ <description>Maintain key compatibility with old Solaris keycodes</description> + </configItem> + <option> + <configItem> + <name>solaris:sun_compat</name> +- <_description>Sun Key compatibility</_description> ++ <description>Sun Key compatibility</description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>terminate</name> +- <_description>Key sequence to kill the X server</_description> ++ <description>Key sequence to kill the X server</description> + </configItem> + <option> + <configItem> + <name>terminate:ctrl_alt_bksp</name> +- <_description>Ctrl + Alt + Backspace</_description> ++ <description>Ctrl + Alt + Backspace</description> + </configItem> + </option> + </group> + </optionList> +-</xkbConfigRegistry> ++</xkbConfigRegistry> +\ No newline at end of file |