Module Name:    src
Committed By:   mrg
Date:           Tue Aug 29 20:27:54 UTC 2017

Modified Files:
        src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
            evdev.lst

Log Message:
update for xkeyboard-config 2.21.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
    src/external/mit/xorg/lib/xkeyboard-config/rules/base \
    src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
    src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \
    src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10	Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base	Tue Aug 29 20:27:54 2017
@@ -126,7 +126,8 @@
               sven sven303 symplon \
               toshiba_s3000 trust trustda \
               unitekkb1925 yahoo \
-              teck227 teck229
+              teck227 teck229 \
+              apex300
 
 ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
 		cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
@@ -192,6 +193,7 @@
   thinkpad	=	thinkpad(intl)
   thinkpad60	=	thinkpad(60)
   thinkpadz60	=	thinkpad(60)
+  apex300	=	steelseries(apex300)
  $tmgeometries	=	typematrix(%m)
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10	Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst	Tue Aug 29 20:27:54 2017
@@ -1,24 +1,24 @@
 ! model
   pc101           Generic 101-key PC
-  pc102           Generic 102-key (Intl) PC
+  pc102           Generic 101-key PC (intl.)
   pc104           Generic 104-key PC
-  pc105           Generic 105-key (Intl) PC
+  pc105           Generic 105-key PC (intl.)
   dell101         Dell 101-key PC
-  latitude        Dell Latitude series laptop
-  dellm65         Dell Precision M65
+  latitude        Dell Latutude laptop
+  dellm65         Dell Precision M65 laptop
   everex          Everex STEPnote
   flexpro         Keytronic FlexPro
   microsoft       Microsoft Natural
   omnikey101      Northgate OmniKey 101
   winbook         Winbook Model XP5
-  pc98            PC-98xx Series
+  pc98            PC-98
   a4techKB21      A4Tech KB-21
   a4techKBS8      A4Tech KBS-8
   a4_rfkb23       A4Tech Wireless Desktop RFKB-23
   airkey          Acer AirKey V
-  azonaRF2300     Azona RF2300 wireless Internet Keyboard
+  azonaRF2300     Azona RF2300 wireless Internet
   scorpius        Advance Scorpius KI
-  brother         Brother Internet Keyboard
+  brother         Brother Internet
   btc5113rf       BTC 5113RF Multimedia
   btc5126t        BTC 5126T
   btc6301urf      BTC 6301URF
@@ -30,34 +30,34 @@
   btc9116u        BTC 9116U Mini Wireless Internet and Gaming
   cherryblue      Cherry Blue Line CyBo@rd
   cherryblueb     Cherry CyMotion Master XPress
-  cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherrybluea     Cherry Blue Line CyBo@rd (alt.)
   cherrycyboard   Cherry CyBo@rd USB-Hub
   cherrycmexpert  Cherry CyMotion Expert
   cherrybunlim    Cherry B.UNLIMITED
-  chicony         Chicony Internet Keyboard
+  chicony         Chicony Internet
   chicony0108     Chicony KU-0108
   chicony0420     Chicony KU-0420
   chicony9885     Chicony KB-9885
-  compaqeak8      Compaq Easy Access Keyboard
-  compaqik7       Compaq Internet Keyboard (7 keys)
-  compaqik13      Compaq Internet Keyboard (13 keys)
-  compaqik18      Compaq Internet Keyboard (18 keys)
+  compaqeak8      Compaq Easy Access
+  compaqik7       Compaq Internet (7 keys)
+  compaqik13      Compaq Internet (13 keys)
+  compaqik18      Compaq Internet (18 keys)
   cymotionlinux   Cherry CyMotion Master Linux
-  armada          Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-  presario        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
-  ipaq            Compaq iPaq Keyboard
+  armada          Compaq Armada laptop
+  presario        Compaq Presario laptop
+  ipaq            Compaq iPaq
   dell            Dell
   dellsk8125      Dell SK-8125
   dellsk8135      Dell SK-8135
-  dellusbmm       Dell USB Multimedia Keyboard
-  inspiron        Dell Laptop/notebook Inspiron 6xxx/8xxx
-  precision_m     Dell Laptop/notebook Precision M series
-  dexxa           Dexxa Wireless Desktop Keyboard
-  diamond         Diamond 9801 / 9802 series
+  dellusbmm       Dell USB Multimedia
+  inspiron        Dell Inspiron 6000/8000 laptop
+  precision_m     Dell Precision M laptop
+  dexxa           Dexxa Wireless Desktop
+  diamond         Diamond 9801/9802
   dtk2000         DTK2000
   ennyah_dkb1008  Ennyah DKB-1008
-  fscaa1667g      Fujitsu-Siemens Computers AMILO laptop
-  genius          Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  fscaa1667g      Fujitsu-Siemens Amilo laptop
+  genius          Genius Comfy KB-16M/Multimedia KWD-910
   geniuscomfy     Genius Comfy KB-12e
   geniuscomfy2    Genius Comfy KB-21e-Scroll
   geniuskb19e     Genius KB-19e NB
@@ -65,127 +65,128 @@
   gyration        Gyration
   htcdream        HTC Dream
   kinesis         Kinesis
-  logitech_base   Logitech Generic Keyboard
+  logitech_base   Logitech
   logitech_g15    Logitech G15 extra keys via G15daemon
-  hpi6            Hewlett-Packard Internet Keyboard
-  hp250x          Hewlett-Packard SK-250x Multimedia Keyboard
+  hpi6            Hewlett-Packard Internet
+  hp250x          Hewlett-Packard NEC SK-2500 Multimedia
   hpxe3gc         Hewlett-Packard Omnibook XE3 GC
   hpxe3gf         Hewlett-Packard Omnibook XE3 GF
   hpxt1000        Hewlett-Packard Omnibook XT1000
   hpdv5           Hewlett-Packard Pavilion dv5
-  hpzt11xx        Hewlett-Packard Pavilion ZT11xx
+  hpzt11xx        Hewlett-Packard Pavilion ZT1100
   hp500fa         Hewlett-Packard Omnibook 500 FA
-  hp5xx           Hewlett-Packard Omnibook 5xx
+  hp5xx           Hewlett-Packard Omnibook 500
   hpnx9020        Hewlett-Packard nx9020
   hp6000          Hewlett-Packard Omnibook 6000/6100
   honeywell_euroboard Honeywell Euroboard
-  hpmini110       Hewlett-Packard Mini 110 Notebook
+  hpmini110       Hewlett-Packard Mini 110 laptop
   rapidaccess     IBM Rapid Access
   rapidaccess2    IBM Rapid Access II
   thinkpad        IBM ThinkPad 560Z/600/600E/A22E
   thinkpad60      IBM ThinkPad R60/T60/R61/T61
   thinkpadz60     IBM ThinkPad Z60m/Z60t/Z61m/Z61t
   ibm_spacesaver  IBM Space Saver
-  logiaccess      Logitech Access Keyboard
+  logiaccess      Logitech Access
   logiclx300      Logitech Cordless Desktop LX-300
-  logii350        Logitech Internet 350 Keyboard
-  logimel         Logitech Media Elite Keyboard
+  logii350        Logitech Internet 350
+  logimel         Logitech Internet 350
   logicd          Logitech Cordless Desktop
   logicd_it       Logitech Cordless Desktop iTouch
   logicd_nav      Logitech Cordless Desktop Navigator
   logicd_opt      Logitech Cordless Desktop Optical
-  logicda         Logitech Cordless Desktop (alternate option)
-  logicdpa2       Logitech Cordless Desktop Pro (alternate option 2)
+  logicda         Logitech Cordless Desktop (alt.)
+  logicdpa2       Logitech Cordless Desktop Pro (2nd alt.)
   logicfn         Logitech Cordless Freedom/Desktop Navigator
   logicdn         Logitech Cordless Desktop Navigator
-  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
-  logiik          Logitech Internet Keyboard
+  logiitc         Logitech iTouch Cordless Y-RB6
+  logiik          Logitech Internet
   itouch          Logitech iTouch
-  logicink        Logitech Internet Navigator Keyboard
+  logicink        Logitech Internet Navigator
   logiex110       Logitech Cordless Desktop EX110
-  logiinkse       Logitech iTouch Internet Navigator Keyboard SE
-  logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
-  logiultrax      Logitech Ultra-X Keyboard
-  logiultraxc     Logitech Ultra-X Cordless Media Desktop Keyboard
-  logidinovo      Logitech diNovo Keyboard
-  logidinovoedge  Logitech diNovo Edge Keyboard
+  logiinkse       Logitech iTouch Internet Navigator SE
+  logiinkseusb    Logitech iTouch Internet Navigator SE USB
+  logiultrax      Logitech Ultra-X
+  logiultraxc     Logitech Ultra-X Cordless Media Desktop
+  logidinovo      Logitech diNovo
+  logidinovoedge  Logitech diNovo Edge
   mx1998          Memorex MX1998
-  mx2500          Memorex MX2500 EZ-Access Keyboard
+  mx2500          Memorex MX2500 EZ-Access
   mx2750          Memorex MX2750
-  microsoft4000   Microsoft Natural Ergonomic Keyboard 4000
-  microsoft7000   Microsoft Natural Wireless Ergonomic Keyboard 7000
-  microsoftinet   Microsoft Internet Keyboard
-  microsoftpro    Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-  microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
-  microsoftprooem Microsoft Natural Keyboard Pro OEM
-  vsonku306       ViewSonic KU-306 Internet Keyboard
-  microsoftprose  Microsoft Internet Keyboard Pro, Swedish
+  microsoft4000   Microsoft Natural Ergonomic 4000
+  microsoft7000   Microsoft Natural Wireless Ergonomic 7000
+  microsoftinet   Microsoft Internet
+  microsoftpro    Microsoft Natural Pro/Internet Pro
+  microsoftprousb Microsoft Natural Pro USB/Internet Pro
+  microsoftprooem Microsoft Natural Pro OEM
+  vsonku306       ViewSonic KU-306 Internet
+  microsoftprose  Microsoft Internet Pro (Swedish)
   microsoftoffice Microsoft Office Keyboard
-  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
-  microsoftelite  Microsoft Natural Keyboard Elite
-  microsoftccurve2k Microsoft Comfort Curve Keyboard 2000
-  oretec          Ortek MCK-800 MM/Internet keyboard
-  propeller       Propeller Voyager (KTEZ-1000)
+  microsoftmult   Microsoft Wireless Multimedia 1.0A
+  microsoftelite  Microsoft Natural Elite
+  microsoftccurve2k Microsoft Comfort Curve 2000
+  oretec          Ortek Multimedia/Internet MCK-800
+  propeller       Propeller Voyager KTEZ-1000
   qtronix         QTronix Scorpius 98N+
   samsung4500     Samsung SDM 4500P
   samsung4510     Samsung SDM 4510P
   sanwaskbkg3     Sanwa Supply SKB-KG3
-  sk1300          SK-1300
-  sk2500          SK-2500
-  sk6200          SK-6200
-  sk7100          SK-7100
-  sp_inet         Super Power Multimedia Keyboard
+  sk1300          NEC SK-1300
+  sk2500          NEC SK-2500
+  sk6200          NEC SK-6200
+  sk7100          NEC SK-7100
+  sp_inet         Super Power Multimedia
   sven            SVEN Ergonomic 2500
   sven303         SVEN Slim 303
-  symplon         Symplon PaceBook (tablet PC)
+  symplon         Symplon PaceBook tablet
   toshiba_s3000   Toshiba Satellite S3000
-  trust           Trust Wireless Keyboard Classic
-  trustda         Trust Direct Access Keyboard
+  trust           Trust Wireless Classic
+  trustda         Trust Direct Access
   trust_slimline  Trust Slimline
   tm2020          TypeMatrix EZ-Reach 2020
   tm2030PS2       TypeMatrix EZ-Reach 2030 PS2
   tm2030USB       TypeMatrix EZ-Reach 2030 USB
   tm2030USB-102   TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)
   tm2030USB-106   TypeMatrix EZ-Reach 2030 USB (106:JP mode)
-  yahoo           Yahoo! Internet Keyboard
+  yahoo           Yahoo! Internet
   macbook78       MacBook/MacBook Pro
-  macbook79       MacBook/MacBook Pro (Intl)
+  macbook79       MacBook/MacBook Pro (intl.)
   macintosh       Macintosh
   macintosh_old   Macintosh Old
-  macintosh_hhk   Happy Hacking Keyboard for Mac
+  macintosh_hhk   Happy Hacking for Mac
   acer_c300       Acer C300
   acer_ferrari4k  Acer Ferrari 4000
-  acer_laptop     Acer Laptop
-  asus_laptop     Asus Laptop
+  acer_laptop     Acer laptop
+  asus_laptop     Asus laptop
   apple           Apple
-  apple_laptop    Apple Laptop
-  applealu_ansi   Apple Aluminium Keyboard (ANSI)
-  applealu_iso    Apple Aluminium Keyboard (ISO)
-  applealu_jis    Apple Aluminium Keyboard (JIS)
-  silvercrest     SILVERCREST Multimedia Wireless Keyboard
-  emachines       Laptop/notebook eMachines m68xx
+  apple_laptop    Apple laptop
+  applealu_ansi   Apple Aluminium (ANSI)
+  applealu_iso    Apple Aluminium (ISO)
+  applealu_jis    Apple Aluminium (JIS)
+  silvercrest     Silvercrest Multimedia Wireless
+  emachines       eMachines m6800 laptop
   benqx           BenQ X-Touch
   benqx730        BenQ X-Touch 730
   benqx800        BenQ X-Touch 800
-  hhk             Happy Hacking Keyboard
+  hhk             Happy Hacking
   classmate       Classmate PC
   olpc            OLPC
   sun_type7_usb   Sun Type 7 USB
-  sun_type7_euro_usb Sun Type 7 USB (European layout)
-  sun_type7_unix_usb Sun Type 7 USB (Unix layout)
-  sun_type7_jp_usb Sun Type 7 USB (Japanese layout) / Japanese 106-key
+  sun_type7_euro_usb Sun Type 7 USB (European)
+  sun_type7_unix_usb Sun Type 7 USB (Unix)
+  sun_type7_jp_usb Sun Type 7 USB (Japanese)/Japanese 106-key
   sun_type6_usb   Sun Type 6/7 USB
-  sun_type6_euro_usb Sun Type 6/7 USB (European layout)
-  sun_type6_unix_usb Sun Type 6 USB (Unix layout)
-  sun_type6_jp_usb Sun Type 6 USB (Japanese layout)
-  sun_type6_jp    Sun Type 6 (Japanese layout)
+  sun_type6_euro_usb Sun Type 6/7 USB (European)
+  sun_type6_unix_usb Sun Type 6 USB (Unix)
+  sun_type6_jp_usb Sun Type 6 USB (Japanese)
+  sun_type6_jp    Sun Type 6 (Japanese)
   targa_v811      Targa Visionary 811
   unitekkb1925    Unitek KB-1925
   compalfl90      FL90
   creativedw7000  Creative Desktop Wireless 7000
   htcdream        Htc Dream phone
-  teck227         Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
-  teck229         Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
+  teck227         Truly Ergonomic 227
+  teck229         Truly Ergonomic 229
+  apex300         SteelSeries Apex 300 (Apex RAW)
 
 ! layout
   us              English (US)
@@ -202,7 +203,7 @@
   ba              Bosnian
   br              Portuguese (Brazil)
   bg              Bulgarian
-  dz              Berber (Algeria, Latin characters)
+  dz              Berber (Algeria, Latin)
   ma              Arabic (Morocco)
   cm              English (Cameroon)
   mm              Burmese
@@ -264,7 +265,7 @@
   uz              Uzbek
   vn              Vietnamese
   kr              Korean
-  nec_vndr/jp     Japanese (PC-98xx Series)
+  nec_vndr/jp     Japanese (PC-98)
   ie              Irish
   pk              Urdu (Pakistan)
   mv              Dhivehi
@@ -285,68 +286,67 @@
   md              Moldavian
   id              Indonesian (Jawi)
   my              Malay (Jawi)
-  bn              Malay (Jawi)
 
 ! variant
   chr             us: Cherokee
-  euro            us: English (US, with euro on 5)
-  intl            us: English (US, international with dead keys)
-  alt-intl        us: English (US, alternative international)
+  euro            us: English (US, euro on 5)
+  intl            us: English (US, intl., with dead keys)
+  alt-intl        us: English (US, alt. intl.)
   colemak         us: English (Colemak)
   dvorak          us: English (Dvorak)
-  dvorak-intl     us: English (Dvorak, international with dead keys)
-  dvorak-alt-intl us: English (Dvorak alternative international no dead keys)
-  dvorak-l        us: English (left handed Dvorak)
-  dvorak-r        us: English (right handed Dvorak)
+  dvorak-intl     us: English (Dvorak, intl., with dead keys)
+  dvorak-alt-intl us: English (Dvorak, alt. intl.)
+  dvorak-l        us: English (Dvorak, left-handed)
+  dvorak-r        us: English (Dvorak, right-handed)
   dvorak-classic  us: English (classic Dvorak)
-  dvp             us: English (Programmer Dvorak)
+  dvp             us: English (programmer Dvorak)
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
-  altgr-intl      us: English (international AltGr dead keys)
+  altgr-intl      us: English (intl., with dead keys)
   olpc2           us: English (the divide/multiply keys toggle the layout)
   hbs             us: Serbo-Croatian (US)
   workman         us: English (Workman)
-  workman-intl    us: English (Workman, international with dead keys)
+  workman-intl    us: English (Workman, intl., with dead keys)
   ps              af: Pashto
   uz              af: Uzbek (Afghanistan)
   olpc-ps         af: Pashto (Afghanistan, OLPC)
   fa-olpc         af: Persian (Afghanistan, Dari OLPC)
   uz-olpc         af: Uzbek (Afghanistan, OLPC)
-  azerty          ara: Arabic (azerty)
-  azerty_digits   ara: Arabic (azerty/digits)
+  azerty          ara: Arabic (AZERTY)
+  azerty_digits   ara: Arabic (AZERTY/digits)
   digits          ara: Arabic (digits)
-  qwerty          ara: Arabic (qwerty)
+  qwerty          ara: Arabic (QWERTY)
   qwerty_digits   ara: Arabic (qwerty/digits)
   buckwalter      ara: Arabic (Buckwalter)
   mac             ara: Arabic (Macintosh)
-  plisi-d1        al: Albanian (Plisi D1)
+  plisi           al: Albanian (Plisi)
   phonetic        am: Armenian (phonetic)
-  phonetic-alt    am: Armenian (alternative phonetic)
+  phonetic-alt    am: Armenian (alt. phonetic)
   eastern         am: Armenian (eastern)
   western         am: Armenian (western)
-  eastern-alt     am: Armenian (alternative eastern)
-  nodeadkeys      at: German (Austria, eliminate dead keys)
-  sundeadkeys     at: German (Austria, Sun dead keys)
+  eastern-alt     am: Armenian (alt. eastern)
+  nodeadkeys      at: German (Austria, no dead keys)
+  sundeadkeys     at: German (Austria, with Sun dead keys)
   mac             at: German (Austria, Macintosh)
   cyrillic        az: Azerbaijani (Cyrillic)
   legacy          by: Belarusian (legacy)
   latin           by: Belarusian (Latin)
-  oss             be: Belgian (alternative)
-  oss_latin9      be: Belgian (alternative, Latin-9 only)
-  oss_sundeadkeys be: Belgian (alternative, Sun dead keys)
-  iso-alternate   be: Belgian (ISO alternate)
-  nodeadkeys      be: Belgian (eliminate dead keys)
-  sundeadkeys     be: Belgian (Sun dead keys)
-  wang            be: Belgian (Wang model 724 azerty)
+  oss             be: Belgian (alt.)
+  oss_latin9      be: Belgian (alt., Latin-9 only)
+  oss_sundeadkeys be: Belgian (alt., with Sun dead keys)
+  iso-alternate   be: Belgian (alt. ISO)
+  nodeadkeys      be: Belgian (no dead keys)
+  sundeadkeys     be: Belgian (with Sun dead keys)
+  wang            be: Belgian (Wang 724 AZERTY)
   urd-phonetic    in: Urdu (phonetic)
-  urd-phonetic3   in: Urdu (alternative phonetic)
-  urd-winkeys     in: Urdu (WinKeys)
-  eng             in: English (India, with rupee sign)
-  alternatequotes ba: Bosnian (with guillemets for quotes)
+  urd-phonetic3   in: Urdu (alt. phonetic)
+  urd-winkeys     in: Urdu (Win keys)
+  eng             in: English (India, with rupee)
+  alternatequotes ba: Bosnian (with guillements)
   unicode         ba: Bosnian (with Bosnian digraphs)
-  unicodeus       ba: Bosnian (US keyboard with Bosnian digraphs)
-  us              ba: Bosnian (US keyboard with Bosnian letters)
-  nodeadkeys      br: Portuguese (Brazil, eliminate dead keys)
+  unicodeus       ba: Bosnian (US, with Bosnian digraphs)
+  us              ba: Bosnian (US, with Bosnian letters)
+  nodeadkeys      br: Portuguese (Brazil, no dead keys)
   dvorak          br: Portuguese (Brazil, Dvorak)
   nativo          br: Portuguese (Brazil, Nativo)
   nativo-us       br: Portuguese (Brazil, Nativo for US keyboards)
@@ -354,51 +354,51 @@
   thinkpad        br: Portuguese (Brazil, IBM/Lenovo ThinkPad)
   phonetic        bg: Bulgarian (traditional phonetic)
   bas_phonetic    bg: Bulgarian (new phonetic)
-  ber             dz: Berber (Algeria, Tifinagh characters)
+  ber             dz: Berber (Algeria, Tifinagh)
   ar              dz: Arabic (Algeria)
   french          ma: French (Morocco)
   tifinagh        ma: Berber (Morocco, Tifinagh)
-  tifinagh-alt    ma: Berber (Morocco, Tifinagh alternative)
-  tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alternative phonetic)
+  tifinagh-alt    ma: Berber (Morocco, Tifinagh alt.)
+  tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alt. phonetic)
   tifinagh-extended ma: Berber (Morocco, Tifinagh extended)
   tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic)
   tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic)
   french          cm: French (Cameroon)
-  qwerty          cm: Cameroon Multilingual (qwerty)
-  azerty          cm: Cameroon Multilingual (azerty)
+  qwerty          cm: Cameroon Multilingual (QWERTY)
+  azerty          cm: Cameroon Multilingual (AZERTY)
   dvorak          cm: Cameroon Multilingual (Dvorak)
   mmuock          cm: Mmuock
   fr-dvorak       ca: French (Canada, Dvorak)
   fr-legacy       ca: French (Canada, legacy)
   multix          ca: Canadian Multilingual
-  multi           ca: Canadian Multilingual (first part)
-  multi-2gr       ca: Canadian Multilingual (second part)
+  multi           ca: Canadian Multilingual (1st part)
+  multi-2gr       ca: Canadian Multilingual (2nd part)
   ike             ca: Inuktitut
   eng             ca: English (Canada)
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
   ug              cn: Uyghur
-  alternatequotes hr: Croatian (with guillemets for quotes)
+  alternatequotes hr: Croatian (with guillements)
   unicode         hr: Croatian (with Croatian digraphs)
-  unicodeus       hr: Croatian (US keyboard with Croatian digraphs)
-  us              hr: Croatian (US keyboard with Croatian letters)
+  unicodeus       hr: Croatian (US, with Croatian digraphs)
+  us              hr: Croatian (US, with Croatian letters)
   bksl            cz: Czech (with <\|> key)
-  qwerty          cz: Czech (qwerty)
-  qwerty_bksl     cz: Czech (qwerty, extended Backslash)
-  ucw             cz: Czech (UCW layout, accented letters only)
-  dvorak-ucw      cz: Czech (US Dvorak with CZ UCW support)
+  qwerty          cz: Czech (QWERTY)
+  qwerty_bksl     cz: Czech (QWERTY, extended backslash)
+  ucw             cz: Czech (UCW, only accented letters)
+  dvorak-ucw      cz: Czech (US, Dvorak, UCW support)
   rus             cz: Russian (Czech, phonetic)
-  nodeadkeys      dk: Danish (eliminate dead keys)
-  winkeys         dk: Danish (Winkeys)
+  nodeadkeys      dk: Danish (no dead keys)
+  winkeys         dk: Danish (Win keys)
   mac             dk: Danish (Macintosh)
-  mac_nodeadkeys  dk: Danish (Macintosh, eliminate dead keys)
+  mac_nodeadkeys  dk: Danish (Macintosh, no dead keys)
   dvorak          dk: Danish (Dvorak)
-  sundeadkeys     nl: Dutch (Sun dead keys)
+  sundeadkeys     nl: Dutch (with Sun dead keys)
   mac             nl: Dutch (Macintosh)
   std             nl: Dutch (standard)
-  nodeadkeys      ee: Estonian (eliminate dead keys)
+  nodeadkeys      ee: Estonian (no dead keys)
   dvorak          ee: Estonian (Dvorak)
-  us              ee: Estonian (US keyboard with Estonian letters)
+  us              ee: Estonian (US, with Estonian letters)
   pes_keypad      ir: Persian (with Persian keypad)
   ku              ir: Kurdish (Iran, Latin Q)
   ku_f            ir: Kurdish (Iran, F)
@@ -408,26 +408,26 @@
   ku_f            iq: Kurdish (Iraq, F)
   ku_alt          iq: Kurdish (Iraq, Latin Alt-Q)
   ku_ara          iq: Kurdish (Iraq, Arabic-Latin)
-  nodeadkeys      fo: Faroese (eliminate dead keys)
+  nodeadkeys      fo: Faroese (no dead keys)
   classic         fi: Finnish (classic)
-  nodeadkeys      fi: Finnish (classic, eliminate dead keys)
+  nodeadkeys      fi: Finnish (classic, no dead keys)
   winkeys         fi: Finnish (Winkeys)
   smi             fi: Northern Saami (Finland)
   mac             fi: Finnish (Macintosh)
-  nodeadkeys      fr: French (eliminate dead keys)
-  sundeadkeys     fr: French (Sun dead keys)
-  oss             fr: French (alternative)
-  oss_latin9      fr: French (alternative, Latin-9 only)
-  oss_nodeadkeys  fr: French (alternative, eliminate dead keys)
-  oss_sundeadkeys fr: French (alternative, Sun dead keys)
-  latin9          fr: French (legacy, alternative)
-  latin9_nodeadkeys fr: French (legacy, alternative, eliminate dead keys)
-  latin9_sundeadkeys fr: French (legacy, alternative, Sun dead keys)
+  nodeadkeys      fr: French (no dead keys)
+  sundeadkeys     fr: French (with Sun dead keys)
+  oss             fr: French (alt.)
+  oss_latin9      fr: French (alt., Latin-9 only)
+  oss_nodeadkeys  fr: French (alt., no dead keys)
+  oss_sundeadkeys fr: French (alt., with Sun dead keys)
+  latin9          fr: French (legacy, alt.)
+  latin9_nodeadkeys fr: French (legacy, alt., no dead keys)
+  latin9_sundeadkeys fr: French (legacy, alt., with Sun dead keys)
   bepo            fr: French (Bepo, ergonomic, Dvorak way)
   bepo_latin9     fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
   dvorak          fr: French (Dvorak)
   mac             fr: French (Macintosh)
-  azerty          fr: French (Azerty)
+  azerty          fr: French (AZERTY)
   bre             fr: French (Breton)
   oci             fr: Occitan
   geo             fr: Georgian (France, AZERTY Tskapo)
@@ -436,7 +436,7 @@
   ewe             gh: Ewe
   fula            gh: Fula
   ga              gh: Ga
-  hausa           gh: Hausa
+  hausa           gh: Hausa (Ghana)
   avn             gh: Avatime
   gillbt          gh: English (Ghana, GILLBT)
   ergonomic       ge: Georgian (ergonomic)
@@ -445,56 +445,56 @@
   os              ge: Ossetian (Georgia)
   deadacute       de: German (dead acute)
   deadgraveacute  de: German (dead grave acute)
-  nodeadkeys      de: German (eliminate dead keys)
+  nodeadkeys      de: German (no dead keys)
   T3              de: German (T3)
   ro              de: Romanian (Germany)
-  ro_nodeadkeys   de: Romanian (Germany, eliminate dead keys)
+  ro_nodeadkeys   de: Romanian (Germany, no dead keys)
   dvorak          de: German (Dvorak)
-  sundeadkeys     de: German (Sun dead keys)
+  sundeadkeys     de: German (with Sun dead keys)
   neo             de: German (Neo 2)
   mac             de: German (Macintosh)
-  mac_nodeadkeys  de: German (Macintosh, eliminate dead keys)
+  mac_nodeadkeys  de: German (Macintosh, no dead keys)
   dsb             de: Lower Sorbian
-  dsb_qwertz      de: Lower Sorbian (qwertz)
-  qwerty          de: German (qwerty)
+  dsb_qwertz      de: Lower Sorbian (QWERTZ)
+  qwerty          de: German (QWERTY)
   tr              de: Turkish (Germany)
   ru              de: Russian (Germany, phonetic)
   deadtilde       de: German (dead tilde)
   simple          gr: Greek (simple)
   extended        gr: Greek (extended)
-  nodeadkeys      gr: Greek (eliminate dead keys)
+  nodeadkeys      gr: Greek (no dead keys)
   polytonic       gr: Greek (polytonic)
   standard        hu: Hungarian (standard)
-  nodeadkeys      hu: Hungarian (eliminate dead keys)
-  qwerty          hu: Hungarian (qwerty)
-  101_qwertz_comma_dead hu: Hungarian (101/qwertz/comma/dead keys)
-  101_qwertz_comma_nodead hu: Hungarian (101/qwertz/comma/eliminate dead keys)
-  101_qwertz_dot_dead hu: Hungarian (101/qwertz/dot/dead keys)
-  101_qwertz_dot_nodead hu: Hungarian (101/qwertz/dot/eliminate dead keys)
-  101_qwerty_comma_dead hu: Hungarian (101/qwerty/comma/dead keys)
-  101_qwerty_comma_nodead hu: Hungarian (101/qwerty/comma/eliminate dead keys)
-  101_qwerty_dot_dead hu: Hungarian (101/qwerty/dot/dead keys)
-  101_qwerty_dot_nodead hu: Hungarian (101/qwerty/dot/eliminate dead keys)
-  102_qwertz_comma_dead hu: Hungarian (102/qwertz/comma/dead keys)
-  102_qwertz_comma_nodead hu: Hungarian (102/qwertz/comma/eliminate dead keys)
-  102_qwertz_dot_dead hu: Hungarian (102/qwertz/dot/dead keys)
-  102_qwertz_dot_nodead hu: Hungarian (102/qwertz/dot/eliminate dead keys)
-  102_qwerty_comma_dead hu: Hungarian (102/qwerty/comma/dead keys)
-  102_qwerty_comma_nodead hu: Hungarian (102/qwerty/comma/eliminate dead keys)
-  102_qwerty_dot_dead hu: Hungarian (102/qwerty/dot/dead keys)
-  102_qwerty_dot_nodead hu: Hungarian (102/qwerty/dot/eliminate dead keys)
-  Sundeadkeys     is: Icelandic (Sun dead keys)
-  nodeadkeys      is: Icelandic (eliminate dead keys)
+  nodeadkeys      hu: Hungarian (no dead keys)
+  qwerty          hu: Hungarian (QWERTY)
+  101_qwertz_comma_dead hu: Hungarian (101/QWERTZ/comma/dead keys)
+  101_qwertz_comma_nodead hu: Hungarian (101/QWERTZ/comma/no dead keys)
+  101_qwertz_dot_dead hu: Hungarian (101/QWERTZ/dot/dead keys)
+  101_qwertz_dot_nodead hu: Hungarian (101/QWERTZ/dot/no dead keys)
+  101_qwerty_comma_dead hu: Hungarian (101/QWERTY/comma/dead keys)
+  101_qwerty_comma_nodead hu: Hungarian (101/QWERTY/comma/no dead keys)
+  101_qwerty_dot_dead hu: Hungarian (101/QWERTY/dot/dead keys)
+  101_qwerty_dot_nodead hu: Hungarian (101/QWERTY/dot/no dead keys)
+  102_qwertz_comma_dead hu: Hungarian (102/QWERTZ/comma/dead keys)
+  102_qwertz_comma_nodead hu: Hungarian (102/QWERTZ/comma/no dead keys)
+  102_qwertz_dot_dead hu: Hungarian (102/QWERTZ/dot/dead keys)
+  102_qwertz_dot_nodead hu: Hungarian (102/QWERTZ/dot/no dead keys)
+  102_qwerty_comma_dead hu: Hungarian (102/QWERTY/comma/dead keys)
+  102_qwerty_comma_nodead hu: Hungarian (102/QWERTY/comma/no dead keys)
+  102_qwerty_dot_dead hu: Hungarian (102/QWERTY/dot/dead keys)
+  102_qwerty_dot_nodead hu: Hungarian (102/QWERTY/dot/no dead keys)
+  Sundeadkeys     is: Icelandic (with Sun dead keys)
+  nodeadkeys      is: Icelandic (no dead keys)
   mac_legacy      is: Icelandic (Macintosh, legacy)
   mac             is: Icelandic (Macintosh)
   dvorak          is: Icelandic (Dvorak)
   lyx             il: Hebrew (lyx)
   phonetic        il: Hebrew (phonetic)
   biblical        il: Hebrew (Biblical, Tiro)
-  nodeadkeys      it: Italian (eliminate dead keys)
+  nodeadkeys      it: Italian (no dead keys)
   winkeys         it: Italian (Winkeys)
   mac             it: Italian (Macintosh)
-  us              it: Italian (US keyboard with Italian letters)
+  us              it: Italian (US, with Italian letters)
   geo             it: Georgian (Italy)
   ibm             it: Italian (IBM 142)
   kana            jp: Japanese (Kana)
@@ -507,67 +507,67 @@
   kazrus          kz: Kazakh (with Russian)
   ext             kz: Kazakh (extended)
   stea            la: Lao (STEA proposed standard layout)
-  nodeadkeys      latam: Spanish (Latin American, eliminate dead keys)
-  deadtilde       latam: Spanish (Latin American, include dead tilde)
-  sundeadkeys     latam: Spanish (Latin American, Sun dead keys)
+  nodeadkeys      latam: Spanish (Latin American, no dead keys)
+  deadtilde       latam: Spanish (Latin American, dead tilde)
+  sundeadkeys     latam: Spanish (Latin American, with Sun dead keys)
   dvorak          latam: Spanish (Latin American, Dvorak)
   std             lt: Lithuanian (standard)
-  us              lt: Lithuanian (US keyboard with Lithuanian letters)
+  us              lt: Lithuanian (US, with Lithuanian letters)
   ibm             lt: Lithuanian (IBM LST 1205-92)
   lekp            lt: Lithuanian (LEKP)
   lekpa           lt: Lithuanian (LEKPa)
-  apostrophe      lv: Latvian (apostrophe variant)
-  tilde           lv: Latvian (tilde variant)
-  fkey            lv: Latvian (F variant)
+  apostrophe      lv: Latvian (apostrophe)
+  tilde           lv: Latvian (tilde)
+  fkey            lv: Latvian (F)
   modern          lv: Latvian (modern)
   ergonomic       lv: Latvian (ergonomic, ŪGJRMV)
   adapted         lv: Latvian (adapted)
   cyrillic        me: Montenegrin (Cyrillic)
   cyrillicyz      me: Montenegrin (Cyrillic, ZE and ZHE swapped)
-  latinunicode    me: Montenegrin (Latin Unicode)
-  latinyz         me: Montenegrin (Latin qwerty)
-  latinunicodeyz  me: Montenegrin (Latin Unicode qwerty)
+  latinunicode    me: Montenegrin (Latin, Unicode)
+  latinyz         me: Montenegrin (Latin, QWERTY)
+  latinunicodeyz  me: Montenegrin (Latin, Unicode, QWERTY)
   cyrillicalternatequotes me: Montenegrin (Cyrillic with guillemets)
   latinalternatequotes me: Montenegrin (Latin with guillemets)
-  nodeadkeys      mk: Macedonian (eliminate dead keys)
+  nodeadkeys      mk: Macedonian (no dead keys)
   us              mt: Maltese (with US layout)
-  nodeadkeys      no: Norwegian (eliminate dead keys)
-  winkeys         no: Norwegian (Winkeys)
+  nodeadkeys      no: Norwegian (no dead keys)
+  winkeys         no: Norwegian (Win keys)
   dvorak          no: Norwegian (Dvorak)
   smi             no: Northern Saami (Norway)
-  smi_nodeadkeys  no: Northern Saami (Norway, eliminate dead keys)
+  smi_nodeadkeys  no: Northern Saami (Norway, no dead keys)
   mac             no: Norwegian (Macintosh)
-  mac_nodeadkeys  no: Norwegian (Macintosh, eliminate dead keys)
+  mac_nodeadkeys  no: Norwegian (Macintosh, no dead keys)
   colemak         no: Norwegian (Colemak)
   legacy          pl: Polish (legacy)
-  qwertz          pl: Polish (qwertz)
+  qwertz          pl: Polish (QWERTZ)
   dvorak          pl: Polish (Dvorak)
-  dvorak_quotes   pl: Polish (Dvorak, Polish quotes on quotemark key)
-  dvorak_altquotes pl: Polish (Dvorak, Polish quotes on key 1)
+  dvorak_quotes   pl: Polish (Dvorak, with Polish quotes on quotemark key)
+  dvorak_altquotes pl: Polish (Dvorak, with Polish quotes on key 1)
   csb             pl: Kashubian
   szl             pl: Silesian
   ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
   dvp             pl: Polish (programmer Dvorak)
-  nodeadkeys      pt: Portuguese (eliminate dead keys)
-  sundeadkeys     pt: Portuguese (Sun dead keys)
+  nodeadkeys      pt: Portuguese (no dead keys)
+  sundeadkeys     pt: Portuguese (with Sun dead keys)
   mac             pt: Portuguese (Macintosh)
-  mac_nodeadkeys  pt: Portuguese (Macintosh, eliminate dead keys)
-  mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
+  mac_nodeadkeys  pt: Portuguese (Macintosh, no dead keys)
+  mac_sundeadkeys pt: Portuguese (Macintosh, with Sun dead keys)
   nativo          pt: Portuguese (Nativo)
   nativo-us       pt: Portuguese (Nativo for US keyboards)
   nativo-epo      pt: Esperanto (Portugal, Nativo)
   cedilla         ro: Romanian (cedilla)
   std             ro: Romanian (standard)
   std_cedilla     ro: Romanian (standard cedilla)
-  winkeys         ro: Romanian (WinKeys)
+  winkeys         ro: Romanian (Win keys)
   phonetic        ru: Russian (phonetic)
-  phonetic_winkeys ru: Russian (phonetic WinKeys)
+  phonetic_winkeys ru: Russian (phonetic, with Win keys)
   typewriter      ru: Russian (typewriter)
   legacy          ru: Russian (legacy)
   typewriter-legacy ru: Russian (typewriter, legacy)
   tt              ru: Tatar
   os_legacy       ru: Ossetian (legacy)
-  os_winkeys      ru: Ossetian (WinKeys)
+  os_winkeys      ru: Ossetian (Win keys)
   cv              ru: Chuvash
   cv_latin        ru: Chuvash (Latin)
   udm             ru: Udmurt
@@ -579,44 +579,44 @@
   srp             ru: Serbian (Russia)
   bak             ru: Bashkirian
   chm             ru: Mari
-  phonetic_azerty ru: Russian (phonetic azerty)
-  phonetic_dvorak ru: Russian (phonetic dvorak)
-  phonetic_fr     ru: Russian (phonetic French)
+  phonetic_azerty ru: Russian (phonetic, AZERTY)
+  phonetic_dvorak ru: Russian (phonetic, Dvorak)
+  phonetic_fr     ru: Russian Russian (phonetic, French)
   yz              rs: Serbian (Cyrillic, ZE and ZHE swapped)
   latin           rs: Serbian (Latin)
-  latinunicode    rs: Serbian (Latin Unicode)
-  latinyz         rs: Serbian (Latin qwerty)
-  latinunicodeyz  rs: Serbian (Latin Unicode qwerty)
+  latinunicode    rs: Serbian (Latin, Unicode)
+  latinyz         rs: Serbian (Latin, QWERTY)
+  latinunicodeyz  rs: Serbian (Latin, Unicode, QWERTY)
   alternatequotes rs: Serbian (Cyrillic with guillemets)
   latinalternatequotes rs: Serbian (Latin with guillemets)
   rue             rs: Pannonian Rusyn
-  alternatequotes si: Slovenian (with guillemets for quotes)
-  us              si: Slovenian (US keyboard with Slovenian letters)
-  bksl            sk: Slovak (extended Backslash)
-  qwerty          sk: Slovak (qwerty)
-  qwerty_bksl     sk: Slovak (qwerty, extended Backslash)
-  nodeadkeys      es: Spanish (eliminate dead keys)
-  winkeys         es: Spanish (Winkeys)
-  deadtilde       es: Spanish (include dead tilde)
-  sundeadkeys     es: Spanish (Sun dead keys)
+  alternatequotes si: Slovenian (with guillements)
+  us              si: Slovenian (US, with Slovenian letters)
+  bksl            sk: Slovak (extended backslash)
+  qwerty          sk: Slovak (QWERTY)
+  qwerty_bksl     sk: Slovak (QWERTY, extended backslash)
+  nodeadkeys      es: Spanish (no dead keys)
+  winkeys         es: Spanish (Win keys)
+  deadtilde       es: Spanish (dead tilde)
+  sundeadkeys     es: Spanish (with Sun dead keys)
   dvorak          es: Spanish (Dvorak)
   ast             es: Asturian (Spain, with bottom-dot H and bottom-dot L)
   cat             es: Catalan (Spain, with middle-dot L)
   mac             es: Spanish (Macintosh)
-  nodeadkeys      se: Swedish (eliminate dead keys)
+  nodeadkeys      se: Swedish (no dead keys)
   dvorak          se: Swedish (Dvorak)
   rus             se: Russian (Sweden, phonetic)
-  rus_nodeadkeys  se: Russian (Sweden, phonetic, eliminate dead keys)
+  rus_nodeadkeys  se: Russian (Sweden, phonetic, no dead keys)
   smi             se: Northern Saami (Sweden)
   mac             se: Swedish (Macintosh)
   svdvorak        se: Swedish (Svdvorak)
   swl             se: Swedish Sign Language
   legacy          ch: German (Switzerland, legacy)
-  de_nodeadkeys   ch: German (Switzerland, eliminate dead keys)
-  de_sundeadkeys  ch: German (Switzerland, Sun dead keys)
+  de_nodeadkeys   ch: German (Switzerland, no dead keys)
+  de_sundeadkeys  ch: German (Switzerland, with Sun dead keys)
   fr              ch: French (Switzerland)
-  fr_nodeadkeys   ch: French (Switzerland, eliminate dead keys)
-  fr_sundeadkeys  ch: French (Switzerland, Sun dead keys)
+  fr_nodeadkeys   ch: French (Switzerland, no dead keys)
+  fr_sundeadkeys  ch: French (Switzerland, with Sun dead keys)
   fr_mac          ch: French (Switzerland, Macintosh)
   de_mac          ch: German (Switzerland, Macintosh)
   syc             sy: Syriac
@@ -627,16 +627,16 @@
   legacy          tj: Tajik (legacy)
   tam_unicode     lk: Tamil (Sri Lanka, Unicode)
   tam_TAB         lk: Tamil (Sri Lanka, TAB Typewriter)
-  us              lk: Sinhala (US keyboard with Sinhala letters)
+  us              lk: Sinhala (US, with Sinhala letters)
   tis             th: Thai (TIS-820.2538)
   pat             th: Thai (Pattachote)
   f               tr: Turkish (F)
   alt             tr: Turkish (Alt-Q)
-  sundeadkeys     tr: Turkish (Sun dead keys)
+  sundeadkeys     tr: Turkish (with Sun dead keys)
   ku              tr: Kurdish (Turkey, Latin Q)
   ku_f            tr: Kurdish (Turkey, F)
   ku_alt          tr: Kurdish (Turkey, Latin Alt-Q)
-  intl            tr: Turkish (international with dead keys)
+  intl            tr: Turkish (intl., with dead keys)
   crh             tr: Crimean Tatar (Turkish Q)
   crh_f           tr: Crimean Tatar (Turkish F)
   crh_alt         tr: Crimean Tatar (Turkish Alt-Q)
@@ -644,17 +644,17 @@
   saisiyat        tw: Saisiyat (Taiwan)
   phonetic        ua: Ukrainian (phonetic)
   typewriter      ua: Ukrainian (typewriter)
-  winkeys         ua: Ukrainian (WinKeys)
+  winkeys         ua: Ukrainian (Win keys)
   legacy          ua: Ukrainian (legacy)
   rstu            ua: Ukrainian (standard RSTU)
   rstu_ru         ua: Russian (Ukraine, standard RSTU)
   homophonic      ua: Ukrainian (homophonic)
-  extd            gb: English (UK, extended WinKeys)
-  intl            gb: English (UK, international with dead keys)
+  extd            gb: English (UK, extended, with Win keys)
+  intl            gb: English (UK, intl., with dead keys)
   dvorak          gb: English (UK, Dvorak)
-  dvorakukp       gb: English (UK, Dvorak with UK punctuation)
+  dvorakukp       gb: English (UK, Dvorak, with UK punctuation)
   mac             gb: English (UK, Macintosh)
-  mac_intl        gb: English (UK, Macintosh international)
+  mac_intl        gb: English (UK, intl., Macintosh)
   colemak         gb: English (UK, Colemak)
   latin           uz: Uzbek (Latin)
   kr104           kr: Korean (101/104 key compatible)
@@ -669,23 +669,23 @@
   legacy          epo: Esperanto (displaced semicolon and quote, obsolete)
   igbo            ng: Igbo
   yoruba          ng: Yoruba
-  hausa           ng: Hausa
-  left_hand       brai: Braille (left hand)
-  right_hand      brai: Braille (right hand)
+  hausa           ng: Hausa (Nigeria)
+  left_hand       brai: Braille (left-handed)
+  right_hand      brai: Braille (right-handed)
   alt             tm: Turkmen (Alt-Q)
-  fr-oss          ml: French (Mali, alternative)
-  us-mac          ml: English (Mali, US Macintosh)
-  us-intl         ml: English (Mali, US international)
+  fr-oss          ml: French (Mali, alt.)
+  us-mac          ml: English (Mali, US, Macintosh)
+  us-intl         ml: English (Mali, US, intl.)
   kik             ke: Kikuyu
-  qwerty-bay      ph: Filipino (QWERTY Baybayin)
-  capewell-dvorak ph: Filipino (Capewell-Dvorak Latin)
-  capewell-dvorak-bay ph: Filipino (Capewell-Dvorak Baybayin)
-  capewell-qwerf2k6 ph: Filipino (Capewell-QWERF 2006 Latin)
-  capewell-qwerf2k6-bay ph: Filipino (Capewell-QWERF 2006 Baybayin)
-  colemak         ph: Filipino (Colemak Latin)
-  colemak-bay     ph: Filipino (Colemak Baybayin)
-  dvorak          ph: Filipino (Dvorak Latin)
-  dvorak-bay      ph: Filipino (Dvorak Baybayin)
+  qwerty-bay      ph: Filipino (QWERTY, Baybayin)
+  capewell-dvorak ph: Filipino (Capewell-Dvorak, Latin)
+  capewell-dvorak-bay ph: Filipino (Capewell-Dvorak, Baybayin)
+  capewell-qwerf2k6 ph: Filipino (Capewell-QWERF 2006, Latin)
+  capewell-qwerf2k6-bay ph: Filipino (Capewell-QWERF 2006, Baybayin)
+  colemak         ph: Filipino (Colemak, Latin)
+  colemak-bay     ph: Filipino (Colemak, Baybayin)
+  dvorak          ph: Filipino (Dvorak, Latin)
+  dvorak-bay      ph: Filipino (Dvorak, Baybayin)
   gag             md: Moldavian (Gagauz)
 
 ! option
@@ -693,21 +693,21 @@
   grp:switch           Right Alt (while pressed)
   grp:lswitch          Left Alt (while pressed)
   grp:lwin_switch      Left Win (while pressed)
-  grp:rwin_switch      Right Win (while pressed)
-  grp:win_switch       Any Win key (while pressed)
-  grp:caps_switch      Caps Lock (while pressed), Alt+Caps Lock does the original capslock action
+  grp:rwin_switch      Left Win (while pressed)
+  grp:win_switch       Any Win (while pressed)
+  grp:caps_switch      Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action
   grp:rctrl_switch     Right Ctrl (while pressed)
   grp:toggle           Right Alt
   grp:lalt_toggle      Left Alt
   grp:caps_toggle      Caps Lock
   grp:shift_caps_toggle Shift+Caps Lock
-  grp:shift_caps_switch Caps Lock (to first layout), Shift+Caps Lock (to last layout)
-  grp:win_menu_switch  Left Win (to first layout), Right Win/Menu (to last layout)
-  grp:lctrl_rctrl_switch Left Ctrl (to first layout), Right Ctrl (to last layout)
+  grp:shift_caps_switch Caps Lock to first layout; Shift+Caps Lock to last layout
+  grp:win_menu_switch  Left Win to first layout; Right Win/Menu to last layout
+  grp:lctrl_rctrl_switch Left Ctrl to first layout; Right Ctrl to last layout
   grp:alt_caps_toggle  Alt+Caps Lock
-  grp:shifts_toggle    Both Shift keys together
-  grp:alts_toggle      Both Alt keys together
-  grp:ctrls_toggle     Both Ctrl keys together
+  grp:shifts_toggle    Both Shift together
+  grp:alts_toggle      Both Alt together
+  grp:ctrls_toggle     Both Ctrl together
   grp:ctrl_shift_toggle Ctrl+Shift
   grp:lctrl_lshift_toggle Left Ctrl+Left Shift
   grp:rctrl_rshift_toggle Right Ctrl+Right Shift
@@ -717,34 +717,34 @@
   grp:alt_space_toggle Alt+Space
   grp:menu_toggle      Menu
   grp:lwin_toggle      Left Win
-  grp:win_space_toggle Win Key+Space
+  grp:win_space_toggle Win+Space
   grp:rwin_toggle      Right Win
   grp:lshift_toggle    Left Shift
   grp:rshift_toggle    Right Shift
   grp:lctrl_toggle     Left Ctrl
   grp:rctrl_toggle     Right Ctrl
   grp:sclk_toggle      Scroll Lock
-  grp:lctrl_lwin_rctrl_menu LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)
-  grp:lctrl_lwin_toggle LeftCtrl+LeftWin
-  lv3                  Key to choose 3rd level
+  grp:lctrl_lwin_rctrl_menu Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout
+  grp:lctrl_lwin_toggle Left Ctrl+Left Win
+  lv3                  Key to choose the 3rd level
   lv3:switch           Right Ctrl
   lv3:menu_switch      Menu
-  lv3:win_switch       Any Win key
+  lv3:win_switch       Any Win
   lv3:lwin_switch      Left Win
   lv3:rwin_switch      Right Win
-  lv3:alt_switch       Any Alt key
+  lv3:alt_switch       Any Alt
   lv3:lalt_switch      Left Alt
   lv3:ralt_switch      Right Alt
-  lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Compose
-  lv3:ralt_alt         Right Alt key never chooses 3rd level
+  lv3:ralt_switch_multikey Right Alt; Shift+Right Alt as Compose
+  lv3:ralt_alt         Right Alt never chooses 3rd level
   lv3:enter_switch     Enter on keypad
   lv3:caps_switch      Caps Lock
   lv3:bksl_switch      Backslash
   lv3:lsgt_switch      <Less/Greater>
-  lv3:caps_switch_latch Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
-  lv3:bksl_switch_latch Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
-  lv3:lsgt_switch_latch <Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
-  ctrl                 Ctrl key position
+  lv3:caps_switch_latch Caps Lock; acts as onetime lock when pressed together with another 3rd-level chooser
+  lv3:bksl_switch_latch Backslash; acts as onetime lock when pressed together with another 3rd level chooser
+  lv3:lsgt_switch_latch <Less/Greater>; acts as onetime lock when pressed together with another 3rd level chooser
+  ctrl                 Ctrl position
   ctrl:nocaps          Caps Lock as Ctrl
   ctrl:lctrl_meta      Left Ctrl as Meta
   ctrl:swapcaps        Swap Ctrl and Caps Lock
@@ -752,10 +752,10 @@
   ctrl:aa_ctrl         At bottom left
   ctrl:rctrl_ralt      Right Ctrl as Right Alt
   ctrl:menu_rctrl      Menu as Right Ctrl
-  ctrl:swap_lalt_lctl  Swap Left Alt key with Left Ctrl key
-  ctrl:swap_lwin_lctl  Swap Left Win key with Left Ctrl key
-  ctrl:swap_rwin_rctl  Swap Right Win key with Right Ctrl key
-  ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
+  ctrl:swap_lalt_lctl  Swap Left Alt with Left Ctrl
+  ctrl:swap_lwin_lctl  Swap Left Win with Left Ctrl
+  ctrl:swap_rwin_rctl  Swap Right Win with Right Ctrl
+  ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt
   grp_led              Use keyboard LED to show alternative layout
   grp_led:num          Num Lock
   grp_led:caps         Caps Lock
@@ -769,7 +769,7 @@
   keypad:future_wang   Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)
   keypad:hex           Hexadecimal
   keypad:atm           ATM/phone-style
-  kpdl                 Numeric keypad delete key behaviour
+  kpdl                 Numeric keypad Delete behaviour
   kpdl:dot             Legacy key with dot
   kpdl:comma           Legacy key with comma
   kpdl:dotoss          Four-level key with dot
@@ -778,15 +778,15 @@
   kpdl:momayyezoss     Four-level key with momayyez
   kpdl:kposs           Four-level key with abstract separators
   kpdl:semi            Semicolon on third level
-  caps                 Caps Lock key behavior
+  caps                 Caps Lock behavior
   caps:internal        Caps Lock uses internal capitalization; Shift "pauses" Caps Lock
-  caps:internal_nocancel Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock
+  caps:internal_nocancel Caps Lock uses internal capitalization; Shift does not affect Caps Lock
   caps:shift           Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock
-  caps:shift_nocancel  Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock
+  caps:shift_nocancel  Caps Lock acts as Shift with locking; Shift does not affect Caps Lock
   caps:capslock        Caps Lock toggles normal capitalization of alphabetic characters
   caps:shiftlock       Caps Lock toggles ShiftLock (affects all keys)
   caps:swapescape      Swap ESC and Caps Lock
-  caps:escape          Make Caps Lock an additional ESC
+  caps:escape          Make Caps Lock an additional Esc
   caps:backspace       Make Caps Lock an additional Backspace
   caps:super           Make Caps Lock an additional Super
   caps:hyper           Make Caps Lock an additional Hyper
@@ -796,17 +796,17 @@
   caps:none            Caps Lock is disabled
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
-  altwin:meta_alt      Alt and Meta are on Alt keys
-  altwin:alt_win       Alt is mapped to Win keys (and the usual Alt keys)
-  altwin:ctrl_win      Ctrl is mapped to Win keys (and the usual Ctrl keys)
-  altwin:ctrl_alt_win  Ctrl is mapped to Alt keys, Alt is mapped to Win keys
-  altwin:meta_win      Meta is mapped to Win keys
+  altwin:meta_alt      Alt and Meta are on Alt
+  altwin:alt_win       Alt is mapped to Win and the usual Alt
+  altwin:ctrl_win      Ctrl is mapped to Win and the usual Ctrl keys
+  altwin:ctrl_alt_win  Ctrl is mapped to Alt; Alt is mapped to Win
+  altwin:meta_win      Meta is mapped to Win
   altwin:left_meta_win Meta is mapped to Left Win
-  altwin:hyper_win     Hyper is mapped to Win keys
+  altwin:hyper_win     Hyper is mapped to Win
   altwin:alt_super_win Alt is mapped to Right Win, Super to Menu
   altwin:swap_lalt_lwin Left Alt is swapped with Left Win
   altwin:swap_alt_win  Alt is swapped with Win
-  altwin:prtsc_rwin    Win is mapped to PrtSc (and the usual Win key)
+  altwin:prtsc_rwin    Win is mapped to PrtSc and the usual Win
   Compose key          Position of Compose key
   compose:ralt         Right Alt
   compose:lwin         Left Win
@@ -828,17 +828,17 @@
   compose:sclk         Scroll Lock
   compat               Miscellaneous compatibility options
   numpad:pc            Default numeric keypad keys
-  numpad:mac           Numeric keypad keys always enter digits (as in Mac OS)
-  numpad:microsoft     NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)
+  numpad:mac           Numeric keypad always enters digits (as in macOS)
+  numpad:microsoft     Num Lock on: digits; Shift for arrow keys. Num Lock off: arrow keys (as in Windows)
   numpad:shift3        Shift does not cancel Num Lock, chooses 3rd level instead
   srvrkeys:none        Special keys (Ctrl+Alt+<key>) handled in a server
-  apple:alupckeys      Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)
+  apple:alupckeys      Apple Aluminium: emulate PC keys (PrtSc, Scroll Lock, Pause, Num Lock)
   shift:breaks_caps    Shift cancels Caps Lock
   misc:typo            Enable extra typographic characters
-  shift:both_capslock  Both Shift keys together toggle Caps Lock
-  shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shift key deactivates
-  shift:both_shiftlock Both Shift keys together toggle ShiftLock
-  keypad:pointerkeys   Shift + NumLock toggles PointerKeys
+  shift:both_capslock  Both Shift together enable Caps Lock
+  shift:both_capslock_cancel Both Shift together enable Caps Lock; one Shift key disables it
+  shift:both_shiftlock Both Shift together enable Shift Lock
+  keypad:pointerkeys   Shift + Num Lock enables PointerKeys
   grab:break_actions   Allow breaking grabs with keyboard actions (warning: security risk)
   grab:debug           Allow grab and window tree logging
   currencysign         Adding currency signs to certain keys
@@ -848,40 +848,40 @@
   eurosign:5           Euro on 5
   rupeesign:4          Rupee on 4
   lv5                  Key to choose 5th level
-  lv5:lsgt_switch_lock <Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser
-  lv5:ralt_switch_lock Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser
-  lv5:lwin_switch_lock Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser
-  lv5:rwin_switch_lock Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser
-  nbsp                 Using space key to input non-breakable space character
+  lv5:lsgt_switch_lock <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  lv5:ralt_switch_lock Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  lv5:lwin_switch_lock Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  lv5:rwin_switch_lock Right Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  nbsp                 Using space key to input non-breaking space
   nbsp:none            Usual space at any level
-  nbsp:level2          Non-breakable space character at second level
-  nbsp:level3          Non-breakable space character at third level
-  nbsp:level3s         Non-breakable space character at third level, nothing at fourth level
-  nbsp:level3n         Non-breakable space character at third level, thin non-breakable space character at fourth level
-  nbsp:level4          Non-breakable space character at fourth level
-  nbsp:level4n         Non-breakable space character at fourth level, thin non-breakable space character at sixth level
-  nbsp:level4nl        Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
-  nbsp:zwnj2           Zero-width non-joiner character at second level
-  nbsp:zwnj2zwj3       Zero-width non-joiner character at second level, zero-width joiner character at third level
-  nbsp:zwnj2zwj3nb4    Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level
-  nbsp:zwnj2nb3        Zero-width non-joiner character at second level, non-breakable space character at third level
-  nbsp:zwnj2nb3s       Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level
-  nbsp:zwnj2nb3zwj4    Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level
-  nbsp:zwnj2nb3nnb4    Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level
-  nbsp:zwnj3zwj4       Zero-width non-joiner character at third level, zero-width joiner at fourth level
+  nbsp:level2          Non-breaking space at the 2nd level
+  nbsp:level3          Non-breaking space at the 3rd level
+  nbsp:level3s         Non-breaking space at the 3rd level, nothing at the 4th level
+  nbsp:level3n         Non-breaking space at the 3rd level, thin non-breaking space at the 4th level
+  nbsp:level4          Non-breaking space at the 4th lever
+  nbsp:level4n         Non-breaking space at the 4th lever, thin non-breaking space at the 6th level
+  nbsp:level4nl        Non-breaking space at the 4th lever, thin non-breaking space at the 6th level (via Ctrl+Shift)
+  nbsp:zwnj2           Zero-width non-joiner at the 2nd level
+  nbsp:zwnj2zwj3       Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level
+  nbsp:zwnj2zwj3nb4    Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level, non-breaking space at the 4th level
+  nbsp:zwnj2nb3        Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level
+  nbsp:zwnj2nb3s       Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, nothing at the 4th level
+  nbsp:zwnj2nb3zwj4    Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, zero-width joiner at the 4th level
+  nbsp:zwnj2nb3nnb4    Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, thin non-breakable space at the 4th level
+  nbsp:zwnj3zwj4       Zero-width non-joiner at the 3rd level, zero-width joiner at the 4th level
   japan                Japanese keyboard options
   japan:kana_lock      Kana Lock key is locking
   japan:nicola_f_bs    NICOLA-F style Backspace
-  japan:hztg_escape    Make Zenkaku Hankaku an additional ESC
+  japan:hztg_escape    Make Zenkaku Hankaku an additional Esc
   korean               Korean Hangul/Hanja keys
   korean:hw_keys       Hardware Hangul/Hanja keys
   korean:ralt_rctrl    Right Alt as Hangul, right Ctrl as Hanja
   korean:rctrl_ralt    Right Ctrl as Hangul, right Alt as Hanja
   esperanto            Adding Esperanto supersigned letters
-  esperanto:qwerty     To the corresponding key in a Qwerty layout
+  esperanto:qwerty     To the corresponding key in a QWERTY layout
   esperanto:dvorak     To the corresponding key in a Dvorak layout
   esperanto:colemak    To the corresponding key in a Colemak layout
   solaris              Maintain key compatibility with old Solaris keycodes
   solaris:sun_compat   Sun Key compatibility
   terminate            Key sequence to kill the X server
-  terminate:ctrl_alt_bksp Ctrl + Alt + Backspace
+  terminate:ctrl_alt_bksp Ctrl+Alt+Backspace
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.10	Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev	Tue Aug 29 20:27:54 2017
@@ -132,6 +132,7 @@
   thinkpad	=	thinkpad(intl)
   thinkpad60	=	thinkpad(60)
   thinkpadz60	=	thinkpad(60)
+  apex300	=	steelseries(apex300)
  $tmgeometries	=	typematrix(%m)
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.10	Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst	Tue Aug 29 20:27:54 2017
@@ -1,24 +1,24 @@
 ! model
   pc101           Generic 101-key PC
-  pc102           Generic 102-key (Intl) PC
+  pc102           Generic 101-key PC (intl.)
   pc104           Generic 104-key PC
-  pc105           Generic 105-key (Intl) PC
+  pc105           Generic 105-key PC (intl.)
   dell101         Dell 101-key PC
-  latitude        Dell Latitude series laptop
-  dellm65         Dell Precision M65
+  latitude        Dell Latutude laptop
+  dellm65         Dell Precision M65 laptop
   everex          Everex STEPnote
   flexpro         Keytronic FlexPro
   microsoft       Microsoft Natural
   omnikey101      Northgate OmniKey 101
   winbook         Winbook Model XP5
-  pc98            PC-98xx Series
+  pc98            PC-98
   a4techKB21      A4Tech KB-21
   a4techKBS8      A4Tech KBS-8
   a4_rfkb23       A4Tech Wireless Desktop RFKB-23
   airkey          Acer AirKey V
-  azonaRF2300     Azona RF2300 wireless Internet Keyboard
+  azonaRF2300     Azona RF2300 wireless Internet
   scorpius        Advance Scorpius KI
-  brother         Brother Internet Keyboard
+  brother         Brother Internet
   btc5113rf       BTC 5113RF Multimedia
   btc5126t        BTC 5126T
   btc6301urf      BTC 6301URF
@@ -30,34 +30,34 @@
   btc9116u        BTC 9116U Mini Wireless Internet and Gaming
   cherryblue      Cherry Blue Line CyBo@rd
   cherryblueb     Cherry CyMotion Master XPress
-  cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherrybluea     Cherry Blue Line CyBo@rd (alt.)
   cherrycyboard   Cherry CyBo@rd USB-Hub
   cherrycmexpert  Cherry CyMotion Expert
   cherrybunlim    Cherry B.UNLIMITED
-  chicony         Chicony Internet Keyboard
+  chicony         Chicony Internet
   chicony0108     Chicony KU-0108
   chicony0420     Chicony KU-0420
   chicony9885     Chicony KB-9885
-  compaqeak8      Compaq Easy Access Keyboard
-  compaqik7       Compaq Internet Keyboard (7 keys)
-  compaqik13      Compaq Internet Keyboard (13 keys)
-  compaqik18      Compaq Internet Keyboard (18 keys)
+  compaqeak8      Compaq Easy Access
+  compaqik7       Compaq Internet (7 keys)
+  compaqik13      Compaq Internet (13 keys)
+  compaqik18      Compaq Internet (18 keys)
   cymotionlinux   Cherry CyMotion Master Linux
-  armada          Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-  presario        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
-  ipaq            Compaq iPaq Keyboard
+  armada          Compaq Armada laptop
+  presario        Compaq Presario laptop
+  ipaq            Compaq iPaq
   dell            Dell
   dellsk8125      Dell SK-8125
   dellsk8135      Dell SK-8135
-  dellusbmm       Dell USB Multimedia Keyboard
-  inspiron        Dell Laptop/notebook Inspiron 6xxx/8xxx
-  precision_m     Dell Laptop/notebook Precision M series
-  dexxa           Dexxa Wireless Desktop Keyboard
-  diamond         Diamond 9801 / 9802 series
+  dellusbmm       Dell USB Multimedia
+  inspiron        Dell Inspiron 6000/8000 laptop
+  precision_m     Dell Precision M laptop
+  dexxa           Dexxa Wireless Desktop
+  diamond         Diamond 9801/9802
   dtk2000         DTK2000
   ennyah_dkb1008  Ennyah DKB-1008
-  fscaa1667g      Fujitsu-Siemens Computers AMILO laptop
-  genius          Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  fscaa1667g      Fujitsu-Siemens Amilo laptop
+  genius          Genius Comfy KB-16M/Multimedia KWD-910
   geniuscomfy     Genius Comfy KB-12e
   geniuscomfy2    Genius Comfy KB-21e-Scroll
   geniuskb19e     Genius KB-19e NB
@@ -65,127 +65,128 @@
   gyration        Gyration
   htcdream        HTC Dream
   kinesis         Kinesis
-  logitech_base   Logitech Generic Keyboard
+  logitech_base   Logitech
   logitech_g15    Logitech G15 extra keys via G15daemon
-  hpi6            Hewlett-Packard Internet Keyboard
-  hp250x          Hewlett-Packard SK-250x Multimedia Keyboard
+  hpi6            Hewlett-Packard Internet
+  hp250x          Hewlett-Packard NEC SK-2500 Multimedia
   hpxe3gc         Hewlett-Packard Omnibook XE3 GC
   hpxe3gf         Hewlett-Packard Omnibook XE3 GF
   hpxt1000        Hewlett-Packard Omnibook XT1000
   hpdv5           Hewlett-Packard Pavilion dv5
-  hpzt11xx        Hewlett-Packard Pavilion ZT11xx
+  hpzt11xx        Hewlett-Packard Pavilion ZT1100
   hp500fa         Hewlett-Packard Omnibook 500 FA
-  hp5xx           Hewlett-Packard Omnibook 5xx
+  hp5xx           Hewlett-Packard Omnibook 500
   hpnx9020        Hewlett-Packard nx9020
   hp6000          Hewlett-Packard Omnibook 6000/6100
   honeywell_euroboard Honeywell Euroboard
-  hpmini110       Hewlett-Packard Mini 110 Notebook
+  hpmini110       Hewlett-Packard Mini 110 laptop
   rapidaccess     IBM Rapid Access
   rapidaccess2    IBM Rapid Access II
   thinkpad        IBM ThinkPad 560Z/600/600E/A22E
   thinkpad60      IBM ThinkPad R60/T60/R61/T61
   thinkpadz60     IBM ThinkPad Z60m/Z60t/Z61m/Z61t
   ibm_spacesaver  IBM Space Saver
-  logiaccess      Logitech Access Keyboard
+  logiaccess      Logitech Access
   logiclx300      Logitech Cordless Desktop LX-300
-  logii350        Logitech Internet 350 Keyboard
-  logimel         Logitech Media Elite Keyboard
+  logii350        Logitech Internet 350
+  logimel         Logitech Internet 350
   logicd          Logitech Cordless Desktop
   logicd_it       Logitech Cordless Desktop iTouch
   logicd_nav      Logitech Cordless Desktop Navigator
   logicd_opt      Logitech Cordless Desktop Optical
-  logicda         Logitech Cordless Desktop (alternate option)
-  logicdpa2       Logitech Cordless Desktop Pro (alternate option 2)
+  logicda         Logitech Cordless Desktop (alt.)
+  logicdpa2       Logitech Cordless Desktop Pro (2nd alt.)
   logicfn         Logitech Cordless Freedom/Desktop Navigator
   logicdn         Logitech Cordless Desktop Navigator
-  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
-  logiik          Logitech Internet Keyboard
+  logiitc         Logitech iTouch Cordless Y-RB6
+  logiik          Logitech Internet
   itouch          Logitech iTouch
-  logicink        Logitech Internet Navigator Keyboard
+  logicink        Logitech Internet Navigator
   logiex110       Logitech Cordless Desktop EX110
-  logiinkse       Logitech iTouch Internet Navigator Keyboard SE
-  logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
-  logiultrax      Logitech Ultra-X Keyboard
-  logiultraxc     Logitech Ultra-X Cordless Media Desktop Keyboard
-  logidinovo      Logitech diNovo Keyboard
-  logidinovoedge  Logitech diNovo Edge Keyboard
+  logiinkse       Logitech iTouch Internet Navigator SE
+  logiinkseusb    Logitech iTouch Internet Navigator SE USB
+  logiultrax      Logitech Ultra-X
+  logiultraxc     Logitech Ultra-X Cordless Media Desktop
+  logidinovo      Logitech diNovo
+  logidinovoedge  Logitech diNovo Edge
   mx1998          Memorex MX1998
-  mx2500          Memorex MX2500 EZ-Access Keyboard
+  mx2500          Memorex MX2500 EZ-Access
   mx2750          Memorex MX2750
-  microsoft4000   Microsoft Natural Ergonomic Keyboard 4000
-  microsoft7000   Microsoft Natural Wireless Ergonomic Keyboard 7000
-  microsoftinet   Microsoft Internet Keyboard
-  microsoftpro    Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-  microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
-  microsoftprooem Microsoft Natural Keyboard Pro OEM
-  vsonku306       ViewSonic KU-306 Internet Keyboard
-  microsoftprose  Microsoft Internet Keyboard Pro, Swedish
+  microsoft4000   Microsoft Natural Ergonomic 4000
+  microsoft7000   Microsoft Natural Wireless Ergonomic 7000
+  microsoftinet   Microsoft Internet
+  microsoftpro    Microsoft Natural Pro/Internet Pro
+  microsoftprousb Microsoft Natural Pro USB/Internet Pro
+  microsoftprooem Microsoft Natural Pro OEM
+  vsonku306       ViewSonic KU-306 Internet
+  microsoftprose  Microsoft Internet Pro (Swedish)
   microsoftoffice Microsoft Office Keyboard
-  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
-  microsoftelite  Microsoft Natural Keyboard Elite
-  microsoftccurve2k Microsoft Comfort Curve Keyboard 2000
-  oretec          Ortek MCK-800 MM/Internet keyboard
-  propeller       Propeller Voyager (KTEZ-1000)
+  microsoftmult   Microsoft Wireless Multimedia 1.0A
+  microsoftelite  Microsoft Natural Elite
+  microsoftccurve2k Microsoft Comfort Curve 2000
+  oretec          Ortek Multimedia/Internet MCK-800
+  propeller       Propeller Voyager KTEZ-1000
   qtronix         QTronix Scorpius 98N+
   samsung4500     Samsung SDM 4500P
   samsung4510     Samsung SDM 4510P
   sanwaskbkg3     Sanwa Supply SKB-KG3
-  sk1300          SK-1300
-  sk2500          SK-2500
-  sk6200          SK-6200
-  sk7100          SK-7100
-  sp_inet         Super Power Multimedia Keyboard
+  sk1300          NEC SK-1300
+  sk2500          NEC SK-2500
+  sk6200          NEC SK-6200
+  sk7100          NEC SK-7100
+  sp_inet         Super Power Multimedia
   sven            SVEN Ergonomic 2500
   sven303         SVEN Slim 303
-  symplon         Symplon PaceBook (tablet PC)
+  symplon         Symplon PaceBook tablet
   toshiba_s3000   Toshiba Satellite S3000
-  trust           Trust Wireless Keyboard Classic
-  trustda         Trust Direct Access Keyboard
+  trust           Trust Wireless Classic
+  trustda         Trust Direct Access
   trust_slimline  Trust Slimline
   tm2020          TypeMatrix EZ-Reach 2020
   tm2030PS2       TypeMatrix EZ-Reach 2030 PS2
   tm2030USB       TypeMatrix EZ-Reach 2030 USB
   tm2030USB-102   TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)
   tm2030USB-106   TypeMatrix EZ-Reach 2030 USB (106:JP mode)
-  yahoo           Yahoo! Internet Keyboard
+  yahoo           Yahoo! Internet
   macbook78       MacBook/MacBook Pro
-  macbook79       MacBook/MacBook Pro (Intl)
+  macbook79       MacBook/MacBook Pro (intl.)
   macintosh       Macintosh
   macintosh_old   Macintosh Old
-  macintosh_hhk   Happy Hacking Keyboard for Mac
+  macintosh_hhk   Happy Hacking for Mac
   acer_c300       Acer C300
   acer_ferrari4k  Acer Ferrari 4000
-  acer_laptop     Acer Laptop
-  asus_laptop     Asus Laptop
+  acer_laptop     Acer laptop
+  asus_laptop     Asus laptop
   apple           Apple
-  apple_laptop    Apple Laptop
-  applealu_ansi   Apple Aluminium Keyboard (ANSI)
-  applealu_iso    Apple Aluminium Keyboard (ISO)
-  applealu_jis    Apple Aluminium Keyboard (JIS)
-  silvercrest     SILVERCREST Multimedia Wireless Keyboard
-  emachines       Laptop/notebook eMachines m68xx
+  apple_laptop    Apple laptop
+  applealu_ansi   Apple Aluminium (ANSI)
+  applealu_iso    Apple Aluminium (ISO)
+  applealu_jis    Apple Aluminium (JIS)
+  silvercrest     Silvercrest Multimedia Wireless
+  emachines       eMachines m6800 laptop
   benqx           BenQ X-Touch
   benqx730        BenQ X-Touch 730
   benqx800        BenQ X-Touch 800
-  hhk             Happy Hacking Keyboard
+  hhk             Happy Hacking
   classmate       Classmate PC
   olpc            OLPC
   sun_type7_usb   Sun Type 7 USB
-  sun_type7_euro_usb Sun Type 7 USB (European layout)
-  sun_type7_unix_usb Sun Type 7 USB (Unix layout)
-  sun_type7_jp_usb Sun Type 7 USB (Japanese layout) / Japanese 106-key
+  sun_type7_euro_usb Sun Type 7 USB (European)
+  sun_type7_unix_usb Sun Type 7 USB (Unix)
+  sun_type7_jp_usb Sun Type 7 USB (Japanese)/Japanese 106-key
   sun_type6_usb   Sun Type 6/7 USB
-  sun_type6_euro_usb Sun Type 6/7 USB (European layout)
-  sun_type6_unix_usb Sun Type 6 USB (Unix layout)
-  sun_type6_jp_usb Sun Type 6 USB (Japanese layout)
-  sun_type6_jp    Sun Type 6 (Japanese layout)
+  sun_type6_euro_usb Sun Type 6/7 USB (European)
+  sun_type6_unix_usb Sun Type 6 USB (Unix)
+  sun_type6_jp_usb Sun Type 6 USB (Japanese)
+  sun_type6_jp    Sun Type 6 (Japanese)
   targa_v811      Targa Visionary 811
   unitekkb1925    Unitek KB-1925
   compalfl90      FL90
   creativedw7000  Creative Desktop Wireless 7000
   htcdream        Htc Dream phone
-  teck227         Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
-  teck229         Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
+  teck227         Truly Ergonomic 227
+  teck229         Truly Ergonomic 229
+  apex300         SteelSeries Apex 300 (Apex RAW)
 
 ! layout
   us              English (US)
@@ -202,7 +203,7 @@
   ba              Bosnian
   br              Portuguese (Brazil)
   bg              Bulgarian
-  dz              Berber (Algeria, Latin characters)
+  dz              Berber (Algeria, Latin)
   ma              Arabic (Morocco)
   cm              English (Cameroon)
   mm              Burmese
@@ -264,7 +265,7 @@
   uz              Uzbek
   vn              Vietnamese
   kr              Korean
-  nec_vndr/jp     Japanese (PC-98xx Series)
+  nec_vndr/jp     Japanese (PC-98)
   ie              Irish
   pk              Urdu (Pakistan)
   mv              Dhivehi
@@ -285,68 +286,67 @@
   md              Moldavian
   id              Indonesian (Jawi)
   my              Malay (Jawi)
-  bn              Malay (Jawi)
 
 ! variant
   chr             us: Cherokee
-  euro            us: English (US, with euro on 5)
-  intl            us: English (US, international with dead keys)
-  alt-intl        us: English (US, alternative international)
+  euro            us: English (US, euro on 5)
+  intl            us: English (US, intl., with dead keys)
+  alt-intl        us: English (US, alt. intl.)
   colemak         us: English (Colemak)
   dvorak          us: English (Dvorak)
-  dvorak-intl     us: English (Dvorak, international with dead keys)
-  dvorak-alt-intl us: English (Dvorak alternative international no dead keys)
-  dvorak-l        us: English (left handed Dvorak)
-  dvorak-r        us: English (right handed Dvorak)
+  dvorak-intl     us: English (Dvorak, intl., with dead keys)
+  dvorak-alt-intl us: English (Dvorak, alt. intl.)
+  dvorak-l        us: English (Dvorak, left-handed)
+  dvorak-r        us: English (Dvorak, right-handed)
   dvorak-classic  us: English (classic Dvorak)
-  dvp             us: English (Programmer Dvorak)
+  dvp             us: English (programmer Dvorak)
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
-  altgr-intl      us: English (international AltGr dead keys)
+  altgr-intl      us: English (intl., with dead keys)
   olpc2           us: English (the divide/multiply keys toggle the layout)
   hbs             us: Serbo-Croatian (US)
   workman         us: English (Workman)
-  workman-intl    us: English (Workman, international with dead keys)
+  workman-intl    us: English (Workman, intl., with dead keys)
   ps              af: Pashto
   uz              af: Uzbek (Afghanistan)
   olpc-ps         af: Pashto (Afghanistan, OLPC)
   fa-olpc         af: Persian (Afghanistan, Dari OLPC)
   uz-olpc         af: Uzbek (Afghanistan, OLPC)
-  azerty          ara: Arabic (azerty)
-  azerty_digits   ara: Arabic (azerty/digits)
+  azerty          ara: Arabic (AZERTY)
+  azerty_digits   ara: Arabic (AZERTY/digits)
   digits          ara: Arabic (digits)
-  qwerty          ara: Arabic (qwerty)
+  qwerty          ara: Arabic (QWERTY)
   qwerty_digits   ara: Arabic (qwerty/digits)
   buckwalter      ara: Arabic (Buckwalter)
   mac             ara: Arabic (Macintosh)
-  plisi-d1        al: Albanian (Plisi D1)
+  plisi           al: Albanian (Plisi)
   phonetic        am: Armenian (phonetic)
-  phonetic-alt    am: Armenian (alternative phonetic)
+  phonetic-alt    am: Armenian (alt. phonetic)
   eastern         am: Armenian (eastern)
   western         am: Armenian (western)
-  eastern-alt     am: Armenian (alternative eastern)
-  nodeadkeys      at: German (Austria, eliminate dead keys)
-  sundeadkeys     at: German (Austria, Sun dead keys)
+  eastern-alt     am: Armenian (alt. eastern)
+  nodeadkeys      at: German (Austria, no dead keys)
+  sundeadkeys     at: German (Austria, with Sun dead keys)
   mac             at: German (Austria, Macintosh)
   cyrillic        az: Azerbaijani (Cyrillic)
   legacy          by: Belarusian (legacy)
   latin           by: Belarusian (Latin)
-  oss             be: Belgian (alternative)
-  oss_latin9      be: Belgian (alternative, Latin-9 only)
-  oss_sundeadkeys be: Belgian (alternative, Sun dead keys)
-  iso-alternate   be: Belgian (ISO alternate)
-  nodeadkeys      be: Belgian (eliminate dead keys)
-  sundeadkeys     be: Belgian (Sun dead keys)
-  wang            be: Belgian (Wang model 724 azerty)
+  oss             be: Belgian (alt.)
+  oss_latin9      be: Belgian (alt., Latin-9 only)
+  oss_sundeadkeys be: Belgian (alt., with Sun dead keys)
+  iso-alternate   be: Belgian (alt. ISO)
+  nodeadkeys      be: Belgian (no dead keys)
+  sundeadkeys     be: Belgian (with Sun dead keys)
+  wang            be: Belgian (Wang 724 AZERTY)
   urd-phonetic    in: Urdu (phonetic)
-  urd-phonetic3   in: Urdu (alternative phonetic)
-  urd-winkeys     in: Urdu (WinKeys)
-  eng             in: English (India, with rupee sign)
-  alternatequotes ba: Bosnian (with guillemets for quotes)
+  urd-phonetic3   in: Urdu (alt. phonetic)
+  urd-winkeys     in: Urdu (Win keys)
+  eng             in: English (India, with rupee)
+  alternatequotes ba: Bosnian (with guillements)
   unicode         ba: Bosnian (with Bosnian digraphs)
-  unicodeus       ba: Bosnian (US keyboard with Bosnian digraphs)
-  us              ba: Bosnian (US keyboard with Bosnian letters)
-  nodeadkeys      br: Portuguese (Brazil, eliminate dead keys)
+  unicodeus       ba: Bosnian (US, with Bosnian digraphs)
+  us              ba: Bosnian (US, with Bosnian letters)
+  nodeadkeys      br: Portuguese (Brazil, no dead keys)
   dvorak          br: Portuguese (Brazil, Dvorak)
   nativo          br: Portuguese (Brazil, Nativo)
   nativo-us       br: Portuguese (Brazil, Nativo for US keyboards)
@@ -354,51 +354,51 @@
   thinkpad        br: Portuguese (Brazil, IBM/Lenovo ThinkPad)
   phonetic        bg: Bulgarian (traditional phonetic)
   bas_phonetic    bg: Bulgarian (new phonetic)
-  ber             dz: Berber (Algeria, Tifinagh characters)
+  ber             dz: Berber (Algeria, Tifinagh)
   ar              dz: Arabic (Algeria)
   french          ma: French (Morocco)
   tifinagh        ma: Berber (Morocco, Tifinagh)
-  tifinagh-alt    ma: Berber (Morocco, Tifinagh alternative)
-  tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alternative phonetic)
+  tifinagh-alt    ma: Berber (Morocco, Tifinagh alt.)
+  tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alt. phonetic)
   tifinagh-extended ma: Berber (Morocco, Tifinagh extended)
   tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic)
   tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic)
   french          cm: French (Cameroon)
-  qwerty          cm: Cameroon Multilingual (qwerty)
-  azerty          cm: Cameroon Multilingual (azerty)
+  qwerty          cm: Cameroon Multilingual (QWERTY)
+  azerty          cm: Cameroon Multilingual (AZERTY)
   dvorak          cm: Cameroon Multilingual (Dvorak)
   mmuock          cm: Mmuock
   fr-dvorak       ca: French (Canada, Dvorak)
   fr-legacy       ca: French (Canada, legacy)
   multix          ca: Canadian Multilingual
-  multi           ca: Canadian Multilingual (first part)
-  multi-2gr       ca: Canadian Multilingual (second part)
+  multi           ca: Canadian Multilingual (1st part)
+  multi-2gr       ca: Canadian Multilingual (2nd part)
   ike             ca: Inuktitut
   eng             ca: English (Canada)
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
   ug              cn: Uyghur
-  alternatequotes hr: Croatian (with guillemets for quotes)
+  alternatequotes hr: Croatian (with guillements)
   unicode         hr: Croatian (with Croatian digraphs)
-  unicodeus       hr: Croatian (US keyboard with Croatian digraphs)
-  us              hr: Croatian (US keyboard with Croatian letters)
+  unicodeus       hr: Croatian (US, with Croatian digraphs)
+  us              hr: Croatian (US, with Croatian letters)
   bksl            cz: Czech (with <\|> key)
-  qwerty          cz: Czech (qwerty)
-  qwerty_bksl     cz: Czech (qwerty, extended Backslash)
-  ucw             cz: Czech (UCW layout, accented letters only)
-  dvorak-ucw      cz: Czech (US Dvorak with CZ UCW support)
+  qwerty          cz: Czech (QWERTY)
+  qwerty_bksl     cz: Czech (QWERTY, extended backslash)
+  ucw             cz: Czech (UCW, only accented letters)
+  dvorak-ucw      cz: Czech (US, Dvorak, UCW support)
   rus             cz: Russian (Czech, phonetic)
-  nodeadkeys      dk: Danish (eliminate dead keys)
-  winkeys         dk: Danish (Winkeys)
+  nodeadkeys      dk: Danish (no dead keys)
+  winkeys         dk: Danish (Win keys)
   mac             dk: Danish (Macintosh)
-  mac_nodeadkeys  dk: Danish (Macintosh, eliminate dead keys)
+  mac_nodeadkeys  dk: Danish (Macintosh, no dead keys)
   dvorak          dk: Danish (Dvorak)
-  sundeadkeys     nl: Dutch (Sun dead keys)
+  sundeadkeys     nl: Dutch (with Sun dead keys)
   mac             nl: Dutch (Macintosh)
   std             nl: Dutch (standard)
-  nodeadkeys      ee: Estonian (eliminate dead keys)
+  nodeadkeys      ee: Estonian (no dead keys)
   dvorak          ee: Estonian (Dvorak)
-  us              ee: Estonian (US keyboard with Estonian letters)
+  us              ee: Estonian (US, with Estonian letters)
   pes_keypad      ir: Persian (with Persian keypad)
   ku              ir: Kurdish (Iran, Latin Q)
   ku_f            ir: Kurdish (Iran, F)
@@ -408,26 +408,26 @@
   ku_f            iq: Kurdish (Iraq, F)
   ku_alt          iq: Kurdish (Iraq, Latin Alt-Q)
   ku_ara          iq: Kurdish (Iraq, Arabic-Latin)
-  nodeadkeys      fo: Faroese (eliminate dead keys)
+  nodeadkeys      fo: Faroese (no dead keys)
   classic         fi: Finnish (classic)
-  nodeadkeys      fi: Finnish (classic, eliminate dead keys)
+  nodeadkeys      fi: Finnish (classic, no dead keys)
   winkeys         fi: Finnish (Winkeys)
   smi             fi: Northern Saami (Finland)
   mac             fi: Finnish (Macintosh)
-  nodeadkeys      fr: French (eliminate dead keys)
-  sundeadkeys     fr: French (Sun dead keys)
-  oss             fr: French (alternative)
-  oss_latin9      fr: French (alternative, Latin-9 only)
-  oss_nodeadkeys  fr: French (alternative, eliminate dead keys)
-  oss_sundeadkeys fr: French (alternative, Sun dead keys)
-  latin9          fr: French (legacy, alternative)
-  latin9_nodeadkeys fr: French (legacy, alternative, eliminate dead keys)
-  latin9_sundeadkeys fr: French (legacy, alternative, Sun dead keys)
+  nodeadkeys      fr: French (no dead keys)
+  sundeadkeys     fr: French (with Sun dead keys)
+  oss             fr: French (alt.)
+  oss_latin9      fr: French (alt., Latin-9 only)
+  oss_nodeadkeys  fr: French (alt., no dead keys)
+  oss_sundeadkeys fr: French (alt., with Sun dead keys)
+  latin9          fr: French (legacy, alt.)
+  latin9_nodeadkeys fr: French (legacy, alt., no dead keys)
+  latin9_sundeadkeys fr: French (legacy, alt., with Sun dead keys)
   bepo            fr: French (Bepo, ergonomic, Dvorak way)
   bepo_latin9     fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
   dvorak          fr: French (Dvorak)
   mac             fr: French (Macintosh)
-  azerty          fr: French (Azerty)
+  azerty          fr: French (AZERTY)
   bre             fr: French (Breton)
   oci             fr: Occitan
   geo             fr: Georgian (France, AZERTY Tskapo)
@@ -436,7 +436,7 @@
   ewe             gh: Ewe
   fula            gh: Fula
   ga              gh: Ga
-  hausa           gh: Hausa
+  hausa           gh: Hausa (Ghana)
   avn             gh: Avatime
   gillbt          gh: English (Ghana, GILLBT)
   ergonomic       ge: Georgian (ergonomic)
@@ -445,56 +445,56 @@
   os              ge: Ossetian (Georgia)
   deadacute       de: German (dead acute)
   deadgraveacute  de: German (dead grave acute)
-  nodeadkeys      de: German (eliminate dead keys)
+  nodeadkeys      de: German (no dead keys)
   T3              de: German (T3)
   ro              de: Romanian (Germany)
-  ro_nodeadkeys   de: Romanian (Germany, eliminate dead keys)
+  ro_nodeadkeys   de: Romanian (Germany, no dead keys)
   dvorak          de: German (Dvorak)
-  sundeadkeys     de: German (Sun dead keys)
+  sundeadkeys     de: German (with Sun dead keys)
   neo             de: German (Neo 2)
   mac             de: German (Macintosh)
-  mac_nodeadkeys  de: German (Macintosh, eliminate dead keys)
+  mac_nodeadkeys  de: German (Macintosh, no dead keys)
   dsb             de: Lower Sorbian
-  dsb_qwertz      de: Lower Sorbian (qwertz)
-  qwerty          de: German (qwerty)
+  dsb_qwertz      de: Lower Sorbian (QWERTZ)
+  qwerty          de: German (QWERTY)
   tr              de: Turkish (Germany)
   ru              de: Russian (Germany, phonetic)
   deadtilde       de: German (dead tilde)
   simple          gr: Greek (simple)
   extended        gr: Greek (extended)
-  nodeadkeys      gr: Greek (eliminate dead keys)
+  nodeadkeys      gr: Greek (no dead keys)
   polytonic       gr: Greek (polytonic)
   standard        hu: Hungarian (standard)
-  nodeadkeys      hu: Hungarian (eliminate dead keys)
-  qwerty          hu: Hungarian (qwerty)
-  101_qwertz_comma_dead hu: Hungarian (101/qwertz/comma/dead keys)
-  101_qwertz_comma_nodead hu: Hungarian (101/qwertz/comma/eliminate dead keys)
-  101_qwertz_dot_dead hu: Hungarian (101/qwertz/dot/dead keys)
-  101_qwertz_dot_nodead hu: Hungarian (101/qwertz/dot/eliminate dead keys)
-  101_qwerty_comma_dead hu: Hungarian (101/qwerty/comma/dead keys)
-  101_qwerty_comma_nodead hu: Hungarian (101/qwerty/comma/eliminate dead keys)
-  101_qwerty_dot_dead hu: Hungarian (101/qwerty/dot/dead keys)
-  101_qwerty_dot_nodead hu: Hungarian (101/qwerty/dot/eliminate dead keys)
-  102_qwertz_comma_dead hu: Hungarian (102/qwertz/comma/dead keys)
-  102_qwertz_comma_nodead hu: Hungarian (102/qwertz/comma/eliminate dead keys)
-  102_qwertz_dot_dead hu: Hungarian (102/qwertz/dot/dead keys)
-  102_qwertz_dot_nodead hu: Hungarian (102/qwertz/dot/eliminate dead keys)
-  102_qwerty_comma_dead hu: Hungarian (102/qwerty/comma/dead keys)
-  102_qwerty_comma_nodead hu: Hungarian (102/qwerty/comma/eliminate dead keys)
-  102_qwerty_dot_dead hu: Hungarian (102/qwerty/dot/dead keys)
-  102_qwerty_dot_nodead hu: Hungarian (102/qwerty/dot/eliminate dead keys)
-  Sundeadkeys     is: Icelandic (Sun dead keys)
-  nodeadkeys      is: Icelandic (eliminate dead keys)
+  nodeadkeys      hu: Hungarian (no dead keys)
+  qwerty          hu: Hungarian (QWERTY)
+  101_qwertz_comma_dead hu: Hungarian (101/QWERTZ/comma/dead keys)
+  101_qwertz_comma_nodead hu: Hungarian (101/QWERTZ/comma/no dead keys)
+  101_qwertz_dot_dead hu: Hungarian (101/QWERTZ/dot/dead keys)
+  101_qwertz_dot_nodead hu: Hungarian (101/QWERTZ/dot/no dead keys)
+  101_qwerty_comma_dead hu: Hungarian (101/QWERTY/comma/dead keys)
+  101_qwerty_comma_nodead hu: Hungarian (101/QWERTY/comma/no dead keys)
+  101_qwerty_dot_dead hu: Hungarian (101/QWERTY/dot/dead keys)
+  101_qwerty_dot_nodead hu: Hungarian (101/QWERTY/dot/no dead keys)
+  102_qwertz_comma_dead hu: Hungarian (102/QWERTZ/comma/dead keys)
+  102_qwertz_comma_nodead hu: Hungarian (102/QWERTZ/comma/no dead keys)
+  102_qwertz_dot_dead hu: Hungarian (102/QWERTZ/dot/dead keys)
+  102_qwertz_dot_nodead hu: Hungarian (102/QWERTZ/dot/no dead keys)
+  102_qwerty_comma_dead hu: Hungarian (102/QWERTY/comma/dead keys)
+  102_qwerty_comma_nodead hu: Hungarian (102/QWERTY/comma/no dead keys)
+  102_qwerty_dot_dead hu: Hungarian (102/QWERTY/dot/dead keys)
+  102_qwerty_dot_nodead hu: Hungarian (102/QWERTY/dot/no dead keys)
+  Sundeadkeys     is: Icelandic (with Sun dead keys)
+  nodeadkeys      is: Icelandic (no dead keys)
   mac_legacy      is: Icelandic (Macintosh, legacy)
   mac             is: Icelandic (Macintosh)
   dvorak          is: Icelandic (Dvorak)
   lyx             il: Hebrew (lyx)
   phonetic        il: Hebrew (phonetic)
   biblical        il: Hebrew (Biblical, Tiro)
-  nodeadkeys      it: Italian (eliminate dead keys)
+  nodeadkeys      it: Italian (no dead keys)
   winkeys         it: Italian (Winkeys)
   mac             it: Italian (Macintosh)
-  us              it: Italian (US keyboard with Italian letters)
+  us              it: Italian (US, with Italian letters)
   geo             it: Georgian (Italy)
   ibm             it: Italian (IBM 142)
   kana            jp: Japanese (Kana)
@@ -507,67 +507,67 @@
   kazrus          kz: Kazakh (with Russian)
   ext             kz: Kazakh (extended)
   stea            la: Lao (STEA proposed standard layout)
-  nodeadkeys      latam: Spanish (Latin American, eliminate dead keys)
-  deadtilde       latam: Spanish (Latin American, include dead tilde)
-  sundeadkeys     latam: Spanish (Latin American, Sun dead keys)
+  nodeadkeys      latam: Spanish (Latin American, no dead keys)
+  deadtilde       latam: Spanish (Latin American, dead tilde)
+  sundeadkeys     latam: Spanish (Latin American, with Sun dead keys)
   dvorak          latam: Spanish (Latin American, Dvorak)
   std             lt: Lithuanian (standard)
-  us              lt: Lithuanian (US keyboard with Lithuanian letters)
+  us              lt: Lithuanian (US, with Lithuanian letters)
   ibm             lt: Lithuanian (IBM LST 1205-92)
   lekp            lt: Lithuanian (LEKP)
   lekpa           lt: Lithuanian (LEKPa)
-  apostrophe      lv: Latvian (apostrophe variant)
-  tilde           lv: Latvian (tilde variant)
-  fkey            lv: Latvian (F variant)
+  apostrophe      lv: Latvian (apostrophe)
+  tilde           lv: Latvian (tilde)
+  fkey            lv: Latvian (F)
   modern          lv: Latvian (modern)
   ergonomic       lv: Latvian (ergonomic, ŪGJRMV)
   adapted         lv: Latvian (adapted)
   cyrillic        me: Montenegrin (Cyrillic)
   cyrillicyz      me: Montenegrin (Cyrillic, ZE and ZHE swapped)
-  latinunicode    me: Montenegrin (Latin Unicode)
-  latinyz         me: Montenegrin (Latin qwerty)
-  latinunicodeyz  me: Montenegrin (Latin Unicode qwerty)
+  latinunicode    me: Montenegrin (Latin, Unicode)
+  latinyz         me: Montenegrin (Latin, QWERTY)
+  latinunicodeyz  me: Montenegrin (Latin, Unicode, QWERTY)
   cyrillicalternatequotes me: Montenegrin (Cyrillic with guillemets)
   latinalternatequotes me: Montenegrin (Latin with guillemets)
-  nodeadkeys      mk: Macedonian (eliminate dead keys)
+  nodeadkeys      mk: Macedonian (no dead keys)
   us              mt: Maltese (with US layout)
-  nodeadkeys      no: Norwegian (eliminate dead keys)
-  winkeys         no: Norwegian (Winkeys)
+  nodeadkeys      no: Norwegian (no dead keys)
+  winkeys         no: Norwegian (Win keys)
   dvorak          no: Norwegian (Dvorak)
   smi             no: Northern Saami (Norway)
-  smi_nodeadkeys  no: Northern Saami (Norway, eliminate dead keys)
+  smi_nodeadkeys  no: Northern Saami (Norway, no dead keys)
   mac             no: Norwegian (Macintosh)
-  mac_nodeadkeys  no: Norwegian (Macintosh, eliminate dead keys)
+  mac_nodeadkeys  no: Norwegian (Macintosh, no dead keys)
   colemak         no: Norwegian (Colemak)
   legacy          pl: Polish (legacy)
-  qwertz          pl: Polish (qwertz)
+  qwertz          pl: Polish (QWERTZ)
   dvorak          pl: Polish (Dvorak)
-  dvorak_quotes   pl: Polish (Dvorak, Polish quotes on quotemark key)
-  dvorak_altquotes pl: Polish (Dvorak, Polish quotes on key 1)
+  dvorak_quotes   pl: Polish (Dvorak, with Polish quotes on quotemark key)
+  dvorak_altquotes pl: Polish (Dvorak, with Polish quotes on key 1)
   csb             pl: Kashubian
   szl             pl: Silesian
   ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
   dvp             pl: Polish (programmer Dvorak)
-  nodeadkeys      pt: Portuguese (eliminate dead keys)
-  sundeadkeys     pt: Portuguese (Sun dead keys)
+  nodeadkeys      pt: Portuguese (no dead keys)
+  sundeadkeys     pt: Portuguese (with Sun dead keys)
   mac             pt: Portuguese (Macintosh)
-  mac_nodeadkeys  pt: Portuguese (Macintosh, eliminate dead keys)
-  mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
+  mac_nodeadkeys  pt: Portuguese (Macintosh, no dead keys)
+  mac_sundeadkeys pt: Portuguese (Macintosh, with Sun dead keys)
   nativo          pt: Portuguese (Nativo)
   nativo-us       pt: Portuguese (Nativo for US keyboards)
   nativo-epo      pt: Esperanto (Portugal, Nativo)
   cedilla         ro: Romanian (cedilla)
   std             ro: Romanian (standard)
   std_cedilla     ro: Romanian (standard cedilla)
-  winkeys         ro: Romanian (WinKeys)
+  winkeys         ro: Romanian (Win keys)
   phonetic        ru: Russian (phonetic)
-  phonetic_winkeys ru: Russian (phonetic WinKeys)
+  phonetic_winkeys ru: Russian (phonetic, with Win keys)
   typewriter      ru: Russian (typewriter)
   legacy          ru: Russian (legacy)
   typewriter-legacy ru: Russian (typewriter, legacy)
   tt              ru: Tatar
   os_legacy       ru: Ossetian (legacy)
-  os_winkeys      ru: Ossetian (WinKeys)
+  os_winkeys      ru: Ossetian (Win keys)
   cv              ru: Chuvash
   cv_latin        ru: Chuvash (Latin)
   udm             ru: Udmurt
@@ -579,44 +579,44 @@
   srp             ru: Serbian (Russia)
   bak             ru: Bashkirian
   chm             ru: Mari
-  phonetic_azerty ru: Russian (phonetic azerty)
-  phonetic_dvorak ru: Russian (phonetic dvorak)
-  phonetic_fr     ru: Russian (phonetic French)
+  phonetic_azerty ru: Russian (phonetic, AZERTY)
+  phonetic_dvorak ru: Russian (phonetic, Dvorak)
+  phonetic_fr     ru: Russian Russian (phonetic, French)
   yz              rs: Serbian (Cyrillic, ZE and ZHE swapped)
   latin           rs: Serbian (Latin)
-  latinunicode    rs: Serbian (Latin Unicode)
-  latinyz         rs: Serbian (Latin qwerty)
-  latinunicodeyz  rs: Serbian (Latin Unicode qwerty)
+  latinunicode    rs: Serbian (Latin, Unicode)
+  latinyz         rs: Serbian (Latin, QWERTY)
+  latinunicodeyz  rs: Serbian (Latin, Unicode, QWERTY)
   alternatequotes rs: Serbian (Cyrillic with guillemets)
   latinalternatequotes rs: Serbian (Latin with guillemets)
   rue             rs: Pannonian Rusyn
-  alternatequotes si: Slovenian (with guillemets for quotes)
-  us              si: Slovenian (US keyboard with Slovenian letters)
-  bksl            sk: Slovak (extended Backslash)
-  qwerty          sk: Slovak (qwerty)
-  qwerty_bksl     sk: Slovak (qwerty, extended Backslash)
-  nodeadkeys      es: Spanish (eliminate dead keys)
-  winkeys         es: Spanish (Winkeys)
-  deadtilde       es: Spanish (include dead tilde)
-  sundeadkeys     es: Spanish (Sun dead keys)
+  alternatequotes si: Slovenian (with guillements)
+  us              si: Slovenian (US, with Slovenian letters)
+  bksl            sk: Slovak (extended backslash)
+  qwerty          sk: Slovak (QWERTY)
+  qwerty_bksl     sk: Slovak (QWERTY, extended backslash)
+  nodeadkeys      es: Spanish (no dead keys)
+  winkeys         es: Spanish (Win keys)
+  deadtilde       es: Spanish (dead tilde)
+  sundeadkeys     es: Spanish (with Sun dead keys)
   dvorak          es: Spanish (Dvorak)
   ast             es: Asturian (Spain, with bottom-dot H and bottom-dot L)
   cat             es: Catalan (Spain, with middle-dot L)
   mac             es: Spanish (Macintosh)
-  nodeadkeys      se: Swedish (eliminate dead keys)
+  nodeadkeys      se: Swedish (no dead keys)
   dvorak          se: Swedish (Dvorak)
   rus             se: Russian (Sweden, phonetic)
-  rus_nodeadkeys  se: Russian (Sweden, phonetic, eliminate dead keys)
+  rus_nodeadkeys  se: Russian (Sweden, phonetic, no dead keys)
   smi             se: Northern Saami (Sweden)
   mac             se: Swedish (Macintosh)
   svdvorak        se: Swedish (Svdvorak)
   swl             se: Swedish Sign Language
   legacy          ch: German (Switzerland, legacy)
-  de_nodeadkeys   ch: German (Switzerland, eliminate dead keys)
-  de_sundeadkeys  ch: German (Switzerland, Sun dead keys)
+  de_nodeadkeys   ch: German (Switzerland, no dead keys)
+  de_sundeadkeys  ch: German (Switzerland, with Sun dead keys)
   fr              ch: French (Switzerland)
-  fr_nodeadkeys   ch: French (Switzerland, eliminate dead keys)
-  fr_sundeadkeys  ch: French (Switzerland, Sun dead keys)
+  fr_nodeadkeys   ch: French (Switzerland, no dead keys)
+  fr_sundeadkeys  ch: French (Switzerland, with Sun dead keys)
   fr_mac          ch: French (Switzerland, Macintosh)
   de_mac          ch: German (Switzerland, Macintosh)
   syc             sy: Syriac
@@ -627,16 +627,16 @@
   legacy          tj: Tajik (legacy)
   tam_unicode     lk: Tamil (Sri Lanka, Unicode)
   tam_TAB         lk: Tamil (Sri Lanka, TAB Typewriter)
-  us              lk: Sinhala (US keyboard with Sinhala letters)
+  us              lk: Sinhala (US, with Sinhala letters)
   tis             th: Thai (TIS-820.2538)
   pat             th: Thai (Pattachote)
   f               tr: Turkish (F)
   alt             tr: Turkish (Alt-Q)
-  sundeadkeys     tr: Turkish (Sun dead keys)
+  sundeadkeys     tr: Turkish (with Sun dead keys)
   ku              tr: Kurdish (Turkey, Latin Q)
   ku_f            tr: Kurdish (Turkey, F)
   ku_alt          tr: Kurdish (Turkey, Latin Alt-Q)
-  intl            tr: Turkish (international with dead keys)
+  intl            tr: Turkish (intl., with dead keys)
   crh             tr: Crimean Tatar (Turkish Q)
   crh_f           tr: Crimean Tatar (Turkish F)
   crh_alt         tr: Crimean Tatar (Turkish Alt-Q)
@@ -644,17 +644,17 @@
   saisiyat        tw: Saisiyat (Taiwan)
   phonetic        ua: Ukrainian (phonetic)
   typewriter      ua: Ukrainian (typewriter)
-  winkeys         ua: Ukrainian (WinKeys)
+  winkeys         ua: Ukrainian (Win keys)
   legacy          ua: Ukrainian (legacy)
   rstu            ua: Ukrainian (standard RSTU)
   rstu_ru         ua: Russian (Ukraine, standard RSTU)
   homophonic      ua: Ukrainian (homophonic)
-  extd            gb: English (UK, extended WinKeys)
-  intl            gb: English (UK, international with dead keys)
+  extd            gb: English (UK, extended, with Win keys)
+  intl            gb: English (UK, intl., with dead keys)
   dvorak          gb: English (UK, Dvorak)
-  dvorakukp       gb: English (UK, Dvorak with UK punctuation)
+  dvorakukp       gb: English (UK, Dvorak, with UK punctuation)
   mac             gb: English (UK, Macintosh)
-  mac_intl        gb: English (UK, Macintosh international)
+  mac_intl        gb: English (UK, intl., Macintosh)
   colemak         gb: English (UK, Colemak)
   latin           uz: Uzbek (Latin)
   kr104           kr: Korean (101/104 key compatible)
@@ -669,23 +669,23 @@
   legacy          epo: Esperanto (displaced semicolon and quote, obsolete)
   igbo            ng: Igbo
   yoruba          ng: Yoruba
-  hausa           ng: Hausa
-  left_hand       brai: Braille (left hand)
-  right_hand      brai: Braille (right hand)
+  hausa           ng: Hausa (Nigeria)
+  left_hand       brai: Braille (left-handed)
+  right_hand      brai: Braille (right-handed)
   alt             tm: Turkmen (Alt-Q)
-  fr-oss          ml: French (Mali, alternative)
-  us-mac          ml: English (Mali, US Macintosh)
-  us-intl         ml: English (Mali, US international)
+  fr-oss          ml: French (Mali, alt.)
+  us-mac          ml: English (Mali, US, Macintosh)
+  us-intl         ml: English (Mali, US, intl.)
   kik             ke: Kikuyu
-  qwerty-bay      ph: Filipino (QWERTY Baybayin)
-  capewell-dvorak ph: Filipino (Capewell-Dvorak Latin)
-  capewell-dvorak-bay ph: Filipino (Capewell-Dvorak Baybayin)
-  capewell-qwerf2k6 ph: Filipino (Capewell-QWERF 2006 Latin)
-  capewell-qwerf2k6-bay ph: Filipino (Capewell-QWERF 2006 Baybayin)
-  colemak         ph: Filipino (Colemak Latin)
-  colemak-bay     ph: Filipino (Colemak Baybayin)
-  dvorak          ph: Filipino (Dvorak Latin)
-  dvorak-bay      ph: Filipino (Dvorak Baybayin)
+  qwerty-bay      ph: Filipino (QWERTY, Baybayin)
+  capewell-dvorak ph: Filipino (Capewell-Dvorak, Latin)
+  capewell-dvorak-bay ph: Filipino (Capewell-Dvorak, Baybayin)
+  capewell-qwerf2k6 ph: Filipino (Capewell-QWERF 2006, Latin)
+  capewell-qwerf2k6-bay ph: Filipino (Capewell-QWERF 2006, Baybayin)
+  colemak         ph: Filipino (Colemak, Latin)
+  colemak-bay     ph: Filipino (Colemak, Baybayin)
+  dvorak          ph: Filipino (Dvorak, Latin)
+  dvorak-bay      ph: Filipino (Dvorak, Baybayin)
   gag             md: Moldavian (Gagauz)
 
 ! option
@@ -693,21 +693,21 @@
   grp:switch           Right Alt (while pressed)
   grp:lswitch          Left Alt (while pressed)
   grp:lwin_switch      Left Win (while pressed)
-  grp:rwin_switch      Right Win (while pressed)
-  grp:win_switch       Any Win key (while pressed)
-  grp:caps_switch      Caps Lock (while pressed), Alt+Caps Lock does the original capslock action
+  grp:rwin_switch      Left Win (while pressed)
+  grp:win_switch       Any Win (while pressed)
+  grp:caps_switch      Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action
   grp:rctrl_switch     Right Ctrl (while pressed)
   grp:toggle           Right Alt
   grp:lalt_toggle      Left Alt
   grp:caps_toggle      Caps Lock
   grp:shift_caps_toggle Shift+Caps Lock
-  grp:shift_caps_switch Caps Lock (to first layout), Shift+Caps Lock (to last layout)
-  grp:win_menu_switch  Left Win (to first layout), Right Win/Menu (to last layout)
-  grp:lctrl_rctrl_switch Left Ctrl (to first layout), Right Ctrl (to last layout)
+  grp:shift_caps_switch Caps Lock to first layout; Shift+Caps Lock to last layout
+  grp:win_menu_switch  Left Win to first layout; Right Win/Menu to last layout
+  grp:lctrl_rctrl_switch Left Ctrl to first layout; Right Ctrl to last layout
   grp:alt_caps_toggle  Alt+Caps Lock
-  grp:shifts_toggle    Both Shift keys together
-  grp:alts_toggle      Both Alt keys together
-  grp:ctrls_toggle     Both Ctrl keys together
+  grp:shifts_toggle    Both Shift together
+  grp:alts_toggle      Both Alt together
+  grp:ctrls_toggle     Both Ctrl together
   grp:ctrl_shift_toggle Ctrl+Shift
   grp:lctrl_lshift_toggle Left Ctrl+Left Shift
   grp:rctrl_rshift_toggle Right Ctrl+Right Shift
@@ -717,34 +717,34 @@
   grp:alt_space_toggle Alt+Space
   grp:menu_toggle      Menu
   grp:lwin_toggle      Left Win
-  grp:win_space_toggle Win Key+Space
+  grp:win_space_toggle Win+Space
   grp:rwin_toggle      Right Win
   grp:lshift_toggle    Left Shift
   grp:rshift_toggle    Right Shift
   grp:lctrl_toggle     Left Ctrl
   grp:rctrl_toggle     Right Ctrl
   grp:sclk_toggle      Scroll Lock
-  grp:lctrl_lwin_rctrl_menu LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)
-  grp:lctrl_lwin_toggle LeftCtrl+LeftWin
-  lv3                  Key to choose 3rd level
+  grp:lctrl_lwin_rctrl_menu Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout
+  grp:lctrl_lwin_toggle Left Ctrl+Left Win
+  lv3                  Key to choose the 3rd level
   lv3:switch           Right Ctrl
   lv3:menu_switch      Menu
-  lv3:win_switch       Any Win key
+  lv3:win_switch       Any Win
   lv3:lwin_switch      Left Win
   lv3:rwin_switch      Right Win
-  lv3:alt_switch       Any Alt key
+  lv3:alt_switch       Any Alt
   lv3:lalt_switch      Left Alt
   lv3:ralt_switch      Right Alt
-  lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Compose
-  lv3:ralt_alt         Right Alt key never chooses 3rd level
+  lv3:ralt_switch_multikey Right Alt; Shift+Right Alt as Compose
+  lv3:ralt_alt         Right Alt never chooses 3rd level
   lv3:enter_switch     Enter on keypad
   lv3:caps_switch      Caps Lock
   lv3:bksl_switch      Backslash
   lv3:lsgt_switch      <Less/Greater>
-  lv3:caps_switch_latch Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
-  lv3:bksl_switch_latch Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
-  lv3:lsgt_switch_latch <Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
-  ctrl                 Ctrl key position
+  lv3:caps_switch_latch Caps Lock; acts as onetime lock when pressed together with another 3rd-level chooser
+  lv3:bksl_switch_latch Backslash; acts as onetime lock when pressed together with another 3rd level chooser
+  lv3:lsgt_switch_latch <Less/Greater>; acts as onetime lock when pressed together with another 3rd level chooser
+  ctrl                 Ctrl position
   ctrl:nocaps          Caps Lock as Ctrl
   ctrl:lctrl_meta      Left Ctrl as Meta
   ctrl:swapcaps        Swap Ctrl and Caps Lock
@@ -752,10 +752,10 @@
   ctrl:aa_ctrl         At bottom left
   ctrl:rctrl_ralt      Right Ctrl as Right Alt
   ctrl:menu_rctrl      Menu as Right Ctrl
-  ctrl:swap_lalt_lctl  Swap Left Alt key with Left Ctrl key
-  ctrl:swap_lwin_lctl  Swap Left Win key with Left Ctrl key
-  ctrl:swap_rwin_rctl  Swap Right Win key with Right Ctrl key
-  ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
+  ctrl:swap_lalt_lctl  Swap Left Alt with Left Ctrl
+  ctrl:swap_lwin_lctl  Swap Left Win with Left Ctrl
+  ctrl:swap_rwin_rctl  Swap Right Win with Right Ctrl
+  ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt
   grp_led              Use keyboard LED to show alternative layout
   grp_led:num          Num Lock
   grp_led:caps         Caps Lock
@@ -769,7 +769,7 @@
   keypad:future_wang   Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)
   keypad:hex           Hexadecimal
   keypad:atm           ATM/phone-style
-  kpdl                 Numeric keypad delete key behaviour
+  kpdl                 Numeric keypad Delete behaviour
   kpdl:dot             Legacy key with dot
   kpdl:comma           Legacy key with comma
   kpdl:dotoss          Four-level key with dot
@@ -778,15 +778,15 @@
   kpdl:momayyezoss     Four-level key with momayyez
   kpdl:kposs           Four-level key with abstract separators
   kpdl:semi            Semicolon on third level
-  caps                 Caps Lock key behavior
+  caps                 Caps Lock behavior
   caps:internal        Caps Lock uses internal capitalization; Shift "pauses" Caps Lock
-  caps:internal_nocancel Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock
+  caps:internal_nocancel Caps Lock uses internal capitalization; Shift does not affect Caps Lock
   caps:shift           Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock
-  caps:shift_nocancel  Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock
+  caps:shift_nocancel  Caps Lock acts as Shift with locking; Shift does not affect Caps Lock
   caps:capslock        Caps Lock toggles normal capitalization of alphabetic characters
   caps:shiftlock       Caps Lock toggles ShiftLock (affects all keys)
   caps:swapescape      Swap ESC and Caps Lock
-  caps:escape          Make Caps Lock an additional ESC
+  caps:escape          Make Caps Lock an additional Esc
   caps:backspace       Make Caps Lock an additional Backspace
   caps:super           Make Caps Lock an additional Super
   caps:hyper           Make Caps Lock an additional Hyper
@@ -796,17 +796,17 @@
   caps:none            Caps Lock is disabled
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
-  altwin:meta_alt      Alt and Meta are on Alt keys
-  altwin:alt_win       Alt is mapped to Win keys (and the usual Alt keys)
-  altwin:ctrl_win      Ctrl is mapped to Win keys (and the usual Ctrl keys)
-  altwin:ctrl_alt_win  Ctrl is mapped to Alt keys, Alt is mapped to Win keys
-  altwin:meta_win      Meta is mapped to Win keys
+  altwin:meta_alt      Alt and Meta are on Alt
+  altwin:alt_win       Alt is mapped to Win and the usual Alt
+  altwin:ctrl_win      Ctrl is mapped to Win and the usual Ctrl keys
+  altwin:ctrl_alt_win  Ctrl is mapped to Alt; Alt is mapped to Win
+  altwin:meta_win      Meta is mapped to Win
   altwin:left_meta_win Meta is mapped to Left Win
-  altwin:hyper_win     Hyper is mapped to Win keys
+  altwin:hyper_win     Hyper is mapped to Win
   altwin:alt_super_win Alt is mapped to Right Win, Super to Menu
   altwin:swap_lalt_lwin Left Alt is swapped with Left Win
   altwin:swap_alt_win  Alt is swapped with Win
-  altwin:prtsc_rwin    Win is mapped to PrtSc (and the usual Win key)
+  altwin:prtsc_rwin    Win is mapped to PrtSc and the usual Win
   Compose key          Position of Compose key
   compose:ralt         Right Alt
   compose:lwin         Left Win
@@ -828,17 +828,17 @@
   compose:sclk         Scroll Lock
   compat               Miscellaneous compatibility options
   numpad:pc            Default numeric keypad keys
-  numpad:mac           Numeric keypad keys always enter digits (as in Mac OS)
-  numpad:microsoft     NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)
+  numpad:mac           Numeric keypad always enters digits (as in macOS)
+  numpad:microsoft     Num Lock on: digits; Shift for arrow keys. Num Lock off: arrow keys (as in Windows)
   numpad:shift3        Shift does not cancel Num Lock, chooses 3rd level instead
   srvrkeys:none        Special keys (Ctrl+Alt+<key>) handled in a server
-  apple:alupckeys      Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)
+  apple:alupckeys      Apple Aluminium: emulate PC keys (PrtSc, Scroll Lock, Pause, Num Lock)
   shift:breaks_caps    Shift cancels Caps Lock
   misc:typo            Enable extra typographic characters
-  shift:both_capslock  Both Shift keys together toggle Caps Lock
-  shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shift key deactivates
-  shift:both_shiftlock Both Shift keys together toggle ShiftLock
-  keypad:pointerkeys   Shift + NumLock toggles PointerKeys
+  shift:both_capslock  Both Shift together enable Caps Lock
+  shift:both_capslock_cancel Both Shift together enable Caps Lock; one Shift key disables it
+  shift:both_shiftlock Both Shift together enable Shift Lock
+  keypad:pointerkeys   Shift + Num Lock enables PointerKeys
   grab:break_actions   Allow breaking grabs with keyboard actions (warning: security risk)
   grab:debug           Allow grab and window tree logging
   currencysign         Adding currency signs to certain keys
@@ -848,40 +848,40 @@
   eurosign:5           Euro on 5
   rupeesign:4          Rupee on 4
   lv5                  Key to choose 5th level
-  lv5:lsgt_switch_lock <Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser
-  lv5:ralt_switch_lock Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser
-  lv5:lwin_switch_lock Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser
-  lv5:rwin_switch_lock Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser
-  nbsp                 Using space key to input non-breakable space character
+  lv5:lsgt_switch_lock <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  lv5:ralt_switch_lock Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  lv5:lwin_switch_lock Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  lv5:rwin_switch_lock Right Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+  nbsp                 Using space key to input non-breaking space
   nbsp:none            Usual space at any level
-  nbsp:level2          Non-breakable space character at second level
-  nbsp:level3          Non-breakable space character at third level
-  nbsp:level3s         Non-breakable space character at third level, nothing at fourth level
-  nbsp:level3n         Non-breakable space character at third level, thin non-breakable space character at fourth level
-  nbsp:level4          Non-breakable space character at fourth level
-  nbsp:level4n         Non-breakable space character at fourth level, thin non-breakable space character at sixth level
-  nbsp:level4nl        Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
-  nbsp:zwnj2           Zero-width non-joiner character at second level
-  nbsp:zwnj2zwj3       Zero-width non-joiner character at second level, zero-width joiner character at third level
-  nbsp:zwnj2zwj3nb4    Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level
-  nbsp:zwnj2nb3        Zero-width non-joiner character at second level, non-breakable space character at third level
-  nbsp:zwnj2nb3s       Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level
-  nbsp:zwnj2nb3zwj4    Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level
-  nbsp:zwnj2nb3nnb4    Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level
-  nbsp:zwnj3zwj4       Zero-width non-joiner character at third level, zero-width joiner at fourth level
+  nbsp:level2          Non-breaking space at the 2nd level
+  nbsp:level3          Non-breaking space at the 3rd level
+  nbsp:level3s         Non-breaking space at the 3rd level, nothing at the 4th level
+  nbsp:level3n         Non-breaking space at the 3rd level, thin non-breaking space at the 4th level
+  nbsp:level4          Non-breaking space at the 4th lever
+  nbsp:level4n         Non-breaking space at the 4th lever, thin non-breaking space at the 6th level
+  nbsp:level4nl        Non-breaking space at the 4th lever, thin non-breaking space at the 6th level (via Ctrl+Shift)
+  nbsp:zwnj2           Zero-width non-joiner at the 2nd level
+  nbsp:zwnj2zwj3       Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level
+  nbsp:zwnj2zwj3nb4    Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level, non-breaking space at the 4th level
+  nbsp:zwnj2nb3        Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level
+  nbsp:zwnj2nb3s       Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, nothing at the 4th level
+  nbsp:zwnj2nb3zwj4    Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, zero-width joiner at the 4th level
+  nbsp:zwnj2nb3nnb4    Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, thin non-breakable space at the 4th level
+  nbsp:zwnj3zwj4       Zero-width non-joiner at the 3rd level, zero-width joiner at the 4th level
   japan                Japanese keyboard options
   japan:kana_lock      Kana Lock key is locking
   japan:nicola_f_bs    NICOLA-F style Backspace
-  japan:hztg_escape    Make Zenkaku Hankaku an additional ESC
+  japan:hztg_escape    Make Zenkaku Hankaku an additional Esc
   korean               Korean Hangul/Hanja keys
   korean:hw_keys       Hardware Hangul/Hanja keys
   korean:ralt_rctrl    Right Alt as Hangul, right Ctrl as Hanja
   korean:rctrl_ralt    Right Ctrl as Hangul, right Alt as Hanja
   esperanto            Adding Esperanto supersigned letters
-  esperanto:qwerty     To the corresponding key in a Qwerty layout
+  esperanto:qwerty     To the corresponding key in a QWERTY layout
   esperanto:dvorak     To the corresponding key in a Dvorak layout
   esperanto:colemak    To the corresponding key in a Colemak layout
   solaris              Maintain key compatibility with old Solaris keycodes
   solaris:sun_compat   Sun Key compatibility
   terminate            Key sequence to kill the X server
-  terminate:ctrl_alt_bksp Ctrl + Alt + Backspace
+  terminate:ctrl_alt_bksp Ctrl+Alt+Backspace

Reply via email to