--- xkeyboard-config-2.11.orig/rules/base.xml.in	2014-01-15 02:02:39.000000000 +0100
+++ xkeyboard-config-2.11/rules/base.xml.in	2014-03-04 14:31:12.000000000 +0100
@@ -5,627 +5,627 @@
     
       
         pc101
-        <_description>Generic 101-key PC
+        Generic 101-key PC
         Generic
       
     
     
       
         pc102
-        <_description>Generic 102-key (Intl) PC
+        Generic 102-key (Intl) PC
         Generic
       
     
     
       
         pc104
-        <_description>Generic 104-key PC
+        Generic 104-key PC
         Generic
       
     
     
       
         pc105
-        <_description>Generic 105-key (Intl) PC
+        Generic 105-key (Intl) PC
         Generic
       
     
     
       
         dell101
-        <_description>Dell 101-key PC
+        Dell 101-key PC
         Dell
       
     
     
       
         latitude
-        <_description>Dell Latitude series laptop
+        Dell Latitude series laptop
         Dell
       
     
     
       
         dellm65
-        <_description>Dell Precision M65
+        Dell Precision M65
         Dell
       
     
     
       
         everex
-        <_description>Everex STEPnote
+        Everex STEPnote
         Everex
       
     
     
       
         flexpro
-        <_description>Keytronic FlexPro
+        Keytronic FlexPro
         Keytronic
       
     
     
       
         microsoft
-        <_description>Microsoft Natural
+        Microsoft Natural
         Microsoft Inc.
       
     
     
       
         omnikey101
-        <_description>Northgate OmniKey 101
+        Northgate OmniKey 101
         Northgate
       
     
     
       
         winbook
-        <_description>Winbook Model XP5
+        Winbook Model XP5
         Generic
       
     
     
       
         pc98
-        <_description>PC-98xx Series
+        PC-98xx Series
         Generic
       
     
     
       
         a4techKB21
-        <_description>A4Tech KB-21
+        A4Tech KB-21
         A4Tech
       
     
     
       
         a4techKBS8
-        <_description>A4Tech KBS-8
+        A4Tech KBS-8
         A4Tech
       
     
     
       
         a4_rfkb23
-        <_description>A4Tech Wireless Desktop RFKB-23
+        A4Tech Wireless Desktop RFKB-23
         A4Tech
       
     
     
       
         airkey
-        <_description>Acer AirKey V
+        Acer AirKey V
         Acer
       
     
     
       
         azonaRF2300
-        <_description>Azona RF2300 wireless Internet Keyboard
+        Azona RF2300 wireless Internet Keyboard
         Azona
       
     
     
       
         scorpius
-        <_description>Advance Scorpius KI
+        Advance Scorpius KI
         Scorpius
       
     
     
       
         brother
-        <_description>Brother Internet Keyboard
+        Brother Internet Keyboard
         Brother
       
     
     
       
         btc5113rf
-        <_description>BTC 5113RF Multimedia
+        BTC 5113RF Multimedia
         BTC
       
     
     
       
         btc5126t
-        <_description>BTC 5126T
+        BTC 5126T
         BTC
       
     
     
       
         btc6301urf
-        <_description>BTC 6301URF
+        BTC 6301URF
         BTC
       
     
     
       
         btc9000
-        <_description>BTC 9000
+        BTC 9000
         BTC
       
     
     
       
         btc9000a
-        <_description>BTC 9000A
+        BTC 9000A
         BTC
       
     
     
       
         btc9001ah
-        <_description>BTC 9001AH
+        BTC 9001AH
         BTC
       
     
     
       
         btc5090
-        <_description>BTC 5090
+        BTC 5090
         BTC
       
     
     
       
         btc9019u
-        <_description>BTC 9019U
+        BTC 9019U
         BTC
       
     
     
       
         btc9116u
-        <_description>BTC 9116U Mini Wireless Internet and Gaming
+        BTC 9116U Mini Wireless Internet and Gaming
       
     
     
       
         cherryblue
-        <_description>Cherry Blue Line CyBo@rd
+        Cherry Blue Line CyBo@rd
       
     
     
       
         cherryblueb
-        <_description>Cherry CyMotion Master XPress
+        Cherry CyMotion Master XPress
         Cherry
       
     
     
       
         cherrybluea
-        <_description>Cherry Blue Line CyBo@rd (alternate option)
+        Cherry Blue Line CyBo@rd (alternate option)
         Cherry
       
     
     
       
         cherrycyboard
-        <_description>Cherry CyBo@rd USB-Hub
+        Cherry CyBo@rd USB-Hub
         Cherry
       
     
     
       
         cherrycmexpert
-        <_description>Cherry CyMotion Expert
+        Cherry CyMotion Expert
         Cherry
       
     
     
       
         cherrybunlim
-        <_description>Cherry B.UNLIMITED
+        Cherry B.UNLIMITED
         Cherry
       
     
     
       
         chicony
-        <_description>Chicony Internet Keyboard
+        Chicony Internet Keyboard
         Chicony
       
     
     
       
         chicony0108
-        <_description>Chicony KU-0108
+        Chicony KU-0108
         Chicony
       
     
     
       
         chicony0420
-        <_description>Chicony KU-0420
+        Chicony KU-0420
         Chicony
       
     
     
       
         chicony9885
-        <_description>Chicony KB-9885
+        Chicony KB-9885
         Chicony
       
     
     
       
         compaqeak8
-        <_description>Compaq Easy Access Keyboard
+        Compaq Easy Access Keyboard
         Compaq
       
     
     
       
         compaqik7
-        <_description>Compaq Internet Keyboard (7 keys)
+        Compaq Internet Keyboard (7 keys)
         Compaq
       
     
     
       
         compaqik13
-        <_description>Compaq Internet Keyboard (13 keys)
+        Compaq Internet Keyboard (13 keys)
         Compaq
       
     
     
       
         compaqik18
-        <_description>Compaq Internet Keyboard (18 keys)
+        Compaq Internet Keyboard (18 keys)
         Compaq
       
     
     
       
         cymotionlinux
-        <_description>Cherry CyMotion Master Linux
+        Cherry CyMotion Master Linux
         Cherry
       
     
     
       
         armada
-        <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
+        Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
         Compaq
       
     
     
       
         presario
-        <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
         Compaq
       
     
     
       
         ipaq
-        <_description>Compaq iPaq Keyboard
+        Compaq iPaq Keyboard
         Compaq
       
     
     
       
         dell
-        <_description>Dell
+        Dell
         Dell
       
     
     
       
         dellsk8125
-        <_description>Dell SK-8125
+        Dell SK-8125
         Dell
       
     
     
       
         dellsk8135
-        <_description>Dell SK-8135
+        Dell SK-8135
         Dell
       
     
     
       
         dellusbmm
-        <_description>Dell USB Multimedia Keyboard
+        Dell USB Multimedia Keyboard
         Dell
       
     
     
       
         inspiron
-        <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx
+        Dell Laptop/notebook Inspiron 6xxx/8xxx
         Dell
       
     
     
       
         precision_m
-        <_description>Dell Laptop/notebook Precision M series
+        Dell Laptop/notebook Precision M series
         Dell
       
     
     
       
         dexxa
-        <_description>Dexxa Wireless Desktop Keyboard
+        Dexxa Wireless Desktop Keyboard
         Dexxa
       
     
     
       
         diamond
-        <_description>Diamond 9801 / 9802 series
+        Diamond 9801 / 9802 series
         Diamond
       
     
     
       
         dtk2000
-        <_description>DTK2000
+        DTK2000
       
     
     
       
         ennyah_dkb1008
-        <_description>Ennyah DKB-1008
+        Ennyah DKB-1008
         Ennyah
       
     
     
       
         fscaa1667g
-        <_description>Fujitsu-Siemens Computers AMILO laptop
+        Fujitsu-Siemens Computers AMILO laptop
         Fujitsu-Siemens
       
     
     
       
         genius
-        <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+        Genius Comfy KB-16M / Genius MM Keyboard KWD-910
         Genius
       
     
     
       
         geniuscomfy
-        <_description>Genius Comfy KB-12e
+        Genius Comfy KB-12e
         Genius
       
     
     
       
         geniuscomfy2
-        <_description>Genius Comfy KB-21e-Scroll
+        Genius Comfy KB-21e-Scroll
         Genius
       
     
     
       
         geniuskb19e
-        <_description>Genius KB-19e NB
+        Genius KB-19e NB
         Genius
       
     
     
       
         geniuskkb2050hs
-        <_description>Genius KKB-2050HS
+        Genius KKB-2050HS
         Genius
       
     
     
       
         gyration
-        <_description>Gyration
+        Gyration
         Gyration
       
     
     
       
         htcdream
-        <_description>HTC Dream
+        HTC Dream
         HTC
       
     
     
       
         kinesis
-        <_description>Kinesis
+        Kinesis
         Kinesis
       
     
     
       
         logitech_base
-        <_description>Logitech Generic Keyboard
+        Logitech Generic Keyboard
         Logitech
       
     
     
       
         logitech_g15
-        <_description>Logitech G15 extra keys via G15daemon
+        Logitech G15 extra keys via G15daemon
         Logitech
       
     
     
       
         hpi6
-        <_description>Hewlett-Packard Internet Keyboard
+        Hewlett-Packard Internet Keyboard
         Hewlett-Packard
       
     
     
       
         hp250x
-        <_description>Hewlett-Packard SK-250x Multimedia Keyboard
+        Hewlett-Packard SK-250x Multimedia Keyboard
         Hewlett-Packard
       
     
     
       
         hpxe3gc
-        <_description>Hewlett-Packard Omnibook XE3 GC
+        Hewlett-Packard Omnibook XE3 GC
         Hewlett-Packard
       
     
     
       
         hpxe3gf
-        <_description>Hewlett-Packard Omnibook XE3 GF
+        Hewlett-Packard Omnibook XE3 GF
         Hewlett-Packard
       
     
     
       
         hpxt1000
-        <_description>Hewlett-Packard Omnibook XT1000
+        Hewlett-Packard Omnibook XT1000
         Hewlett-Packard
       
     
     
       
         hpdv5
-        <_description>Hewlett-Packard Pavilion dv5
+        Hewlett-Packard Pavilion dv5
         Hewlett-Packard
       
     
     
       
         hpzt11xx
-        <_description>Hewlett-Packard Pavilion ZT11xx
+        Hewlett-Packard Pavilion ZT11xx
         Hewlett-Packard
       
     
     
       
         hp500fa
-        <_description>Hewlett-Packard Omnibook 500 FA
+        Hewlett-Packard Omnibook 500 FA
         Hewlett-Packard
       
     
     
       
         hp5xx
-        <_description>Hewlett-Packard Omnibook 5xx
+        Hewlett-Packard Omnibook 5xx
         Hewlett-Packard
       
     
     
       
         hpnx9020
-        <_description>Hewlett-Packard nx9020
+        Hewlett-Packard nx9020
         Hewlett-Packard
       
     
     
       
         hp6000
-        <_description>Hewlett-Packard Omnibook 6000/6100
+        Hewlett-Packard Omnibook 6000/6100
         Hewlett-Packard
       
     
     
       
         honeywell_euroboard
-        <_description>Honeywell Euroboard
+        Honeywell Euroboard
         Hewlett-Packard
       
     
     
       
         hpmini110
-        <_description>Hewlett-Packard Mini 110 Notebook
+        Hewlett-Packard Mini 110 Notebook
         Hewlett-Packard
       
     
     
       
         rapidaccess
-        <_description>IBM Rapid Access
+        IBM Rapid Access
         Lenovo (previously IBM)
       
     
     
       
         rapidaccess2
-        <_description>IBM Rapid Access II
+        IBM Rapid Access II
         Lenovo (previously IBM)
       
     
     
       
         thinkpad
-        <_description>IBM ThinkPad 560Z/600/600E/A22E
+        IBM ThinkPad 560Z/600/600E/A22E
         Lenovo (previously IBM)
       
     
     
       
         thinkpad60
-        <_description>IBM ThinkPad R60/T60/R61/T61
+        IBM ThinkPad R60/T60/R61/T61
         Lenovo (previously IBM)
       
     
     
       
         thinkpadz60
-        <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+        IBM ThinkPad Z60m/Z60t/Z61m/Z61t
         Lenovo (previously IBM)
       
     
     
       
         ibm_spacesaver
-        <_description>IBM Space Saver
+        IBM Space Saver
         Lenovo (previously IBM)
       
     
     
       
         logiaccess
-        <_description>Logitech Access Keyboard
+        Logitech Access Keyboard
         Logitech
       
     
     
       
         logiclx300
-        <_description>Logitech Cordless Desktop LX-300
+        Logitech Cordless Desktop LX-300
         Logitech
       
     
     
       
         logii350
-        <_description>Logitech Internet 350 Keyboard
+        Logitech Internet 350 Keyboard
         Logitech
          046d:c313
       
@@ -633,665 +633,665 @@
     
       
         logimel
-        <_description>Logitech Media Elite Keyboard
+        Logitech Media Elite Keyboard
         Logitech
       
     
     
       
         logicd
-        <_description>Logitech Cordless Desktop
+        Logitech Cordless Desktop
         Logitech
       
     
     
       
         logicd_it
-        <_description>Logitech Cordless Desktop iTouch
+        Logitech Cordless Desktop iTouch
         Logitech
       
     
     
       
         logicd_nav
-        <_description>Logitech Cordless Desktop Navigator
+        Logitech Cordless Desktop Navigator
         Logitech
       
     
     
       
         logicd_opt
-        <_description>Logitech Cordless Desktop Optical
+        Logitech Cordless Desktop Optical
         Logitech
       
     
     
       
         logicda
-        <_description>Logitech Cordless Desktop (alternate option)
+        Logitech Cordless Desktop (alternate option)
         Logitech
       
     
     
       
         logicdpa2
-        <_description>Logitech Cordless Desktop Pro (alternate option 2)
+        Logitech Cordless Desktop Pro (alternate option 2)
         Logitech
       
     
     
       
         logicfn
-        <_description>Logitech Cordless Freedom/Desktop Navigator
+        Logitech Cordless Freedom/Desktop Navigator
         Logitech
       
     
     
       
         logicdn
-        <_description>Logitech Cordless Desktop Navigator
+        Logitech Cordless Desktop Navigator
         Logitech
       
     
     
       
         logiitc
-        <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)
+        Logitech iTouch Cordless Keyboard (model Y-RB6)
         Logitech
       
     
     
       
         logiik
-        <_description>Logitech Internet Keyboard
+        Logitech Internet Keyboard
         Logitech
       
     
     
       
         itouch
-        <_description>Logitech iTouch
+        Logitech iTouch
         Logitech
       
     
     
       
         logicink
-        <_description>Logitech Internet Navigator Keyboard
+        Logitech Internet Navigator Keyboard
         Logitech
       
     
     
       
         logiex110
-        <_description>Logitech Cordless Desktop EX110
+        Logitech Cordless Desktop EX110
         Logitech
       
     
     
       
         logiinkse
-        <_description>Logitech iTouch Internet Navigator Keyboard SE
+        Logitech iTouch Internet Navigator Keyboard SE
         Logitech
       
     
     
       
         logiinkseusb
-        <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)
+        Logitech iTouch Internet Navigator Keyboard SE (USB)
         Logitech
       
     
     
       
         logiultrax
-        <_description>Logitech Ultra-X Keyboard
+        Logitech Ultra-X Keyboard
         Logitech
       
     
     
       
         logiultraxc
-        <_description>Logitech Ultra-X Cordless Media Desktop Keyboard
+        Logitech Ultra-X Cordless Media Desktop Keyboard
         Logitech
       
     
     
       
         logidinovo
-        <_description>Logitech diNovo Keyboard
+        Logitech diNovo Keyboard
         Logitech
       
     
     
       
         logidinovoedge
-        <_description>Logitech diNovo Edge Keyboard
+        Logitech diNovo Edge Keyboard
         Logitech
       
     
     
       
         mx1998
-        <_description>Memorex MX1998
+        Memorex MX1998
         Memorex
       
     
     
       
         mx2500
-        <_description>Memorex MX2500 EZ-Access Keyboard
+        Memorex MX2500 EZ-Access Keyboard
         Memorex
       
     
     
       
         mx2750
-        <_description>Memorex MX2750
+        Memorex MX2750
         Memorex
       
     
     
       
         microsoft4000
-        <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000
+        Microsoft Natural Wireless Ergonomic Keyboard 4000
         Microsoft Inc.
       
     
     
       
         microsoft7000
-        <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000
+        Microsoft Natural Wireless Ergonomic Keyboard 7000
         Microsoft Inc.
       
     
     
       
         microsoftinet
-        <_description>Microsoft Internet Keyboard
+        Microsoft Internet Keyboard
         Microsoft Inc.
       
     
     
       
         microsoftpro
-        <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+        Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
         Microsoft Inc.
       
     
     
       
         microsoftprousb
-        <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
+        Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
         Microsoft Inc.
       
     
     
       
         microsoftprooem
-        <_description>Microsoft Natural Keyboard Pro OEM
+        Microsoft Natural Keyboard Pro OEM
         Microsoft Inc.
       
     
     
       
         vsonku306
-        <_description>ViewSonic KU-306 Internet Keyboard
+        ViewSonic KU-306 Internet Keyboard
         ViewSonic
       
     
     
       
         microsoftprose
-        <_description>Microsoft Internet Keyboard Pro, Swedish
+        Microsoft Internet Keyboard Pro, Swedish
         Microsoft Inc.
       
     
     
       
         microsoftoffice
-        <_description>Microsoft Office Keyboard
+        Microsoft Office Keyboard
         Microsoft Inc.
       
     
     
       
         microsoftmult 
-        <_description>Microsoft Wireless Multimedia Keyboard 1.0A
+        Microsoft Wireless Multimedia Keyboard 1.0A
         Microsoft Inc.
       
     
     
       
         microsoftelite 
-        <_description>Microsoft Natural Keyboard Elite
+        Microsoft Natural Keyboard Elite
         Microsoft Inc.
       
     
     
       
         microsoftccurve2k 
-        <_description>Microsoft Comfort Curve Keyboard 2000
+        Microsoft Comfort Curve Keyboard 2000
         Microsoft Inc.
       
     
     
       
         oretec
-        <_description>Ortek MCK-800 MM/Internet keyboard
+        Ortek MCK-800 MM/Internet keyboard
         Ortek
       
     
     
       
         propeller
-        <_description>Propeller Voyager (KTEZ-1000)
+        Propeller Voyager (KTEZ-1000)
         KeyTronic
       
     
     
       
         qtronix
-        <_description>QTronix Scorpius 98N+
+        QTronix Scorpius 98N+
         QTronix
       
     
     
       
         samsung4500
-        <_description>Samsung SDM 4500P
+        Samsung SDM 4500P
         Samsung
       
     
     
       
         samsung4510
-        <_description>Samsung SDM 4510P
+        Samsung SDM 4510P
         Samsung
       
     
     
       
         sanwaskbkg3
-        <_description>Sanwa Supply SKB-KG3
+        Sanwa Supply SKB-KG3
         Sanwa Supply Inc.
       
     
     
       
         sk1300
-        <_description>SK-1300
+        SK-1300
         NEC
       
     
     
       
         sk2500
-        <_description>SK-2500
+        SK-2500
         NEC
       
     
     
       
         sk6200
-        <_description>SK-6200
+        SK-6200
         NEC
       
     
     
       
         sk7100
-        <_description>SK-7100
+        SK-7100
         NEC
       
     
     
       
         sp_inet
-        <_description>Super Power Multimedia Keyboard
+        Super Power Multimedia Keyboard
         Generic
       
     
     
       
         sven
-        <_description>SVEN Ergonomic 2500
+        SVEN Ergonomic 2500
         SVEN
       
     
     
       
         sven303
-        <_description>SVEN Slim 303
+        SVEN Slim 303
         SVEN
       
     
     
       
         symplon
-        <_description>Symplon PaceBook (tablet PC)
+        Symplon PaceBook (tablet PC)
         Symplon
       
     
     
       
         toshiba_s3000
-        <_description>Toshiba Satellite S3000
+        Toshiba Satellite S3000
         Toshiba
       
     
     
       
         trust
-        <_description>Trust Wireless Keyboard Classic
+        Trust Wireless Keyboard Classic
         Trust
       
     
     
       
         trustda
-        <_description>Trust Direct Access Keyboard
+        Trust Direct Access Keyboard
         Trust
       
     
     
       
         trust_slimline
-        <_description>Trust Slimline
+        Trust Slimline
         Trust
       
     
     
       
         tm2020
-        <_description>TypeMatrix EZ-Reach 2020
+        TypeMatrix EZ-Reach 2020
         TypeMatrix
       
     
     
       
         tm2030PS2
-        <_description>TypeMatrix EZ-Reach 2030 PS2
+        TypeMatrix EZ-Reach 2030 PS2
         TypeMatrix
       
     
     
       
         tm2030USB
-        <_description>TypeMatrix EZ-Reach 2030 USB
+        TypeMatrix EZ-Reach 2030 USB
         TypeMatrix
       
     
     
       
         tm2030USB-102
-        <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)
+        TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)
         TypeMatrix
       
     
     
       
         tm2030USB-106
-        <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)
+        TypeMatrix EZ-Reach 2030 USB (106:JP mode)
         TypeMatrix
       
     
     
       
         yahoo
-        <_description>Yahoo! Internet Keyboard
+        Yahoo! Internet Keyboard
         Yahoo!
       
     
     
       
         macbook78
-        <_description>MacBook/MacBook Pro
+        MacBook/MacBook Pro
         Apple
       
     
     
       
         macbook79
-        <_description>MacBook/MacBook Pro (Intl)
+        MacBook/MacBook Pro (Intl)
         Apple
       
     
     
       
         macintosh
-        <_description>Macintosh
+        Macintosh
         Apple
       
     
     
       
         macintosh_old
-        <_description>Macintosh Old
+        Macintosh Old
         Apple
       
     
     
       
         macintosh_hhk
-        <_description>Happy Hacking Keyboard for Mac
+        Happy Hacking Keyboard for Mac
         Fujitsu
       
     
     
       
         acer_c300
-        <_description>Acer C300
+        Acer C300
         Acer
       
     
     
       
         acer_ferrari4k
-        <_description>Acer Ferrari 4000
+        Acer Ferrari 4000
         Acer
       
     
     
       
         acer_laptop
-        <_description>Acer Laptop
+        Acer Laptop
         Acer
       
     
     
       
         asus_laptop
-        <_description>Asus Laptop
+        Asus Laptop
         Asus
       
     
     
       
         apple
-        <_description>Apple
+        Apple
         Apple
       
     
     
       
         apple_laptop
-        <_description>Apple Laptop
+        Apple Laptop
         Apple
       
     
     
       
         applealu_ansi
-        <_description>Apple Aluminium Keyboard (ANSI)
+        Apple Aluminium Keyboard (ANSI)
         Apple
       
     
     
       
         applealu_iso
-        <_description>Apple Aluminium Keyboard (ISO)
+        Apple Aluminium Keyboard (ISO)
         Apple
       
     
     
       
         applealu_jis
-        <_description>Apple Aluminium Keyboard (JIS)
+        Apple Aluminium Keyboard (JIS)
         Apple
       
     
     
       
         silvercrest
-        <_description>SILVERCREST Multimedia Wireless Keyboard
+        SILVERCREST Multimedia Wireless Keyboard
         Silvercrest
       
     
     
       
         emachines
-        <_description>Laptop/notebook eMachines m68xx
+        Laptop/notebook eMachines m68xx
         eMachines
       
     
     
       
         benqx
-        <_description>BenQ X-Touch
+        BenQ X-Touch
         BenQ
       
     
     
       
         benqx730
-        <_description>BenQ X-Touch 730
+        BenQ X-Touch 730
         BenQ
       
     
     
       
         benqx800
-        <_description>BenQ X-Touch 800
+        BenQ X-Touch 800
         BenQ
       
     
     
       
         hhk
-        <_description>Happy Hacking Keyboard
+        Happy Hacking Keyboard
         Fujitsu
       
     
     
       
         classmate
-        <_description>Classmate PC
+        Classmate PC
         Intel
       
     
     
       
         olpc
-        <_description>OLPC
+        OLPC
         OLPC
       
     
     
       
         sun_type7_usb
-        <_description>Sun Type 7 USB
+        Sun Type 7 USB
         Sun Microsystems
       
     
     
       
         sun_type7_euro_usb
-        <_description>Sun Type 7 USB (European layout)
+        Sun Type 7 USB (European layout)
         Sun Microsystems
       
     
     
       
         sun_type7_unix_usb
-        <_description>Sun Type 7 USB (Unix layout)
+        Sun Type 7 USB (Unix layout)
         Sun Microsystems
       
     
     
       
         sun_type7_jp_usb
-        <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key
+        Sun Type 7 USB (Japanese layout) / Japanese 106-key
         Sun Microsystems
       
     
     
       
         sun_type6_usb
-        <_description>Sun Type 6/7 USB
+        Sun Type 6/7 USB
         Sun Microsystems
       
     
     
       
         sun_type6_euro_usb
-        <_description>Sun Type 6/7 USB (European layout)
+        Sun Type 6/7 USB (European layout)
         Sun Microsystems
       
     
     
       
         sun_type6_unix_usb
-        <_description>Sun Type 6 USB (Unix layout)
+        Sun Type 6 USB (Unix layout)
         Sun Microsystems
       
     
     
       
         sun_type6_jp_usb
-        <_description>Sun Type 6 USB (Japanese layout)
+        Sun Type 6 USB (Japanese layout)
         Sun Microsystems
       
     
     
       
         sun_type6_jp
-        <_description>Sun Type 6 (Japanese layout)
+        Sun Type 6 (Japanese layout)
         Sun Microsystems
       
     
     
       
         targa_v811
-        <_description>Targa Visionary 811
+        Targa Visionary 811
         Targa
       
     
     
       
         unitekkb1925
-        <_description>Unitek KB-1925
+        Unitek KB-1925
         Unitek Group
       
     
     
       
         compalfl90
-        <_description>FL90
+        FL90
         Compal Electronics Inc.
       
     
     
       
         creativedw7000
-        <_description>Creative Desktop Wireless 7000
+        Creative Desktop Wireless 7000
         Creative
       
     
     
       
        htcdream
-       <_description>Htc Dream phone
+       Htc Dream phone
        htc
      
     
@@ -1300,9 +1300,9 @@
     
       
         us
-        
-        <_shortDescription>en
-        <_description>English (US)
+        
+        en
+        English (US)
         
           eng
         
@@ -1311,9 +1311,9 @@
         
           
             chr
-            
-            <_shortDescription>chr
-            <_description>Cherokee
+            
+            chr
+            Cherokee
             
               chr
             
@@ -1322,75 +1322,75 @@
         
           
             euro
-            <_description>English (US, with euro on 5)
+            English (US, with euro on 5)
           
         
         
           
             intl
-            <_description>English (US, international with dead keys)
+            English (US, international with dead keys)
           
         
         
           
             alt-intl
-            <_description>English (US, alternative international)
+            English (US, alternative international)
           
         
         
           
             colemak
-            <_description>English (Colemak)
+            English (Colemak)
           
         
         
           
             dvorak
-            <_description>English (Dvorak)
+            English (Dvorak)
           
         
         
           
             dvorak-intl
-            <_description>English (Dvorak, international with dead keys)
+            English (Dvorak, international with dead keys)
           
         
         
           
             dvorak-alt-intl
-            <_description>English (Dvorak alternative international no dead keys)
+            English (Dvorak alternative international no dead keys)
           
         
         
           
             dvorak-l
-            <_description>English (left handed Dvorak)
+            English (left handed Dvorak)
           
         
         
           
             dvorak-r
-            <_description>English (right handed Dvorak)
+            English (right handed Dvorak)
           
         
         
           
             dvorak-classic
-            <_description>English (classic Dvorak)
+            English (classic Dvorak)
           
         
         
           
             dvp
-            <_description>English (programmer Dvorak)
+            English (programmer Dvorak)
           
         
         
           
             rus
-            
-            <_shortDescription>ru
-            <_description>Russian (US, phonetic)
+            
+            ru
+            Russian (US, phonetic)
             
               rus
             
@@ -1399,13 +1399,13 @@
         
           
             mac
-            <_description>English (Macintosh)
+            English (Macintosh)
           
         
         
           
             altgr-intl
-            <_description>English (international AltGr dead keys)
+            English (international AltGr dead keys)
             eng
                           fra
                           ger
@@ -1414,13 +1414,13 @@
         
           
             olpc2
-            <_description>English (the divide/multiply keys toggle the layout)
+            English (the divide/multiply keys toggle the layout)
           
         
         
           
             hbs
-            <_description>Serbo-Croatian (US)
+            Serbo-Croatian (US)
             eng
                           bos
                           hbs
@@ -1431,13 +1431,13 @@
         
           
             workman
-            <_description>English (Workman)
+            English (Workman)
           
         
         
           
             workman-intl
-            <_description>English (Workman, international with dead keys)
+            English (Workman, international with dead keys)
            
          
       
@@ -1445,17 +1445,17 @@
     
       
         af
-        
-        <_shortDescription>fa
-        <_description>Afghani
+        
+        fa
+        Afghani
       
       
         
           
             ps
-            
-            <_shortDescription>ps
-            <_description>Pashto
+            
+            ps
+            Pashto
             
               pus
             
@@ -1464,9 +1464,9 @@
         
           
             uz
-            
-            <_shortDescription>uz
-            <_description>Uzbek (Afghanistan)
+            
+            uz
+            Uzbek (Afghanistan)
             
               uzb
             
@@ -1475,9 +1475,9 @@
         
           
             olpc-ps
-            
-            <_shortDescription>ps
-            <_description>Pashto (Afghanistan, OLPC)
+            
+            ps
+            Pashto (Afghanistan, OLPC)
             
               pus
             
@@ -1486,17 +1486,17 @@
         
           
             fa-olpc
-            
-            <_shortDescription>fa
-            <_description>Persian (Afghanistan, Dari OLPC)
+            
+            fa
+            Persian (Afghanistan, Dari OLPC)
           
         
         
           
             uz-olpc
-            
-            <_shortDescription>uz
-            <_description>Uzbek (Afghanistan, OLPC)
+            
+            uz
+            Uzbek (Afghanistan, OLPC)
             
               uzb
             
@@ -1507,9 +1507,9 @@
     
       
         ara
-        
-        <_shortDescription>ar
-        <_description>Arabic
+        
+        ar
+        Arabic
         
           AE
           BH
@@ -1539,37 +1539,37 @@
         
           
             azerty
-            <_description>Arabic (azerty)
+            Arabic (azerty)
           
         
         
           
             azerty_digits
-            <_description>Arabic (azerty/digits)
+            Arabic (azerty/digits)
           
         
         
           
             digits
-            <_description>Arabic (digits)
+            Arabic (digits)
           
         
         
           
             qwerty
-            <_description>Arabic (qwerty)
+            Arabic (qwerty)
           
         
         
           
             qwerty_digits
-            <_description>Arabic (qwerty/digits)
+            Arabic (qwerty/digits)
           
         
         
           
             buckwalter
-            <_description>Arabic (Buckwalter)
+            Arabic (Buckwalter)
           
         
       
@@ -1577,9 +1577,9 @@
     
       
         al
-        
-        <_shortDescription>sq
-        <_description>Albanian
+        
+        sq
+        Albanian
         
           alb
         
@@ -1589,9 +1589,9 @@
     
       
         am
-        
-        <_shortDescription>hy
-        <_description>Armenian
+        
+        hy
+        Armenian
         
           hye
         
@@ -1600,31 +1600,31 @@
         
           
             phonetic
-            <_description>Armenian (phonetic)
+            Armenian (phonetic)
           
         
         
           
             phonetic-alt
-            <_description>Armenian (alternative phonetic)
+            Armenian (alternative phonetic)
           
         
         
           
             eastern
-            <_description>Armenian (eastern)
+            Armenian (eastern)
           
         
         
           
             western
-            <_description>Armenian (western)
+            Armenian (western)
           
         
         
           
             eastern-alt
-            <_description>Armenian (alternative eastern)
+            Armenian (alternative eastern)
           
         
       
@@ -1632,9 +1632,9 @@
     
       
         at
-        
-        <_shortDescription>de
-        <_description>German (Austria)
+        
+        de
+        German (Austria)
         
           ger
         
@@ -1643,19 +1643,19 @@
         
           
             nodeadkeys
-            <_description>German (Austria, eliminate dead keys)
+            German (Austria, eliminate dead keys)
           
         
         
           
             sundeadkeys
-            <_description>German (Austria, Sun dead keys)
+            German (Austria, Sun dead keys)
           
         
         
           
             mac
-            <_description>German (Austria, Macintosh)
+            German (Austria, Macintosh)
           
         
       
@@ -1663,9 +1663,9 @@
     
       
         az
-        
-        <_shortDescription>az
-        <_description>Azerbaijani
+        
+        az
+        Azerbaijani
         
           aze
         
@@ -1674,7 +1674,7 @@
         
           
             cyrillic
-            <_description>Azerbaijani (Cyrillic)
+            Azerbaijani (Cyrillic)
           
         
       
@@ -1682,9 +1682,9 @@
     
       
         by
-        
-        <_shortDescription>by
-        <_description>Belarusian
+        
+        by
+        Belarusian
         
           bel
         
@@ -1693,13 +1693,13 @@
         
           
             legacy
-            <_description>Belarusian (legacy)
+            Belarusian (legacy)
           
         
         
           
             latin
-            <_description>Belarusian (Latin)
+            Belarusian (Latin)
           
         
       
@@ -1707,9 +1707,9 @@
     
       
         be
-        
-        <_shortDescription>be
-        <_description>Belgian
+        
+        be
+        Belgian
         ger
                       nld
                       fra
@@ -1718,43 +1718,43 @@
         
           
             oss
-            <_description>Belgian (alternative)
+            Belgian (alternative)
           
         
         
           
             oss_latin9
-            <_description>Belgian (alternative, Latin-9 only)
+            Belgian (alternative, Latin-9 only)
           
         
         
           
             oss_sundeadkeys
-            <_description>Belgian (alternative, Sun dead keys)
+            Belgian (alternative, Sun dead keys)
           
         
         
           
             iso-alternate
-            <_description>Belgian (ISO alternate)
+            Belgian (ISO alternate)
           
         
         
           
             nodeadkeys
-            <_description>Belgian (eliminate dead keys)
+            Belgian (eliminate dead keys)
           
         
         
           
             sundeadkeys
-            <_description>Belgian (Sun dead keys)
+            Belgian (Sun dead keys)
           
         
         
           
             wang
-            <_description>Belgian (Wang model 724 azerty)
+            Belgian (Wang model 724 azerty)
           
         
       
@@ -1762,9 +1762,9 @@
     
       
         bd
-        
-        <_shortDescription>bn
-        <_description>Bangla
+        
+        bn
+        Bangla
         
           ben
         
@@ -1773,7 +1773,7 @@
         
           
             probhat
-            <_description>Bangla (Probhat)
+            Bangla (Probhat)
           
         
       
@@ -1781,17 +1781,17 @@
     
       
         in
-        
-        <_shortDescription>in
-        <_description>Indian
+        
+        in
+        Indian
       
       
         
           
             ben
-            
-            <_shortDescription>bn
-            <_description>Bangla (India)
+            
+            bn
+            Bangla (India)
             
               ben
             
@@ -1800,9 +1800,9 @@
         
           
             ben_probhat
-            
-            <_shortDescription>bn
-            <_description>Bangla (India, Probhat)
+            
+            bn
+            Bangla (India, Probhat)
             
               ben
             
@@ -1811,28 +1811,28 @@
         
           
             ben_baishakhi
-            <_description>Bangla (India, Baishakhi)
+            Bangla (India, Baishakhi)
             ben
           
         
         
           
             ben_bornona
-            <_description>Bangla (India, Bornona)
+            Bangla (India, Bornona)
             ben
             
         
          
           
             ben_gitanjali
-            <_description>Bangla (India, Uni Gitanjali)
+            Bangla (India, Uni Gitanjali)
             ben
           
         
         
           
             ben_inscript
-            <_description>Bangla (India, Baishakhi Inscript)
+            Bangla (India, Baishakhi Inscript)
             ben
           
         
@@ -1846,9 +1846,9 @@
         
           
             guj
-            
-            <_shortDescription>gu
-            <_description>Gujarati
+            
+            gu
+            Gujarati
             
               guj
             
@@ -1857,9 +1857,9 @@
         
           
             guru
-            
-            <_shortDescription>pa
-            <_description>Punjabi (Gurmukhi)
+            
+            pa
+            Punjabi (Gurmukhi)
             
               pan
             
@@ -1868,9 +1868,9 @@
         
           
             jhelum
-            
-            <_shortDescription>pa
-            <_description>Punjabi (Gurmukhi Jhelum)
+            
+            pa
+            Punjabi (Gurmukhi Jhelum)
             
               pan
             
@@ -1879,9 +1879,9 @@
         
           
             kan
-            
-            <_shortDescription>kn
-            <_description>Kannada
+            
+            kn
+            Kannada
             
               kan
             
@@ -1890,9 +1890,9 @@
         
           
             kan-kagapa
-            
-            <_shortDescription>kn
-            <_description>Kannada (KaGaPa phonetic)
+            
+            kn
+            Kannada (KaGaPa phonetic)
             
               kan
             
@@ -1901,9 +1901,9 @@
         
           
             mal
-            
-            <_shortDescription>ml
-            <_description>Malayalam
+            
+            ml
+            Malayalam
             
               mal
             
@@ -1912,9 +1912,9 @@
         
           
             mal_lalitha
-            
-            <_shortDescription>ml
-            <_description>Malayalam (Lalitha)
+            
+            ml
+            Malayalam (Lalitha)
             
               mal
             
@@ -1923,18 +1923,18 @@
         
           
             mal_enhanced
-            
-            <_shortDescription>ml
-            <_description>Malayalam (enhanced Inscript with Rupee Sign)
+            
+            ml
+            Malayalam (enhanced Inscript with Rupee Sign)
             mal
           
          
          
            
             ori
-            
-            <_shortDescription>or
-            <_description>Oriya
+            
+            or
+            Oriya
             
               ori
             
@@ -1943,9 +1943,9 @@
         
           
             tam_unicode
-            
-            <_shortDescription>ta
-            <_description>Tamil (Unicode)
+            
+            ta
+            Tamil (Unicode)
             
               tam
             
@@ -1954,9 +1954,9 @@
         
           
             tam_keyboard_with_numerals
-            
-            <_shortDescription>ta
-            <_description>Tamil (keyboard with numerals)
+            
+            ta
+            Tamil (keyboard with numerals)
             
               tam
             
@@ -1965,9 +1965,9 @@
         
           
             tam_TAB
-            
-            <_shortDescription>ta
-            <_description>Tamil (TAB typewriter)
+            
+            ta
+            Tamil (TAB typewriter)
             
               tam
             
@@ -1976,9 +1976,9 @@
         
           
             tam_TSCII
-            
-            <_shortDescription>ta
-            <_description>Tamil (TSCII typewriter)
+            
+            ta
+            Tamil (TSCII typewriter)
             
               tam
             
@@ -1987,9 +1987,9 @@
         
           
             tam
-            
-            <_shortDescription>ta
-            <_description>Tamil
+            
+            ta
+            Tamil
             
               tam
             
@@ -1998,9 +1998,9 @@
         
           
             tel
-            
-            <_shortDescription>te
-            <_description>Telugu
+            
+            te
+            Telugu
             
               tel
             
@@ -2009,9 +2009,9 @@
         
           
             tel-kagapa
-            
-            <_shortDescription>te
-            <_description>Telugu (KaGaPa phonetic)
+            
+            te
+            Telugu (KaGaPa phonetic)
             
               tel
             
@@ -2020,9 +2020,9 @@
         
           
             urd-phonetic
-            
-            <_shortDescription>ur
-            <_description>Urdu (phonetic)
+            
+            ur
+            Urdu (phonetic)
             
               urd
             
@@ -2031,9 +2031,9 @@
         
           
             urd-phonetic3
-            
-            <_shortDescription>ur
-            <_description>Urdu (alternative phonetic)
+            
+            ur
+            Urdu (alternative phonetic)
             
               urd
             
@@ -2042,9 +2042,9 @@
         
           
             urd-winkeys
-            
-            <_shortDescription>ur
-            <_description>Urdu (WinKeys)
+            
+            ur
+            Urdu (WinKeys)
             
               urd
             
@@ -2053,9 +2053,9 @@
         
           
             bolnagri
-            
-            <_shortDescription>hi
-            <_description>Hindi (Bolnagri)
+            
+            hi
+            Hindi (Bolnagri)
             
               hin
             
@@ -2064,9 +2064,9 @@
         
           
             hin-wx
-            
-            <_shortDescription>hi
-            <_description>Hindi (Wx)
+            
+            hi
+            Hindi (Wx)
             
               hin
             
@@ -2075,9 +2075,9 @@
         
           
             hin-kagapa
-            
-            <_shortDescription>hi
-            <_description>Hindi (KaGaPa phonetic)
+            
+            hi
+            Hindi (KaGaPa phonetic)
             
               hin
             
@@ -2086,9 +2086,9 @@
         
           
             san-kagapa
-            
-            <_shortDescription>sa
-            <_description>Sanskrit (KaGaPa phonetic)
+            
+            sa
+            Sanskrit (KaGaPa phonetic)
             
               san
             
@@ -2097,9 +2097,9 @@
         
           
             mar-kagapa
-            
-            <_shortDescription>mr
-            <_description>Marathi (KaGaPa phonetic)
+            
+            mr
+            Marathi (KaGaPa phonetic)
             
               mar
             
@@ -2108,9 +2108,9 @@
         
           
             eng
-            
-            <_shortDescription>en
-            <_description>English (India, with RupeeSign)
+            
+            en
+            English (India, with RupeeSign)
             
               eng
             
@@ -2121,9 +2121,9 @@
     
       
         ba
-        
-        <_shortDescription>bs
-        <_description>Bosnian
+        
+        bs
+        Bosnian
         
           bos
         
@@ -2132,25 +2132,25 @@
         
           
             alternatequotes
-            <_description>Bosnian (use guillemets for quotes)
+            Bosnian (use guillemets for quotes)
           
         
         
           
             unicode
-            <_description>Bosnian (use Bosnian digraphs)
+            Bosnian (use Bosnian digraphs)
           
         
         
           
             unicodeus
-            <_description>Bosnian (US keyboard with Bosnian digraphs)
+            Bosnian (US keyboard with Bosnian digraphs)
           
         
         
           
             us
-            <_description>Bosnian (US keyboard with Bosnian letters)
+            Bosnian (US keyboard with Bosnian letters)
           
         
       
@@ -2158,9 +2158,9 @@
     
       
         br
-        
-        <_shortDescription>pt
-        <_description>Portuguese (Brazil)
+        
+        pt
+        Portuguese (Brazil)
         
           por
         
@@ -2169,31 +2169,31 @@
         
           
             nodeadkeys
-            <_description>Portuguese (Brazil, eliminate dead keys)
+            Portuguese (Brazil, eliminate dead keys)
           
         
         
           
             dvorak
-            <_description>Portuguese (Brazil, Dvorak)
+            Portuguese (Brazil, Dvorak)
           
         
         
           
             nativo
-            <_description>Portuguese (Brazil, Nativo)
+            Portuguese (Brazil, Nativo)
           
         
         
           
             nativo-us
-            <_description>Portuguese (Brazil, Nativo for US keyboards)
+            Portuguese (Brazil, Nativo for US keyboards)
           
         
         
           
             nativo-epo
-            <_description>Esperanto (Brazil, Nativo)
+            Esperanto (Brazil, Nativo)
             
               epo
             
@@ -2204,9 +2204,9 @@
     
       
         bg
-        
-        <_shortDescription>bg
-        <_description>Bulgarian
+        
+        bg
+        Bulgarian
         
           bul
         
@@ -2215,13 +2215,13 @@
         
           
             phonetic
-            <_description>Bulgarian (traditional phonetic)
+            Bulgarian (traditional phonetic)
           
         
         
           
             bas_phonetic
-            <_description>Bulgarian (new phonetic)
+            Bulgarian (new phonetic)
           
         
       
@@ -2229,17 +2229,17 @@
     
       
         ma
-        
-        <_shortDescription>ar
-        <_description>Arabic (Morocco)
+        
+        ar
+        Arabic (Morocco)
       
       
         
           
             french
-            
-            <_shortDescription>fr
-            <_description>French (Morocco)
+            
+            fr
+            French (Morocco)
             
               fra
             
@@ -2248,9 +2248,9 @@
         
           
             tifinagh
-            
-            <_shortDescription>ber
-            <_description>Berber (Morocco, Tifinagh)
+            
+            ber
+            Berber (Morocco, Tifinagh)
             
               ber
             
@@ -2259,9 +2259,9 @@
         
           
             tifinagh-alt
-            
-            <_shortDescription>ber
-            <_description>Berber (Morocco, Tifinagh alternative)
+            
+            ber
+            Berber (Morocco, Tifinagh alternative)
             
               ber
             
@@ -2270,9 +2270,9 @@
         
           
             tifinagh-alt-phonetic
-            
-            <_shortDescription>ber
-            <_description>Berber (Morocco, Tifinagh alternative phonetic)
+            
+            ber
+            Berber (Morocco, Tifinagh alternative phonetic)
             
               ber
             
@@ -2281,9 +2281,9 @@
         
           
             tifinagh-extended
-            
-            <_shortDescription>ber
-            <_description>Berber (Morocco, Tifinagh extended)
+            
+            ber
+            Berber (Morocco, Tifinagh extended)
             
               ber
             
@@ -2292,9 +2292,9 @@
         
           
             tifinagh-phonetic
-            
-            <_shortDescription>ber
-            <_description>Berber (Morocco, Tifinagh phonetic)
+            
+            ber
+            Berber (Morocco, Tifinagh phonetic)
             
               ber
             
@@ -2303,9 +2303,9 @@
         
           
             tifinagh-extended-phonetic
-            
-            <_shortDescription>ber
-            <_description>Berber (Morocco, Tifinagh extended phonetic)
+            
+            ber
+            Berber (Morocco, Tifinagh extended phonetic)
             
               ber
             
@@ -2316,23 +2316,23 @@
     
       
         cm
-        
-        <_shortDescription>cm
-        <_description>English (Cameroon)
+        
+        cm
+        English (Cameroon)
         eng
       
       
         
           
             french
-            <_description>French (Cameroon)
+            French (Cameroon)
             fra
           
         
         
           
             qwerty
-            <_description>Cameroon Multilingual (qwerty)
+            Cameroon Multilingual (qwerty)
             
               eng
               bas
@@ -2369,7 +2369,7 @@
         
           
             azerty
-            <_description>Cameroon Multilingual (azerty)
+            Cameroon Multilingual (azerty)
             
               fra
               bas
@@ -2406,7 +2406,7 @@
         
           
             dvorak
-            <_description>Cameroon Multilingual (Dvorak)
+            Cameroon Multilingual (Dvorak)
           
         
       
@@ -2414,9 +2414,9 @@
     
       
         mm
-        
-        <_shortDescription>my
-        <_description>Burmese
+        
+        my
+        Burmese
         
           mya
         
@@ -2426,9 +2426,9 @@
     
       
         ca
-        
-        <_shortDescription>fr
-        <_description>French (Canada)
+        
+        fr
+        French (Canada)
         
           fra
         
@@ -2437,43 +2437,43 @@
         
           
             fr-dvorak
-            
-            <_shortDescription>fr
-            <_description>French (Canada, Dvorak)
+            
+            fr
+            French (Canada, Dvorak)
           
         
         
           
             fr-legacy
-            
-            <_shortDescription>fr
-            <_description>French (Canada, legacy)
+            
+            fr
+            French (Canada, legacy)
           
         
         
           
             multix
-            <_description>Canadian Multilingual
+            Canadian Multilingual
           
         
         
           
             multi
-            <_description>Canadian Multilingual (first part)
+            Canadian Multilingual (first part)
           
         
         
           
             multi-2gr
-            <_description>Canadian Multilingual (second part)
+            Canadian Multilingual (second part)
           
         
         
           
             ike
-            
-            <_shortDescription>ike
-            <_description>Inuktitut
+            
+            ike
+            Inuktitut
             
               iku
             
@@ -2482,9 +2482,9 @@
         
           
             eng
-            
-            <_shortDescription>en
-            <_description>English (Canada)
+            
+            en
+            English (Canada)
             
               eng
             
@@ -2495,9 +2495,9 @@
     
       
         cd
-        
-        <_shortDescription>fr
-        <_description>French (Democratic Republic of the Congo)
+        
+        fr
+        French (Democratic Republic of the Congo)
         
           fra
         
@@ -2507,9 +2507,9 @@
     
       
         cn
-        
-        <_shortDescription>zh
-        <_description>Chinese
+        
+        zh
+        Chinese
         
           chi
         
@@ -2518,7 +2518,7 @@
         
           
             tib
-            <_description>Tibetan
+            Tibetan
             
               tib
             
@@ -2527,7 +2527,7 @@
         
           
             tib_asciinum
-            <_description>Tibetan (with ASCII numerals)
+            Tibetan (with ASCII numerals)
             
               tib
             
@@ -2536,8 +2536,8 @@
         
           
             ug
-            <_shortDescription>ug
-            <_description>Uyghur
+            ug
+            Uyghur
             
               ug
             
@@ -2548,9 +2548,9 @@
     
       
         hr
-        
-        <_shortDescription>hr
-        <_description>Croatian
+        
+        hr
+        Croatian
         
           hrv
         
@@ -2559,25 +2559,25 @@
         
           
             alternatequotes
-            <_description>Croatian (use guillemets for quotes)
+            Croatian (use guillemets for quotes)
           
         
         
           
             unicode
-            <_description>Croatian (use Croatian digraphs)
+            Croatian (use Croatian digraphs)
           
         
         
           
             unicodeus
-            <_description>Croatian (US keyboard with Croatian digraphs)
+            Croatian (US keyboard with Croatian digraphs)
           
         
         
           
             us
-            <_description>Croatian (US keyboard with Croatian letters)
+            Croatian (US keyboard with Croatian letters)
           
         
       
@@ -2585,9 +2585,9 @@
     
       
         cz
-        
-        <_shortDescription>cs
-        <_description>Czech
+        
+        cs
+        Czech
         
           cze
         
@@ -2596,31 +2596,31 @@
         
           
             bksl
-            <_description>Czech (with <\|> key)
+            Czech (with <\|> key)
           
         
         
           
             qwerty
-            <_description>Czech (qwerty)
+            Czech (qwerty)
           
         
         
           
             qwerty_bksl
-            <_description>Czech (qwerty, extended Backslash)
+            Czech (qwerty, extended Backslash)
           
         
         
           
             ucw
-            <_description>Czech (UCW layout, accented letters only)
+            Czech (UCW layout, accented letters only)
           
         
         
           
             dvorak-ucw
-            <_description>Czech (US Dvorak with CZ UCW support)
+            Czech (US Dvorak with CZ UCW support)
           
         
       
@@ -2628,9 +2628,9 @@
     
       
         dk
-        
-        <_shortDescription>da
-        <_description>Danish
+        
+        da
+        Danish
         
           dan
         
@@ -2639,25 +2639,25 @@
         
           
             nodeadkeys
-            <_description>Danish (eliminate dead keys)
+            Danish (eliminate dead keys)
           
         
         
           
             mac
-            <_description>Danish (Macintosh)
+            Danish (Macintosh)
           
         
         
           
             mac_nodeadkeys
-            <_description>Danish (Macintosh, eliminate dead keys)
+            Danish (Macintosh, eliminate dead keys)
           
         
         
           
             dvorak
-            <_description>Danish (Dvorak)
+            Danish (Dvorak)
           
         
       
@@ -2665,9 +2665,9 @@
     
       
         nl
-        
-        <_shortDescription>nl
-        <_description>Dutch
+        
+        nl
+        Dutch
         
           nld
         
@@ -2676,19 +2676,19 @@
         
           
             sundeadkeys
-            <_description>Dutch (Sun dead keys)
+            Dutch (Sun dead keys)
           
         
         
           
             mac
-            <_description>Dutch (Macintosh)
+            Dutch (Macintosh)
           
         
         
           
             std
-            <_description>Dutch (standard)
+            Dutch (standard)
           
         
       
@@ -2696,9 +2696,9 @@
     
       
         bt
-        
-        <_shortDescription>dz
-        <_description>Dzongkha
+        
+        dz
+        Dzongkha
         
           dzo
         
@@ -2707,9 +2707,9 @@
     
       
         ee
-        
-        <_shortDescription>et
-        <_description>Estonian
+        
+        et
+        Estonian
         
           est
         
@@ -2718,19 +2718,19 @@
         
           
             nodeadkeys
-            <_description>Estonian (eliminate dead keys)
+            Estonian (eliminate dead keys)
           
         
         
           
             dvorak
-            <_description>Estonian (Dvorak)
+            Estonian (Dvorak)
           
         
         
           
             us
-            <_description>Estonian (US keyboard with Estonian letters)
+            Estonian (US keyboard with Estonian letters)
           
         
       
@@ -2738,9 +2738,9 @@
     
       
         ir
-        
-        <_shortDescription>fa
-        <_description>Persian
+        
+        fa
+        Persian
         
           per
         
@@ -2749,15 +2749,15 @@
         
           
             pes_keypad
-            <_description>Persian (with Persian Keypad)
+            Persian (with Persian Keypad)
           
         
         
           
             ku
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iran, Latin Q)
+            
+            ku
+            Kurdish (Iran, Latin Q)
             
               kur
             
@@ -2766,9 +2766,9 @@
         
           
             ku_f
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iran, F)
+            
+            ku
+            Kurdish (Iran, F)
             
               kur
             
@@ -2777,9 +2777,9 @@
         
           
             ku_alt
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iran, Latin Alt-Q)
+            
+            ku
+            Kurdish (Iran, Latin Alt-Q)
             
               kur
             
@@ -2788,9 +2788,9 @@
         
           
             ku_ara
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iran, Arabic-Latin)
+            
+            ku
+            Kurdish (Iran, Arabic-Latin)
             
               kur
             
@@ -2801,9 +2801,9 @@
     
       
         iq
-        
-        <_shortDescription>ar
-        <_description>Iraqi
+        
+        ar
+        Iraqi
         ara
                       kur
       
@@ -2811,9 +2811,9 @@
         
           
             ku
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iraq, Latin Q)
+            
+            ku
+            Kurdish (Iraq, Latin Q)
             
               kur
             
@@ -2822,9 +2822,9 @@
         
           
             ku_f
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iraq, F)
+            
+            ku
+            Kurdish (Iraq, F)
             
               kur
             
@@ -2833,9 +2833,9 @@
         
           
             ku_alt
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iraq, Latin Alt-Q)
+            
+            ku
+            Kurdish (Iraq, Latin Alt-Q)
             
               kur
             
@@ -2844,9 +2844,9 @@
         
           
             ku_ara
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Iraq, Arabic-Latin)
+            
+            ku
+            Kurdish (Iraq, Arabic-Latin)
             
               kur
             
@@ -2857,9 +2857,9 @@
     
       
         fo
-        
-        <_shortDescription>fo
-        <_description>Faroese
+        
+        fo
+        Faroese
         
           fao
         
@@ -2868,7 +2868,7 @@
         
           
             nodeadkeys
-            <_description>Faroese (eliminate dead keys)
+            Faroese (eliminate dead keys)
           
         
       
@@ -2876,9 +2876,9 @@
     
       
         fi
-        
-        <_shortDescription>fi
-        <_description>Finnish
+        
+        fi
+        Finnish
         
           fin
         
@@ -2887,26 +2887,26 @@
         
           
             classic
-            <_description>Finnish (classic)
+            Finnish (classic)
           
         
         
           
             nodeadkeys
-            <_description>Finnish (classic, eliminate dead keys)
+            Finnish (classic, eliminate dead keys)
           
         
         
           
             smi
-            <_description>Northern Saami (Finland)
+            Northern Saami (Finland)
             sme
           
         
         
           
             mac
-            <_description>Finnish (Macintosh)
+            Finnish (Macintosh)
           
         
       
@@ -2914,9 +2914,9 @@
     
       
         fr
-        
-        <_shortDescription>fr
-        <_description>French
+        
+        fr
+        French
         
           fra
         
@@ -2925,91 +2925,91 @@
         
           
             nodeadkeys
-            <_description>French (eliminate dead keys)
+            French (eliminate dead keys)
           
         
         
           
             sundeadkeys
-            <_description>French (Sun dead keys)
+            French (Sun dead keys)
           
         
         
           
             oss
-            <_description>French (alternative)
+            French (alternative)
           
         
         
           
             oss_latin9
-            <_description>French (alternative, Latin-9 only)
+            French (alternative, Latin-9 only)
           
         
         
           
             oss_nodeadkeys
-            <_description>French (alternative, eliminate dead keys)
+            French (alternative, eliminate dead keys)
           
         
         
           
             oss_sundeadkeys
-            <_description>French (alternative, Sun dead keys)
+            French (alternative, Sun dead keys)
           
         
         
           
             latin9
-            <_description>French (legacy, alternative)
+            French (legacy, alternative)
           
         
         
           
             latin9_nodeadkeys
-            <_description>French (legacy, alternative, eliminate dead keys)
+            French (legacy, alternative, eliminate dead keys)
           
         
         
           
             latin9_sundeadkeys
-            <_description>French (legacy, alternative, Sun dead keys)
+            French (legacy, alternative, Sun dead keys)
           
         
         
           
             bepo
-            <_description>French (Bepo, ergonomic, Dvorak way)
+            French (Bepo, ergonomic, Dvorak way)
           
         
         
           
             bepo_latin9
-            <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)
+            French (Bepo, ergonomic, Dvorak way, Latin-9 only)
           
         
         
           
             dvorak
-            <_description>French (Dvorak)
+            French (Dvorak)
           
         
         
           
             mac
-            <_description>French (Macintosh)
+            French (Macintosh)
           
         
         
           
             bre
-            <_description>French (Breton)
+            French (Breton)
           
         
         
           
             oci
-            <_description>Occitan
+            Occitan
             
               oci
             
@@ -3018,7 +3018,7 @@
         
           
             geo
-            <_description>Georgian (France, AZERTY Tskapo)
+            Georgian (France, AZERTY Tskapo)
             
               geo
             
@@ -3029,9 +3029,9 @@
     
       
         gh
-        
-        <_shortDescription>en
-        <_description>English (Ghana)
+        
+        en
+        English (Ghana)
         
           eng
         
@@ -3040,15 +3040,15 @@
         
           
             generic
-            <_description>English (Ghana, multilingual)
+            English (Ghana, multilingual)
           
         
         
           
             akan
-            
-            <_shortDescription>ak
-            <_description>Akan
+            
+            ak
+            Akan
             
               aka
             
@@ -3057,9 +3057,9 @@
         
           
             ewe
-            
-            <_shortDescription>ee
-            <_description>Ewe
+            
+            ee
+            Ewe
             
               ewe
             
@@ -3068,9 +3068,9 @@
         
           
             fula
-            
-            <_shortDescription>ff
-            <_description>Fula
+            
+            ff
+            Fula
             
               ful
             
@@ -3079,9 +3079,9 @@
         
           
             ga
-            
-            <_shortDescription>gaa
-            <_description>Ga
+            
+            gaa
+            Ga
             
               gaa
             
@@ -3090,9 +3090,9 @@
         
           
             hausa
-            
-            <_shortDescription>ha
-            <_description>Hausa
+            
+            ha
+            Hausa
             
               hau
             
@@ -3101,9 +3101,9 @@
         
           
             avn
-            
-            <_shortDescription>avn
-            <_description>Avatime
+            
+            avn
+            Avatime
             
               avn
             
@@ -3112,7 +3112,7 @@
         
           
             gillbt
-            <_description>English (Ghana, GILLBT)
+            English (Ghana, GILLBT)
           
         
       
@@ -3120,9 +3120,9 @@
     
       
         gn
-        
-        <_shortDescription>fr
-        <_description>French (Guinea)
+        
+        fr
+        French (Guinea)
         
           fra
         
@@ -3132,9 +3132,9 @@
     
       
         ge
-        
-        <_shortDescription>ka
-        <_description>Georgian
+        
+        ka
+        Georgian
         
           geo
         
@@ -3143,21 +3143,21 @@
         
           
             ergonomic
-            <_description>Georgian (ergonomic)
+            Georgian (ergonomic)
           
         
         
           
             mess
-            <_description>Georgian (MESS)
+            Georgian (MESS)
           
         
         
           
             ru
-            
-            <_shortDescription>ru
-            <_description>Russian (Georgia)
+            
+            ru
+            Russian (Georgia)
             
               rus
             
@@ -3166,7 +3166,7 @@
         
           
             os
-            <_description>Ossetian (Georgia)
+            Ossetian (Georgia)
             
               oss
             
@@ -3177,9 +3177,9 @@
     
       
         de
-        
-        <_shortDescription>de
-        <_description>German
+        
+        de
+        German
         
           ger
         
@@ -3188,75 +3188,75 @@
         
           
             deadacute
-            <_description>German (dead acute)
+            German (dead acute)
           
         
         
           
             deadgraveacute
-            <_description>German (dead grave acute)
+            German (dead grave acute)
           
         
         
           
             nodeadkeys
-            <_description>German (eliminate dead keys)
+            German (eliminate dead keys)
           
         
         
           
             T3
-            <_description>German (T3)
+            German (T3)
           
         
         
           
             ro
-            <_description>Romanian (Germany)
+            Romanian (Germany)
             rum
           
         
         
           
             ro_nodeadkeys
-            <_description>Romanian (Germany, eliminate dead keys)
+            Romanian (Germany, eliminate dead keys)
             rum
           
         
         
           
             dvorak
-            <_description>German (Dvorak)
+            German (Dvorak)
           
         
         
           
             sundeadkeys
-            <_description>German (Sun dead keys)
+            German (Sun dead keys)
           
         
         
           
             neo
-            <_description>German (Neo 2)
+            German (Neo 2)
           
         
         
           
             mac
-            <_description>German (Macintosh)
+            German (Macintosh)
           
         
         
           
             mac_nodeadkeys
-            <_description>German (Macintosh, eliminate dead keys)
+            German (Macintosh, eliminate dead keys)
           
         
         
           
             dsb
-            <_description>Lower Sorbian
+            Lower Sorbian
             
               dsb
             
@@ -3265,7 +3265,7 @@
         
           
             dsb_qwertz
-            <_description>Lower Sorbian (qwertz)
+            Lower Sorbian (qwertz)
             
               dsb
             
@@ -3274,15 +3274,15 @@
         
           
             qwerty
-            <_description>German (qwerty)
+            German (qwerty)
           
         
         
           
             ru
-            
-            <_shortDescription>ru
-            <_description>Russian (Germany, phonetic)
+            
+            ru
+            Russian (Germany, phonetic)
             
               rus
             
@@ -3291,7 +3291,7 @@
         
           
             legacy
-            <_description>German (legacy)
+            German (legacy)
           
         
       
@@ -3299,9 +3299,9 @@
     
       
         gr
-        
-        <_shortDescription>gr
-        <_description>Greek
+        
+        gr
+        Greek
         
           gre
         
@@ -3310,25 +3310,25 @@
         
           
             simple
-            <_description>Greek (simple)
+            Greek (simple)
           
         
         
           
             extended
-            <_description>Greek (extended)
+            Greek (extended)
           
         
         
           
             nodeadkeys
-            <_description>Greek (eliminate dead keys)
+            Greek (eliminate dead keys)
           
         
         
           
             polytonic
-            <_description>Greek (polytonic)
+            Greek (polytonic)
           
         
       
@@ -3336,9 +3336,9 @@
     
       
         hu
-        
-        <_shortDescription>hu
-        <_description>Hungarian
+        
+        hu
+        Hungarian
         
           hun
         
@@ -3347,115 +3347,115 @@
         
           
             standard
-            <_description>Hungarian (standard)
+            Hungarian (standard)
           
         
         
           
             nodeadkeys
-            <_description>Hungarian (eliminate dead keys)
+            Hungarian (eliminate dead keys)
           
         
         
           
             qwerty
-            <_description>Hungarian (qwerty)
+            Hungarian (qwerty)
           
         
         
           
             101_qwertz_comma_dead
-            <_description>Hungarian (101/qwertz/comma/dead keys)
+            Hungarian (101/qwertz/comma/dead keys)
           
         
         
           
             101_qwertz_comma_nodead
-            <_description>Hungarian (101/qwertz/comma/eliminate dead keys)
+            Hungarian (101/qwertz/comma/eliminate dead keys)
           
         
         
           
             101_qwertz_dot_dead
-            <_description>Hungarian (101/qwertz/dot/dead keys)
+            Hungarian (101/qwertz/dot/dead keys)
           
         
         
           
             101_qwertz_dot_nodead
-            <_description>Hungarian (101/qwertz/dot/eliminate dead keys)
+            Hungarian (101/qwertz/dot/eliminate dead keys)
           
         
         
           
             101_qwerty_comma_dead
-            <_description>Hungarian (101/qwerty/comma/dead keys)
+            Hungarian (101/qwerty/comma/dead keys)
           
         
         
           
             101_qwerty_comma_nodead
-            <_description>Hungarian (101/qwerty/comma/eliminate dead keys)
+            Hungarian (101/qwerty/comma/eliminate dead keys)
           
         
         
           
             101_qwerty_dot_dead
-            <_description>Hungarian (101/qwerty/dot/dead keys)
+            Hungarian (101/qwerty/dot/dead keys)
           
         
         
           
             101_qwerty_dot_nodead
-            <_description>Hungarian (101/qwerty/dot/eliminate dead keys)
+            Hungarian (101/qwerty/dot/eliminate dead keys)
           
         
         
           
             102_qwertz_comma_dead
-            <_description>Hungarian (102/qwertz/comma/dead keys)
+            Hungarian (102/qwertz/comma/dead keys)
           
         
         
           
             102_qwertz_comma_nodead
-            <_description>Hungarian (102/qwertz/comma/eliminate dead keys)
+            Hungarian (102/qwertz/comma/eliminate dead keys)
           
         
         
           
             102_qwertz_dot_dead
-            <_description>Hungarian (102/qwertz/dot/dead keys)
+            Hungarian (102/qwertz/dot/dead keys)
           
         
         
           
             102_qwertz_dot_nodead
-            <_description>Hungarian (102/qwertz/dot/eliminate dead keys)
+            Hungarian (102/qwertz/dot/eliminate dead keys)
           
         
         
           
             102_qwerty_comma_dead
-            <_description>Hungarian (102/qwerty/comma/dead keys)
+            Hungarian (102/qwerty/comma/dead keys)
           
         
         
           
             102_qwerty_comma_nodead
-            <_description>Hungarian (102/qwerty/comma/eliminate dead keys)
+            Hungarian (102/qwerty/comma/eliminate dead keys)
           
         
         
           
             102_qwerty_dot_dead
-            <_description>Hungarian (102/qwerty/dot/dead keys)
+            Hungarian (102/qwerty/dot/dead keys)
           
         
         
           
             102_qwerty_dot_nodead
-            <_description>Hungarian (102/qwerty/dot/eliminate dead keys)
+            Hungarian (102/qwerty/dot/eliminate dead keys)
           
         
       
@@ -3463,9 +3463,9 @@
     
       
         is
-        
-        <_shortDescription>is
-        <_description>Icelandic
+        
+        is
+        Icelandic
         
           ice
         
@@ -3474,25 +3474,25 @@
         
           
             Sundeadkeys
-            <_description>Icelandic (Sun dead keys)
+            Icelandic (Sun dead keys)
           
         
         
           
             nodeadkeys
-            <_description>Icelandic (eliminate dead keys)
+            Icelandic (eliminate dead keys)
           
         
         
           
             mac
-            <_description>Icelandic (Macintosh)
+            Icelandic (Macintosh)
           
         
         
           
             dvorak
-            <_description>Icelandic (Dvorak)
+            Icelandic (Dvorak)
           
         
       
@@ -3500,9 +3500,9 @@
     
       
         il
-        
-        <_shortDescription>he
-        <_description>Hebrew
+        
+        he
+        Hebrew
         
           heb
         
@@ -3511,19 +3511,19 @@
         
           
             lyx
-            <_description>Hebrew (lyx)
+            Hebrew (lyx)
           
         
         
           
             phonetic
-            <_description>Hebrew (phonetic)
+            Hebrew (phonetic)
           
         
         
           
             biblical
-            <_description>Hebrew (Biblical, Tiro)
+            Hebrew (Biblical, Tiro)
           
         
       
@@ -3531,9 +3531,9 @@
     
       
         it
-        
-        <_shortDescription>it
-        <_description>Italian
+        
+        it
+        Italian
         
           ita
         
@@ -3542,25 +3542,25 @@
         
           
             nodeadkeys
-            <_description>Italian (eliminate dead keys)
+            Italian (eliminate dead keys)
           
         
         
           
             mac
-            <_description>Italian (Macintosh)
+            Italian (Macintosh)
           
         
         
           
             us
-            <_description>Italian (US keyboard with Italian letters)
+            Italian (US keyboard with Italian letters)
           
         
         
           
             geo
-            <_description>Georgian (Italy)
+            Georgian (Italy)
             
               geo
             
@@ -3569,7 +3569,7 @@
         
           
             ibm
-            <_description>Italian (IBM 142)
+            Italian (IBM 142)
           
         
       
@@ -3577,9 +3577,9 @@
     
       
         jp
-        
-        <_shortDescription>ja
-        <_description>Japanese
+        
+        ja
+        Japanese
         
           jpn
         
@@ -3588,31 +3588,31 @@
         
           
             kana
-            <_description>Japanese (Kana)
+            Japanese (Kana)
           
         
         
           
             kana86
-            <_description>Japanese (Kana 86)
+            Japanese (Kana 86)
           
         
         
           
             OADG109A
-            <_description>Japanese (OADG 109A)
+            Japanese (OADG 109A)
           
         
         
           
             mac
-            <_description>Japanese (Macintosh)
+            Japanese (Macintosh)
           
         
         
           
             dvorak
-            <_description>Japanese (Dvorak)
+            Japanese (Dvorak)
           
         
       
@@ -3620,9 +3620,9 @@
     
       
         kg
-        
-        <_shortDescription>ki
-        <_description>Kyrgyz
+        
+        ki
+        Kyrgyz
         
           kir
         
@@ -3631,7 +3631,7 @@
         
           
             phonetic
-            <_description>Kyrgyz (phonetic)
+            Kyrgyz (phonetic)
           
         
       
@@ -3639,9 +3639,9 @@
     
       
         kh
-        
-        <_shortDescription>km
-        <_description>Khmer (Cambodia)
+        
+        km
+        Khmer (Cambodia)
         
           khm
         
@@ -3651,9 +3651,9 @@
     
       
         kz
-        
-        <_shortDescription>kk
-        <_description>Kazakh
+        
+        kk
+        Kazakh
         
           kaz
         
@@ -3662,9 +3662,9 @@
         
           
             ruskaz
-            
-            <_shortDescription>ru
-            <_description>Russian (Kazakhstan, with Kazakh)
+            
+            ru
+            Russian (Kazakhstan, with Kazakh)
             kaz
                           rus
           
@@ -3672,7 +3672,7 @@
         
           
             kazrus
-            <_description>Kazakh (with Russian)
+            Kazakh (with Russian)
             kaz
                           rus
           
@@ -3682,9 +3682,9 @@
     
       
         la
-        
-        <_shortDescription>lo
-        <_description>Lao
+        
+        lo
+        Lao
         
           lao
         
@@ -3693,7 +3693,7 @@
         
           
             stea
-            <_description>Lao (STEA proposed standard layout)
+            Lao (STEA proposed standard layout)
             lao
             
           
@@ -3703,9 +3703,9 @@
     
       
         latam
-        
-        <_shortDescription>es
-        <_description>Spanish (Latin American)
+        
+        es
+        Spanish (Latin American)
         
           AR
           BO
@@ -3737,19 +3737,19 @@
         
           
             nodeadkeys
-            <_description>Spanish (Latin American, eliminate dead keys)
+            Spanish (Latin American, eliminate dead keys)
           
         
         
           
             deadtilde
-            <_description>Spanish (Latin American, include dead tilde)
+            Spanish (Latin American, include dead tilde)
           
         
         
           
             sundeadkeys
-            <_description>Spanish (Latin American, Sun dead keys)
+            Spanish (Latin American, Sun dead keys)
           
         
       
@@ -3757,9 +3757,9 @@
     
       
         lt
-        
-        <_shortDescription>lt
-        <_description>Lithuanian
+        
+        lt
+        Lithuanian
         
           lit
         
@@ -3768,31 +3768,31 @@
         
           
             std
-            <_description>Lithuanian (standard)
+            Lithuanian (standard)
           
         
         
           
             us
-            <_description>Lithuanian (US keyboard with Lithuanian letters)
+            Lithuanian (US keyboard with Lithuanian letters)
           
         
         
           
             ibm
-            <_description>Lithuanian (IBM LST 1205-92)
+            Lithuanian (IBM LST 1205-92)
           
         
         
           
             lekp
-            <_description>Lithuanian (LEKP)
+            Lithuanian (LEKP)
           
         
         
           
             lekpa
-            <_description>Lithuanian (LEKPa)
+            Lithuanian (LEKPa)
           
         
       
@@ -3800,9 +3800,9 @@
     
       
         lv
-        
-        <_shortDescription>lv
-        <_description>Latvian
+        
+        lv
+        Latvian
         
           lav
         
@@ -3811,37 +3811,37 @@
         
           
             apostrophe
-            <_description>Latvian (apostrophe variant)
+            Latvian (apostrophe variant)
           
         
         
           
             tilde
-            <_description>Latvian (tilde variant)
+            Latvian (tilde variant)
           
         
         
           
             fkey
-            <_description>Latvian (F variant)
+            Latvian (F variant)
           
         
         
           
             modern
-            <_description>Latvian (modern)
+            Latvian (modern)
           
         
         
           
             ergonomic
-            <_description>Latvian (ergonomic, ŪGJRMV)
+            Latvian (ergonomic, ŪGJRMV)
           
         
         
           
             adapted
-            <_description>Latvian (adapted)
+            Latvian (adapted)
           
         
       
@@ -3849,9 +3849,9 @@
     
       
         mao
-        
-        <_shortDescription>mi
-        <_description>Maori
+        
+        mi
+        Maori
         
           mao
         
@@ -3861,9 +3861,9 @@
     
       
         me
-        
-        <_shortDescription>sr
-        <_description>Montenegrin
+        
+        sr
+        Montenegrin
         
           srp
         
@@ -3872,43 +3872,43 @@
         
           
             cyrillic
-            <_description>Montenegrin (Cyrillic)
+            Montenegrin (Cyrillic)
           
         
         
           
             cyrillicyz
-            <_description>Montenegrin (Cyrillic, Z and ZHE swapped)
+            Montenegrin (Cyrillic, Z and ZHE swapped)
           
         
         
           
             latinunicode
-            <_description>Montenegrin (Latin Unicode)
+            Montenegrin (Latin Unicode)
           
         
         
           
             latinyz
-            <_description>Montenegrin (Latin qwerty)
+            Montenegrin (Latin qwerty)
           
         
         
           
             latinunicodeyz
-            <_description>Montenegrin (Latin Unicode qwerty)
+            Montenegrin (Latin Unicode qwerty)
           
         
         
           
             cyrillicalternatequotes
-            <_description>Montenegrin (Cyrillic with guillemets)
+            Montenegrin (Cyrillic with guillemets)
           
         
         
           
             latinalternatequotes
-            <_description>Montenegrin (Latin with guillemets)
+            Montenegrin (Latin with guillemets)
           
         
       
@@ -3916,9 +3916,9 @@
     
       
         mk
-        
-        <_shortDescription>mk
-        <_description>Macedonian
+        
+        mk
+        Macedonian
         
           mkd
         
@@ -3927,7 +3927,7 @@
         
           
             nodeadkeys
-            <_description>Macedonian (eliminate dead keys)
+            Macedonian (eliminate dead keys)
           
         
       
@@ -3935,9 +3935,9 @@
     
       
         mt
-        
-        <_shortDescription>mt
-        <_description>Maltese
+        
+        mt
+        Maltese
         
           mlt
         
@@ -3946,7 +3946,7 @@
         
           
             us
-            <_description>Maltese (with US layout)
+            Maltese (with US layout)
           
         
       
@@ -3954,9 +3954,9 @@
     
       
         mn
-        
-        <_shortDescription>mn
-        <_description>Mongolian
+        
+        mn
+        Mongolian
         
           mon
         
@@ -3966,9 +3966,9 @@
     
       
         no
-        
-        <_shortDescription>no
-        <_description>Norwegian
+        
+        no
+        Norwegian
         
           nor
           nob
@@ -3979,19 +3979,19 @@
         
           
             nodeadkeys
-            <_description>Norwegian (eliminate dead keys)
+            Norwegian (eliminate dead keys)
           
         
         
           
             dvorak
-            <_description>Norwegian (Dvorak)
+            Norwegian (Dvorak)
           
         
         
           
             smi
-            <_description>Northern Saami (Norway)
+            Northern Saami (Norway)
             
               sme
             
@@ -4000,7 +4000,7 @@
         
           
             smi_nodeadkeys
-            <_description>Northern Saami (Norway, eliminate dead keys)
+            Northern Saami (Norway, eliminate dead keys)
             
               sme
             
@@ -4009,19 +4009,19 @@
         
           
             mac
-            <_description>Norwegian (Macintosh)
+            Norwegian (Macintosh)
           
         
         
           
             mac_nodeadkeys
-            <_description>Norwegian (Macintosh, eliminate dead keys)
+            Norwegian (Macintosh, eliminate dead keys)
           
         
 	
           
             colemak
-            <_description>Norwegian (Colemak)
+            Norwegian (Colemak)
           
         
       
@@ -4029,9 +4029,9 @@
     
       
         pl
-        
-        <_shortDescription>pl
-        <_description>Polish
+        
+        pl
+        Polish
         
           pol
         
@@ -4040,37 +4040,37 @@
         
           
             legacy
-            <_description>Polish (legacy)
+            Polish (legacy)
           
         
         
           
             qwertz
-            <_description>Polish (qwertz)
+            Polish (qwertz)
           
         
         
           
             dvorak
-            <_description>Polish (Dvorak)
+            Polish (Dvorak)
           
         
         
           
             dvorak_quotes
-            <_description>Polish (Dvorak, Polish quotes on quotemark key)
+            Polish (Dvorak, Polish quotes on quotemark key)
           
         
         
           
             dvorak_altquotes
-            <_description>Polish (Dvorak, Polish quotes on key 1)
+            Polish (Dvorak, Polish quotes on key 1)
           
         
         
           
             csb
-            <_description>Kashubian
+            Kashubian
             
               csb
             
@@ -4086,9 +4086,9 @@
         
           
             ru_phonetic_dvorak
-            
-            <_shortDescription>ru
-            <_description>Russian (Poland, phonetic Dvorak)
+            
+            ru
+            Russian (Poland, phonetic Dvorak)
             
               rus
             
@@ -4097,7 +4097,7 @@
         
           
             dvp
-            <_description>Polish (programmer Dvorak)
+            Polish (programmer Dvorak)
           
         
       
@@ -4105,9 +4105,9 @@
     
       
         pt
-        
-        <_shortDescription>pt
-        <_description>Portuguese
+        
+        pt
+        Portuguese
         
           por
         
@@ -4116,49 +4116,49 @@
         
           
             nodeadkeys
-            <_description>Portuguese (eliminate dead keys)
+            Portuguese (eliminate dead keys)
           
         
         
           
             sundeadkeys
-            <_description>Portuguese (Sun dead keys)
+            Portuguese (Sun dead keys)
           
         
         
           
             mac
-            <_description>Portuguese (Macintosh)
+            Portuguese (Macintosh)
           
         
         
           
             mac_nodeadkeys
-            <_description>Portuguese (Macintosh, eliminate dead keys)
+            Portuguese (Macintosh, eliminate dead keys)
           
         
         
           
             mac_sundeadkeys
-            <_description>Portuguese (Macintosh, Sun dead keys)
+            Portuguese (Macintosh, Sun dead keys)
           
         
         
           
             nativo
-            <_description>Portuguese (Nativo)
+            Portuguese (Nativo)
           
         
         
           
             nativo-us
-            <_description>Portuguese (Nativo for US keyboards)
+            Portuguese (Nativo for US keyboards)
           
         
         
           
             nativo-epo
-            <_description>Esperanto (Portugal, Nativo)
+            Esperanto (Portugal, Nativo)
             
               epo
             
@@ -4169,9 +4169,9 @@
     
       
         ro
-        
-        <_shortDescription>ro
-        <_description>Romanian
+        
+        ro
+        Romanian
         
           rum
         
@@ -4180,25 +4180,25 @@
         
           
             cedilla
-            <_description>Romanian (cedilla)
+            Romanian (cedilla)
           
         
         
           
             std
-            <_description>Romanian (standard)
+            Romanian (standard)
           
         
         
           
             std_cedilla
-            <_description>Romanian (standard cedilla)
+            Romanian (standard cedilla)
           
         
         
           
             winkeys
-            <_description>Romanian (WinKeys)
+            Romanian (WinKeys)
           
         
       
@@ -4206,9 +4206,9 @@
     
       
         ru
-        
-        <_shortDescription>ru
-        <_description>Russian
+        
+        ru
+        Russian
         
           rus
         
@@ -4217,37 +4217,37 @@
         
           
             phonetic
-            <_description>Russian (phonetic)
+            Russian (phonetic)
           
         
         
           
             phonetic_winkeys
-            <_description>Russian (phonetic WinKeys)
+            Russian (phonetic WinKeys)
           
         
         
           
             typewriter
-            <_description>Russian (typewriter)
+            Russian (typewriter)
           
         
         
           
             legacy
-            <_description>Russian (legacy)
+            Russian (legacy)
           
         
         
           
             typewriter-legacy
-            <_description>Russian (typewriter, legacy)
+            Russian (typewriter, legacy)
           
         
         
           
             tt
-            <_description>Tatar
+            Tatar
             
               tat
             
@@ -4256,7 +4256,7 @@
         
           
             os_legacy
-            <_description>Ossetian (legacy)
+            Ossetian (legacy)
             
               oss
             
@@ -4265,7 +4265,7 @@
         
           
             os_winkeys
-            <_description>Ossetian (WinKeys)
+            Ossetian (WinKeys)
             
               oss
             
@@ -4274,7 +4274,7 @@
         
           
             cv
-            <_description>Chuvash
+            Chuvash
             
               chv
             
@@ -4283,7 +4283,7 @@
         
           
             cv_latin
-            <_description>Chuvash (Latin)
+            Chuvash (Latin)
             
               chv
             
@@ -4292,7 +4292,7 @@
         
           
             udm
-            <_description>Udmurt
+            Udmurt
             
               udm
             
@@ -4301,7 +4301,7 @@
         
           
             kom
-            <_description>Komi
+            Komi
             
               kom
             
@@ -4310,7 +4310,7 @@
         
           
             sah
-            <_description>Yakut
+            Yakut
             
               sah
             
@@ -4319,7 +4319,7 @@
         
           
             xal
-            <_description>Kalmyk
+            Kalmyk
             
               xal
             
@@ -4328,19 +4328,19 @@
         
           
             dos
-            <_description>Russian (DOS)
+            Russian (DOS)
           
         
         
           
             mac
-            <_description>Russian (Macintosh)
+            Russian (Macintosh)
           
         
         
           
             srp
-            <_description>Serbian (Russia)
+            Serbian (Russia)
             rus
                           srp
           
@@ -4348,7 +4348,7 @@
         
           
             bak
-            <_description>Bashkirian
+            Bashkirian
             
               bak
             
@@ -4357,7 +4357,7 @@
         
           
             chm
-            <_description>Mari
+            Mari
             
               chm
             
@@ -4368,9 +4368,9 @@
     
       
         rs
-        
-        <_shortDescription>sr
-        <_description>Serbian
+        
+        sr
+        Serbian
         
           srp
         
@@ -4379,49 +4379,49 @@
         
           
             yz
-            <_description>Serbian (Cyrillic, Z and ZHE swapped)
+            Serbian (Cyrillic, Z and ZHE swapped)
           
         
         
           
             latin
-            <_description>Serbian (Latin)
+            Serbian (Latin)
           
         
         
           
             latinunicode
-            <_description>Serbian (Latin Unicode)
+            Serbian (Latin Unicode)
           
         
         
           
             latinyz
-            <_description>Serbian (Latin qwerty)
+            Serbian (Latin qwerty)
           
         
         
           
             latinunicodeyz
-            <_description>Serbian (Latin Unicode qwerty)
+            Serbian (Latin Unicode qwerty)
           
         
         
           
             alternatequotes
-            <_description>Serbian (Cyrillic with guillemets)
+            Serbian (Cyrillic with guillemets)
           
         
         
           
             latinalternatequotes
-            <_description>Serbian (Latin with guillemets)
+            Serbian (Latin with guillemets)
           
         
         
           
             rue
-            <_description>Pannonian Rusyn
+            Pannonian Rusyn
             
               rue
             
@@ -4432,9 +4432,9 @@
     
       
         si
-        
-        <_shortDescription>sl
-        <_description>Slovenian
+        
+        sl
+        Slovenian
         
           slv
         
@@ -4443,13 +4443,13 @@
         
           
             alternatequotes
-            <_description>Slovenian (use guillemets for quotes)
+            Slovenian (use guillemets for quotes)
           
         
         
           
             us
-            <_description>Slovenian (US keyboard with Slovenian letters)
+            Slovenian (US keyboard with Slovenian letters)
           
         
       
@@ -4457,9 +4457,9 @@
     
       
         sk
-        
-        <_shortDescription>sk
-        <_description>Slovak
+        
+        sk
+        Slovak
         
           slo
         
@@ -4468,19 +4468,19 @@
         
           
             bksl
-            <_description>Slovak (extended Backslash)
+            Slovak (extended Backslash)
           
         
         
           
             qwerty
-            <_description>Slovak (qwerty)
+            Slovak (qwerty)
           
         
         
           
             qwerty_bksl
-            <_description>Slovak (qwerty, extended Backslash)
+            Slovak (qwerty, extended Backslash)
           
         
       
@@ -4488,9 +4488,9 @@
     
       
         es
-        
-        <_shortDescription>es
-        <_description>Spanish
+        
+        es
+        Spanish
         
           spa
         
@@ -4499,31 +4499,31 @@
         
           
             nodeadkeys
-            <_description>Spanish (eliminate dead keys)
+            Spanish (eliminate dead keys)
           
         
         
           
             deadtilde
-            <_description>Spanish (include dead tilde)
+            Spanish (include dead tilde)
           
         
         
           
             sundeadkeys
-            <_description>Spanish (Sun dead keys)
+            Spanish (Sun dead keys)
           
         
         
           
             dvorak
-            <_description>Spanish (Dvorak)
+            Spanish (Dvorak)
           
         
         
           
             ast
-            <_description>Asturian (Spain, with bottom-dot H and bottom-dot L)
+            Asturian (Spain, with bottom-dot H and bottom-dot L)
             
               ast
             
@@ -4532,7 +4532,7 @@
         
           
             cat
-            <_description>Catalan (Spain, with middle-dot L)
+            Catalan (Spain, with middle-dot L)
             
               cat
             
@@ -4541,7 +4541,7 @@
         
           
             mac
-            <_description>Spanish (Macintosh)
+            Spanish (Macintosh)
           
         
       
@@ -4549,9 +4549,9 @@
     
       
         se
-        
-        <_shortDescription>sv
-        <_description>Swedish
+        
+        sv
+        Swedish
         
           swe
         
@@ -4560,21 +4560,21 @@
         
           
             nodeadkeys
-            <_description>Swedish (eliminate dead keys)
+            Swedish (eliminate dead keys)
           
         
         
           
             dvorak
-            <_description>Swedish (Dvorak)
+            Swedish (Dvorak)
           
         
         
           
             rus
-            
-            <_shortDescription>ru
-            <_description>Russian (Sweden, phonetic)
+            
+            ru
+            Russian (Sweden, phonetic)
             
               rus
             
@@ -4583,9 +4583,9 @@
         
           
             rus_nodeadkeys
-            
-            <_shortDescription>ru
-            <_description>Russian (Sweden, phonetic, eliminate dead keys)
+            
+            ru
+            Russian (Sweden, phonetic, eliminate dead keys)
             
               rus
             
@@ -4594,7 +4594,7 @@
         
           
             smi
-            <_description>Northern Saami (Sweden)
+            Northern Saami (Sweden)
             
               sme
             
@@ -4603,19 +4603,19 @@
         
           
             mac
-            <_description>Swedish (Macintosh)
+            Swedish (Macintosh)
           
         
         
           
             svdvorak
-            <_description>Swedish (Svdvorak)
+            Swedish (Svdvorak)
           
         
         
           
             swl
-            <_description>Swedish Sign Language
+            Swedish Sign Language
             swl
           
         
@@ -4624,9 +4624,9 @@
     
       
         ch
-        
-        <_shortDescription>de
-        <_description>German (Switzerland)
+        
+        de
+        German (Switzerland)
         ger
                       gsw
       
@@ -4634,31 +4634,31 @@
         
           
             legacy
-            <_description>German (Switzerland, legacy)
+            German (Switzerland, legacy)
           
         
         
           
             de_nodeadkeys
-            
-            <_shortDescription>de
-            <_description>German (Switzerland, eliminate dead keys)
+            
+            de
+            German (Switzerland, eliminate dead keys)
           
         
         
           
             de_sundeadkeys
-            
-            <_shortDescription>de
-            <_description>German (Switzerland, Sun dead keys)
+            
+            de
+            German (Switzerland, Sun dead keys)
           
         
         
           
             fr
-            
-            <_shortDescription>fr
-            <_description>French (Switzerland)
+            
+            fr
+            French (Switzerland)
             
               fra
             
@@ -4667,9 +4667,9 @@
         
           
             fr_nodeadkeys
-            
-            <_shortDescription>fr
-            <_description>French (Switzerland, eliminate dead keys)
+            
+            fr
+            French (Switzerland, eliminate dead keys)
             
               fra
             
@@ -4678,9 +4678,9 @@
         
           
             fr_sundeadkeys
-            
-            <_shortDescription>fr
-            <_description>French (Switzerland, Sun dead keys)
+            
+            fr
+            French (Switzerland, Sun dead keys)
             
               fra
             
@@ -4689,9 +4689,9 @@
         
           
             fr_mac
-            
-            <_shortDescription>fr
-            <_description>French (Switzerland, Macintosh)
+            
+            fr
+            French (Switzerland, Macintosh)
             
               fra
             
@@ -4700,9 +4700,9 @@
         
           
             de_mac
-            
-            <_shortDescription>de
-            <_description>German (Switzerland, Macintosh)
+            
+            de
+            German (Switzerland, Macintosh)
           
         
       
@@ -4710,9 +4710,9 @@
     
       
         sy
-        
-        <_shortDescription>ar
-        <_description>Arabic (Syria)
+        
+        ar
+        Arabic (Syria)
         
           syr
         
@@ -4721,25 +4721,25 @@
         
           
             syc
-            
-            <_shortDescription>syc
-            <_description>Syriac
+            
+            syc
+            Syriac
           
         
         
           
             syc_phonetic
-            
-            <_shortDescription>syc
-            <_description>Syriac (phonetic)
+            
+            syc
+            Syriac (phonetic)
           
         
         
           
             ku
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Syria, Latin Q)
+            
+            ku
+            Kurdish (Syria, Latin Q)
             
               kur
             
@@ -4748,9 +4748,9 @@
         
           
             ku_f
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Syria, F)
+            
+            ku
+            Kurdish (Syria, F)
             
               kur
             
@@ -4759,9 +4759,9 @@
         
           
             ku_alt
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Syria, Latin Alt-Q)
+            
+            ku
+            Kurdish (Syria, Latin Alt-Q)
             
               kur
             
@@ -4772,9 +4772,9 @@
     
       
         tj
-        
-        <_shortDescription>tg
-        <_description>Tajik
+        
+        tg
+        Tajik
         
           tgk
         
@@ -4783,7 +4783,7 @@
         
           
             legacy
-            <_description>Tajik (legacy)
+            Tajik (legacy)
           
         
       
@@ -4791,9 +4791,9 @@
     
       
         lk
-        
-        <_shortDescription>si
-        <_description>Sinhala (phonetic)
+        
+        si
+        Sinhala (phonetic)
         
           sin
         
@@ -4802,9 +4802,9 @@
         
           
             tam_unicode
-            
-            <_shortDescription>ta
-            <_description>Tamil (Sri Lanka, Unicode)
+            
+            ta
+            Tamil (Sri Lanka, Unicode)
             
               tam
             
@@ -4813,7 +4813,7 @@
         
           
             tam_TAB
-            <_description>Tamil (Sri Lanka, TAB Typewriter)
+            Tamil (Sri Lanka, TAB Typewriter)
             
               tam
             
@@ -4824,9 +4824,9 @@
     
       
         th
-        
-        <_shortDescription>th
-        <_description>Thai
+        
+        th
+        Thai
         
           tha
         
@@ -4835,13 +4835,13 @@
         
           
             tis
-            <_description>Thai (TIS-820.2538)
+            Thai (TIS-820.2538)
           
         
         
           
             pat
-            <_description>Thai (Pattachote)
+            Thai (Pattachote)
           
         
       
@@ -4849,9 +4849,9 @@
     
       
         tr
-        
-        <_shortDescription>tr
-        <_description>Turkish
+        
+        tr
+        Turkish
         
           tur
         
@@ -4860,27 +4860,27 @@
         
           
             f
-            <_description>Turkish (F)
+            Turkish (F)
           
         
         
           
             alt
-            <_description>Turkish (Alt-Q)
+            Turkish (Alt-Q)
           
         
         
           
             sundeadkeys
-            <_description>Turkish (Sun dead keys)
+            Turkish (Sun dead keys)
           
         
         
           
             ku
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Turkey, Latin Q)
+            
+            ku
+            Kurdish (Turkey, Latin Q)
             
               kur
             
@@ -4889,9 +4889,9 @@
         
           
             ku_f
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Turkey, F)
+            
+            ku
+            Kurdish (Turkey, F)
             
               kur
             
@@ -4900,9 +4900,9 @@
         
           
             ku_alt
-            
-            <_shortDescription>ku
-            <_description>Kurdish (Turkey, Latin Alt-Q)
+            
+            ku
+            Kurdish (Turkey, Latin Alt-Q)
             
               kur
             
@@ -4911,15 +4911,15 @@
         
           
             intl
-            <_description>Turkish (international with dead keys)
+            Turkish (international with dead keys)
           
         
         
           
             crh
-            
-            <_shortDescription>crh
-            <_description>Crimean Tatar (Turkish Q)
+            
+            crh
+            Crimean Tatar (Turkish Q)
             
               crh
             
@@ -4928,9 +4928,9 @@
         
           
             crh_f
-            
-            <_shortDescription>crh
-            <_description>Crimean Tatar (Turkish F)
+            
+            crh
+            Crimean Tatar (Turkish F)
             
               crh
             
@@ -4939,9 +4939,9 @@
         
           
             crh_alt
-            
-            <_shortDescription>crh
-            <_description>Crimean Tatar (Turkish Alt-Q)
+            
+            crh
+            Crimean Tatar (Turkish Alt-Q)