Module Name:    src
Committed By:   snj
Date:           Mon Sep  4 16:51:11 UTC 2017

Modified Files:
        src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man

Log Message:
regen for xkeyboard-config 2.21


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man

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/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2	Mon Feb 13 02:34:11 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Mon Sep  4 16:51:11 2017
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.20" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.21" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -14,25 +14,25 @@ ___
 lB l.
 Model	Description
 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
@@ -44,34 +44,34 @@ btc9019u	BTC 9019U
 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
@@ -79,127 +79,128 @@ geniuskkb2050hs	Genius KKB-2050HS
 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)
 
 .TE
 .SH LAYOUTS
@@ -211,24 +212,24 @@ lB l.
 Layout(Variant)	Description
 us	English (US)
 us(chr)	Cherokee
-us(euro)	English (US, with euro on 5)
-us(intl)	English (US, international with dead keys)
-us(alt-intl)	English (US, alternative international)
+us(euro)	English (US, euro on 5)
+us(intl)	English (US, intl., with dead keys)
+us(alt-intl)	English (US, alt. intl.)
 us(colemak)	English (Colemak)
 us(dvorak)	English (Dvorak)
-us(dvorak-intl)	English (Dvorak, international with dead keys)
-us(dvorak-alt-intl)	English (Dvorak alternative international no dead keys)
-us(dvorak-l)	English (left handed Dvorak)
-us(dvorak-r)	English (right handed Dvorak)
+us(dvorak-intl)	English (Dvorak, intl., with dead keys)
+us(dvorak-alt-intl)	English (Dvorak, alt. intl.)
+us(dvorak-l)	English (Dvorak, left-handed)
+us(dvorak-r)	English (Dvorak, right-handed)
 us(dvorak-classic)	English (classic Dvorak)
-us(dvp)	English (Programmer Dvorak)
+us(dvp)	English (programmer Dvorak)
 us(rus)	Russian (US, phonetic)
 us(mac)	English (Macintosh)
-us(altgr-intl)	English (international AltGr dead keys)
+us(altgr-intl)	English (intl., with dead keys)
 us(olpc2)	English (the divide/multiply keys toggle the layout)
 us(hbs)	Serbo-Croatian (US)
 us(workman)	English (Workman)
-us(workman-intl)	English (Workman, international with dead keys)
+us(workman-intl)	English (Workman, intl., with dead keys)
 
 _
 af	Afghani
@@ -240,10 +241,10 @@ af(uz-olpc)	Uzbek (Afghanistan, OLPC)
 
 _
 ara	Arabic
-ara(azerty)	Arabic (azerty)
-ara(azerty_digits)	Arabic (azerty/digits)
+ara(azerty)	Arabic (AZERTY)
+ara(azerty_digits)	Arabic (AZERTY/digits)
 ara(digits)	Arabic (digits)
-ara(qwerty)	Arabic (qwerty)
+ara(qwerty)	Arabic (QWERTY)
 ara(qwerty_digits)	Arabic (qwerty/digits)
 ara(buckwalter)	Arabic (Buckwalter)
 ara(mac)	Arabic (Macintosh)
@@ -255,15 +256,15 @@ al(plisi)	Albanian (Plisi)
 _
 am	Armenian
 am(phonetic)	Armenian (phonetic)
-am(phonetic-alt)	Armenian (alternative phonetic)
+am(phonetic-alt)	Armenian (alt. phonetic)
 am(eastern)	Armenian (eastern)
 am(western)	Armenian (western)
-am(eastern-alt)	Armenian (alternative eastern)
+am(eastern-alt)	Armenian (alt. eastern)
 
 _
 at	German (Austria)
-at(nodeadkeys)	German (Austria, eliminate dead keys)
-at(sundeadkeys)	German (Austria, Sun dead keys)
+at(nodeadkeys)	German (Austria, no dead keys)
+at(sundeadkeys)	German (Austria, with Sun dead keys)
 at(mac)	German (Austria, Macintosh)
 
 _
@@ -280,31 +281,31 @@ by(latin)	Belarusian (Latin)
 
 _
 be	Belgian
-be(oss)	Belgian (alternative)
-be(oss_latin9)	Belgian (alternative, Latin-9 only)
-be(oss_sundeadkeys)	Belgian (alternative, Sun dead keys)
-be(iso-alternate)	Belgian (ISO alternate)
-be(nodeadkeys)	Belgian (eliminate dead keys)
-be(sundeadkeys)	Belgian (Sun dead keys)
-be(wang)	Belgian (Wang model 724 azerty)
+be(oss)	Belgian (alt.)
+be(oss_latin9)	Belgian (alt., Latin-9 only)
+be(oss_sundeadkeys)	Belgian (alt., with Sun dead keys)
+be(iso-alternate)	Belgian (alt. ISO)
+be(nodeadkeys)	Belgian (no dead keys)
+be(sundeadkeys)	Belgian (with Sun dead keys)
+be(wang)	Belgian (Wang 724 AZERTY)
 
 _
 in	Indian
 in(urd-phonetic)	Urdu (phonetic)
-in(urd-phonetic3)	Urdu (alternative phonetic)
-in(urd-winkeys)	Urdu (WinKeys)
-in(eng)	English (India, with rupee sign)
+in(urd-phonetic3)	Urdu (alt. phonetic)
+in(urd-winkeys)	Urdu (Win keys)
+in(eng)	English (India, with rupee)
 
 _
 ba	Bosnian
-ba(alternatequotes)	Bosnian (with guillemets for quotes)
+ba(alternatequotes)	Bosnian (with guillements)
 ba(unicode)	Bosnian (with Bosnian digraphs)
-ba(unicodeus)	Bosnian (US keyboard with Bosnian digraphs)
-ba(us)	Bosnian (US keyboard with Bosnian letters)
+ba(unicodeus)	Bosnian (US, with Bosnian digraphs)
+ba(us)	Bosnian (US, with Bosnian letters)
 
 _
 br	Portuguese (Brazil)
-br(nodeadkeys)	Portuguese (Brazil, eliminate dead keys)
+br(nodeadkeys)	Portuguese (Brazil, no dead keys)
 br(dvorak)	Portuguese (Brazil, Dvorak)
 br(nativo)	Portuguese (Brazil, Nativo)
 br(nativo-us)	Portuguese (Brazil, Nativo for US keyboards)
@@ -317,16 +318,16 @@ bg(phonetic)	Bulgarian (traditional phon
 bg(bas_phonetic)	Bulgarian (new phonetic)
 
 _
-dz	Berber (Algeria, Latin characters)
-dz(ber)	Berber (Algeria, Tifinagh characters)
+dz	Berber (Algeria, Latin)
+dz(ber)	Berber (Algeria, Tifinagh)
 dz(ar)	Arabic (Algeria)
 
 _
 ma	Arabic (Morocco)
 ma(french)	French (Morocco)
 ma(tifinagh)	Berber (Morocco, Tifinagh)
-ma(tifinagh-alt)	Berber (Morocco, Tifinagh alternative)
-ma(tifinagh-alt-phonetic)	Berber (Morocco, Tifinagh alternative phonetic)
+ma(tifinagh-alt)	Berber (Morocco, Tifinagh alt.)
+ma(tifinagh-alt-phonetic)	Berber (Morocco, Tifinagh alt. phonetic)
 ma(tifinagh-extended)	Berber (Morocco, Tifinagh extended)
 ma(tifinagh-phonetic)	Berber (Morocco, Tifinagh phonetic)
 ma(tifinagh-extended-phonetic)	Berber (Morocco, Tifinagh extended phonetic)
@@ -334,8 +335,8 @@ ma(tifinagh-extended-phonetic)	Berber (M
 _
 cm	English (Cameroon)
 cm(french)	French (Cameroon)
-cm(qwerty)	Cameroon Multilingual (qwerty)
-cm(azerty)	Cameroon Multilingual (azerty)
+cm(qwerty)	Cameroon Multilingual (QWERTY)
+cm(azerty)	Cameroon Multilingual (AZERTY)
 cm(dvorak)	Cameroon Multilingual (Dvorak)
 cm(mmuock)	Mmuock
 
@@ -347,8 +348,8 @@ ca	French (Canada)
 ca(fr-dvorak)	French (Canada, Dvorak)
 ca(fr-legacy)	French (Canada, legacy)
 ca(multix)	Canadian Multilingual
-ca(multi)	Canadian Multilingual (first part)
-ca(multi-2gr)	Canadian Multilingual (second part)
+ca(multi)	Canadian Multilingual (1st part)
+ca(multi-2gr)	Canadian Multilingual (2nd part)
 ca(ike)	Inuktitut
 ca(eng)	English (Canada)
 
@@ -363,31 +364,31 @@ cn(ug)	Uyghur
 
 _
 hr	Croatian
-hr(alternatequotes)	Croatian (with guillemets for quotes)
+hr(alternatequotes)	Croatian (with guillements)
 hr(unicode)	Croatian (with Croatian digraphs)
-hr(unicodeus)	Croatian (US keyboard with Croatian digraphs)
-hr(us)	Croatian (US keyboard with Croatian letters)
+hr(unicodeus)	Croatian (US, with Croatian digraphs)
+hr(us)	Croatian (US, with Croatian letters)
 
 _
 cz	Czech
 cz(bksl)	Czech (with <\|> key)
-cz(qwerty)	Czech (qwerty)
-cz(qwerty_bksl)	Czech (qwerty, extended Backslash)
-cz(ucw)	Czech (UCW layout, accented letters only)
-cz(dvorak-ucw)	Czech (US Dvorak with CZ UCW support)
+cz(qwerty)	Czech (QWERTY)
+cz(qwerty_bksl)	Czech (QWERTY, extended backslash)
+cz(ucw)	Czech (UCW, only accented letters)
+cz(dvorak-ucw)	Czech (US, Dvorak, UCW support)
 cz(rus)	Russian (Czech, phonetic)
 
 _
 dk	Danish
-dk(nodeadkeys)	Danish (eliminate dead keys)
-dk(winkeys)	Danish (Winkeys)
+dk(nodeadkeys)	Danish (no dead keys)
+dk(winkeys)	Danish (Win keys)
 dk(mac)	Danish (Macintosh)
-dk(mac_nodeadkeys)	Danish (Macintosh, eliminate dead keys)
+dk(mac_nodeadkeys)	Danish (Macintosh, no dead keys)
 dk(dvorak)	Danish (Dvorak)
 
 _
 nl	Dutch
-nl(sundeadkeys)	Dutch (Sun dead keys)
+nl(sundeadkeys)	Dutch (with Sun dead keys)
 nl(mac)	Dutch (Macintosh)
 nl(std)	Dutch (standard)
 
@@ -396,9 +397,9 @@ bt	Dzongkha
 
 _
 ee	Estonian
-ee(nodeadkeys)	Estonian (eliminate dead keys)
+ee(nodeadkeys)	Estonian (no dead keys)
 ee(dvorak)	Estonian (Dvorak)
-ee(us)	Estonian (US keyboard with Estonian letters)
+ee(us)	Estonian (US, with Estonian letters)
 
 _
 ir	Persian
@@ -417,32 +418,32 @@ iq(ku_ara)	Kurdish (Iraq, Arabic-Latin)
 
 _
 fo	Faroese
-fo(nodeadkeys)	Faroese (eliminate dead keys)
+fo(nodeadkeys)	Faroese (no dead keys)
 
 _
 fi	Finnish
 fi(classic)	Finnish (classic)
-fi(nodeadkeys)	Finnish (classic, eliminate dead keys)
+fi(nodeadkeys)	Finnish (classic, no dead keys)
 fi(winkeys)	Finnish (Winkeys)
 fi(smi)	Northern Saami (Finland)
 fi(mac)	Finnish (Macintosh)
 
 _
 fr	French
-fr(nodeadkeys)	French (eliminate dead keys)
-fr(sundeadkeys)	French (Sun dead keys)
-fr(oss)	French (alternative)
-fr(oss_latin9)	French (alternative, Latin-9 only)
-fr(oss_nodeadkeys)	French (alternative, eliminate dead keys)
-fr(oss_sundeadkeys)	French (alternative, Sun dead keys)
-fr(latin9)	French (legacy, alternative)
-fr(latin9_nodeadkeys)	French (legacy, alternative, eliminate dead keys)
-fr(latin9_sundeadkeys)	French (legacy, alternative, Sun dead keys)
+fr(nodeadkeys)	French (no dead keys)
+fr(sundeadkeys)	French (with Sun dead keys)
+fr(oss)	French (alt.)
+fr(oss_latin9)	French (alt., Latin-9 only)
+fr(oss_nodeadkeys)	French (alt., no dead keys)
+fr(oss_sundeadkeys)	French (alt., with Sun dead keys)
+fr(latin9)	French (legacy, alt.)
+fr(latin9_nodeadkeys)	French (legacy, alt., no dead keys)
+fr(latin9_sundeadkeys)	French (legacy, alt., with Sun dead keys)
 fr(bepo)	French (Bepo, ergonomic, Dvorak way)
 fr(bepo_latin9)	French (Bepo, ergonomic, Dvorak way, Latin-9 only)
 fr(dvorak)	French (Dvorak)
 fr(mac)	French (Macintosh)
-fr(azerty)	French (Azerty)
+fr(azerty)	French (AZERTY)
 fr(bre)	French (Breton)
 fr(oci)	Occitan
 fr(geo)	Georgian (France, AZERTY Tskapo)
@@ -454,7 +455,7 @@ gh(akan)	Akan
 gh(ewe)	Ewe
 gh(fula)	Fula
 gh(ga)	Ga
-gh(hausa)	Hausa
+gh(hausa)	Hausa (Ghana)
 gh(avn)	Avatime
 gh(gillbt)	English (Ghana, GILLBT)
 
@@ -472,18 +473,18 @@ _
 de	German
 de(deadacute)	German (dead acute)
 de(deadgraveacute)	German (dead grave acute)
-de(nodeadkeys)	German (eliminate dead keys)
+de(nodeadkeys)	German (no dead keys)
 de(T3)	German (T3)
 de(ro)	Romanian (Germany)
-de(ro_nodeadkeys)	Romanian (Germany, eliminate dead keys)
+de(ro_nodeadkeys)	Romanian (Germany, no dead keys)
 de(dvorak)	German (Dvorak)
-de(sundeadkeys)	German (Sun dead keys)
+de(sundeadkeys)	German (with Sun dead keys)
 de(neo)	German (Neo 2)
 de(mac)	German (Macintosh)
-de(mac_nodeadkeys)	German (Macintosh, eliminate dead keys)
+de(mac_nodeadkeys)	German (Macintosh, no dead keys)
 de(dsb)	Lower Sorbian
-de(dsb_qwertz)	Lower Sorbian (qwertz)
-de(qwerty)	German (qwerty)
+de(dsb_qwertz)	Lower Sorbian (QWERTZ)
+de(qwerty)	German (QWERTY)
 de(tr)	Turkish (Germany)
 de(ru)	Russian (Germany, phonetic)
 de(deadtilde)	German (dead tilde)
@@ -492,35 +493,35 @@ _
 gr	Greek
 gr(simple)	Greek (simple)
 gr(extended)	Greek (extended)
-gr(nodeadkeys)	Greek (eliminate dead keys)
+gr(nodeadkeys)	Greek (no dead keys)
 gr(polytonic)	Greek (polytonic)
 
 _
 hu	Hungarian
 hu(standard)	Hungarian (standard)
-hu(nodeadkeys)	Hungarian (eliminate dead keys)
-hu(qwerty)	Hungarian (qwerty)
-hu(101_qwertz_comma_dead)	Hungarian (101/qwertz/comma/dead keys)
-hu(101_qwertz_comma_nodead)	Hungarian (101/qwertz/comma/eliminate dead keys)
-hu(101_qwertz_dot_dead)	Hungarian (101/qwertz/dot/dead keys)
-hu(101_qwertz_dot_nodead)	Hungarian (101/qwertz/dot/eliminate dead keys)
-hu(101_qwerty_comma_dead)	Hungarian (101/qwerty/comma/dead keys)
-hu(101_qwerty_comma_nodead)	Hungarian (101/qwerty/comma/eliminate dead keys)
-hu(101_qwerty_dot_dead)	Hungarian (101/qwerty/dot/dead keys)
-hu(101_qwerty_dot_nodead)	Hungarian (101/qwerty/dot/eliminate dead keys)
-hu(102_qwertz_comma_dead)	Hungarian (102/qwertz/comma/dead keys)
-hu(102_qwertz_comma_nodead)	Hungarian (102/qwertz/comma/eliminate dead keys)
-hu(102_qwertz_dot_dead)	Hungarian (102/qwertz/dot/dead keys)
-hu(102_qwertz_dot_nodead)	Hungarian (102/qwertz/dot/eliminate dead keys)
-hu(102_qwerty_comma_dead)	Hungarian (102/qwerty/comma/dead keys)
-hu(102_qwerty_comma_nodead)	Hungarian (102/qwerty/comma/eliminate dead keys)
-hu(102_qwerty_dot_dead)	Hungarian (102/qwerty/dot/dead keys)
-hu(102_qwerty_dot_nodead)	Hungarian (102/qwerty/dot/eliminate dead keys)
+hu(nodeadkeys)	Hungarian (no dead keys)
+hu(qwerty)	Hungarian (QWERTY)
+hu(101_qwertz_comma_dead)	Hungarian (101/QWERTZ/comma/dead keys)
+hu(101_qwertz_comma_nodead)	Hungarian (101/QWERTZ/comma/no dead keys)
+hu(101_qwertz_dot_dead)	Hungarian (101/QWERTZ/dot/dead keys)
+hu(101_qwertz_dot_nodead)	Hungarian (101/QWERTZ/dot/no dead keys)
+hu(101_qwerty_comma_dead)	Hungarian (101/QWERTY/comma/dead keys)
+hu(101_qwerty_comma_nodead)	Hungarian (101/QWERTY/comma/no dead keys)
+hu(101_qwerty_dot_dead)	Hungarian (101/QWERTY/dot/dead keys)
+hu(101_qwerty_dot_nodead)	Hungarian (101/QWERTY/dot/no dead keys)
+hu(102_qwertz_comma_dead)	Hungarian (102/QWERTZ/comma/dead keys)
+hu(102_qwertz_comma_nodead)	Hungarian (102/QWERTZ/comma/no dead keys)
+hu(102_qwertz_dot_dead)	Hungarian (102/QWERTZ/dot/dead keys)
+hu(102_qwertz_dot_nodead)	Hungarian (102/QWERTZ/dot/no dead keys)
+hu(102_qwerty_comma_dead)	Hungarian (102/QWERTY/comma/dead keys)
+hu(102_qwerty_comma_nodead)	Hungarian (102/QWERTY/comma/no dead keys)
+hu(102_qwerty_dot_dead)	Hungarian (102/QWERTY/dot/dead keys)
+hu(102_qwerty_dot_nodead)	Hungarian (102/QWERTY/dot/no dead keys)
 
 _
 is	Icelandic
-is(Sundeadkeys)	Icelandic (Sun dead keys)
-is(nodeadkeys)	Icelandic (eliminate dead keys)
+is(Sundeadkeys)	Icelandic (with Sun dead keys)
+is(nodeadkeys)	Icelandic (no dead keys)
 is(mac_legacy)	Icelandic (Macintosh, legacy)
 is(mac)	Icelandic (Macintosh)
 is(dvorak)	Icelandic (Dvorak)
@@ -533,10 +534,10 @@ il(biblical)	Hebrew (Biblical, Tiro)
 
 _
 it	Italian
-it(nodeadkeys)	Italian (eliminate dead keys)
+it(nodeadkeys)	Italian (no dead keys)
 it(winkeys)	Italian (Winkeys)
 it(mac)	Italian (Macintosh)
-it(us)	Italian (US keyboard with Italian letters)
+it(us)	Italian (US, with Italian letters)
 it(geo)	Georgian (Italy)
 it(ibm)	Italian (IBM 142)
 
@@ -567,24 +568,24 @@ la(stea)	Lao (STEA proposed standard lay
 
 _
 latam	Spanish (Latin American)
-latam(nodeadkeys)	Spanish (Latin American, eliminate dead keys)
-latam(deadtilde)	Spanish (Latin American, include dead tilde)
-latam(sundeadkeys)	Spanish (Latin American, Sun dead keys)
+latam(nodeadkeys)	Spanish (Latin American, no dead keys)
+latam(deadtilde)	Spanish (Latin American, dead tilde)
+latam(sundeadkeys)	Spanish (Latin American, with Sun dead keys)
 latam(dvorak)	Spanish (Latin American, Dvorak)
 
 _
 lt	Lithuanian
 lt(std)	Lithuanian (standard)
-lt(us)	Lithuanian (US keyboard with Lithuanian letters)
+lt(us)	Lithuanian (US, with Lithuanian letters)
 lt(ibm)	Lithuanian (IBM LST 1205-92)
 lt(lekp)	Lithuanian (LEKP)
 lt(lekpa)	Lithuanian (LEKPa)
 
 _
 lv	Latvian
-lv(apostrophe)	Latvian (apostrophe variant)
-lv(tilde)	Latvian (tilde variant)
-lv(fkey)	Latvian (F variant)
+lv(apostrophe)	Latvian (apostrophe)
+lv(tilde)	Latvian (tilde)
+lv(fkey)	Latvian (F)
 lv(modern)	Latvian (modern)
 lv(ergonomic)	Latvian (ergonomic, ŪGJRMV)
 lv(adapted)	Latvian (adapted)
@@ -596,15 +597,15 @@ _
 me	Montenegrin
 me(cyrillic)	Montenegrin (Cyrillic)
 me(cyrillicyz)	Montenegrin (Cyrillic, ZE and ZHE swapped)
-me(latinunicode)	Montenegrin (Latin Unicode)
-me(latinyz)	Montenegrin (Latin qwerty)
-me(latinunicodeyz)	Montenegrin (Latin Unicode qwerty)
+me(latinunicode)	Montenegrin (Latin, Unicode)
+me(latinyz)	Montenegrin (Latin, QWERTY)
+me(latinunicodeyz)	Montenegrin (Latin, Unicode, QWERTY)
 me(cyrillicalternatequotes)	Montenegrin (Cyrillic with guillemets)
 me(latinalternatequotes)	Montenegrin (Latin with guillemets)
 
 _
 mk	Macedonian
-mk(nodeadkeys)	Macedonian (eliminate dead keys)
+mk(nodeadkeys)	Macedonian (no dead keys)
 
 _
 mt	Maltese
@@ -615,22 +616,22 @@ mn	Mongolian
 
 _
 no	Norwegian
-no(nodeadkeys)	Norwegian (eliminate dead keys)
-no(winkeys)	Norwegian (Winkeys)
+no(nodeadkeys)	Norwegian (no dead keys)
+no(winkeys)	Norwegian (Win keys)
 no(dvorak)	Norwegian (Dvorak)
 no(smi)	Northern Saami (Norway)
-no(smi_nodeadkeys)	Northern Saami (Norway, eliminate dead keys)
+no(smi_nodeadkeys)	Northern Saami (Norway, no dead keys)
 no(mac)	Norwegian (Macintosh)
-no(mac_nodeadkeys)	Norwegian (Macintosh, eliminate dead keys)
+no(mac_nodeadkeys)	Norwegian (Macintosh, no dead keys)
 no(colemak)	Norwegian (Colemak)
 
 _
 pl	Polish
 pl(legacy)	Polish (legacy)
-pl(qwertz)	Polish (qwertz)
+pl(qwertz)	Polish (QWERTZ)
 pl(dvorak)	Polish (Dvorak)
-pl(dvorak_quotes)	Polish (Dvorak, Polish quotes on quotemark key)
-pl(dvorak_altquotes)	Polish (Dvorak, Polish quotes on key 1)
+pl(dvorak_quotes)	Polish (Dvorak, with Polish quotes on quotemark key)
+pl(dvorak_altquotes)	Polish (Dvorak, with Polish quotes on key 1)
 pl(csb)	Kashubian
 pl(szl)	Silesian
 pl(ru_phonetic_dvorak)	Russian (Poland, phonetic Dvorak)
@@ -638,11 +639,11 @@ pl(dvp)	Polish (programmer Dvorak)
 
 _
 pt	Portuguese
-pt(nodeadkeys)	Portuguese (eliminate dead keys)
-pt(sundeadkeys)	Portuguese (Sun dead keys)
+pt(nodeadkeys)	Portuguese (no dead keys)
+pt(sundeadkeys)	Portuguese (with Sun dead keys)
 pt(mac)	Portuguese (Macintosh)
-pt(mac_nodeadkeys)	Portuguese (Macintosh, eliminate dead keys)
-pt(mac_sundeadkeys)	Portuguese (Macintosh, Sun dead keys)
+pt(mac_nodeadkeys)	Portuguese (Macintosh, no dead keys)
+pt(mac_sundeadkeys)	Portuguese (Macintosh, with Sun dead keys)
 pt(nativo)	Portuguese (Nativo)
 pt(nativo-us)	Portuguese (Nativo for US keyboards)
 pt(nativo-epo)	Esperanto (Portugal, Nativo)
@@ -652,18 +653,18 @@ ro	Romanian
 ro(cedilla)	Romanian (cedilla)
 ro(std)	Romanian (standard)
 ro(std_cedilla)	Romanian (standard cedilla)
-ro(winkeys)	Romanian (WinKeys)
+ro(winkeys)	Romanian (Win keys)
 
 _
 ru	Russian
 ru(phonetic)	Russian (phonetic)
-ru(phonetic_winkeys)	Russian (phonetic WinKeys)
+ru(phonetic_winkeys)	Russian (phonetic, with Win keys)
 ru(typewriter)	Russian (typewriter)
 ru(legacy)	Russian (legacy)
 ru(typewriter-legacy)	Russian (typewriter, legacy)
 ru(tt)	Tatar
 ru(os_legacy)	Ossetian (legacy)
-ru(os_winkeys)	Ossetian (WinKeys)
+ru(os_winkeys)	Ossetian (Win keys)
 ru(cv)	Chuvash
 ru(cv_latin)	Chuvash (Latin)
 ru(udm)	Udmurt
@@ -675,38 +676,38 @@ ru(mac)	Russian (Macintosh)
 ru(srp)	Serbian (Russia)
 ru(bak)	Bashkirian
 ru(chm)	Mari
-ru(phonetic_azerty)	Russian (phonetic azerty)
-ru(phonetic_dvorak)	Russian (phonetic dvorak)
-ru(phonetic_fr)	Russian (phonetic French)
+ru(phonetic_azerty)	Russian (phonetic, AZERTY)
+ru(phonetic_dvorak)	Russian (phonetic, Dvorak)
+ru(phonetic_fr)	Russian Russian (phonetic, French)
 
 _
 rs	Serbian
 rs(yz)	Serbian (Cyrillic, ZE and ZHE swapped)
 rs(latin)	Serbian (Latin)
-rs(latinunicode)	Serbian (Latin Unicode)
-rs(latinyz)	Serbian (Latin qwerty)
-rs(latinunicodeyz)	Serbian (Latin Unicode qwerty)
+rs(latinunicode)	Serbian (Latin, Unicode)
+rs(latinyz)	Serbian (Latin, QWERTY)
+rs(latinunicodeyz)	Serbian (Latin, Unicode, QWERTY)
 rs(alternatequotes)	Serbian (Cyrillic with guillemets)
 rs(latinalternatequotes)	Serbian (Latin with guillemets)
 rs(rue)	Pannonian Rusyn
 
 _
 si	Slovenian
-si(alternatequotes)	Slovenian (with guillemets for quotes)
-si(us)	Slovenian (US keyboard with Slovenian letters)
+si(alternatequotes)	Slovenian (with guillements)
+si(us)	Slovenian (US, with Slovenian letters)
 
 _
 sk	Slovak
-sk(bksl)	Slovak (extended Backslash)
-sk(qwerty)	Slovak (qwerty)
-sk(qwerty_bksl)	Slovak (qwerty, extended Backslash)
+sk(bksl)	Slovak (extended backslash)
+sk(qwerty)	Slovak (QWERTY)
+sk(qwerty_bksl)	Slovak (QWERTY, extended backslash)
 
 _
 es	Spanish
-es(nodeadkeys)	Spanish (eliminate dead keys)
-es(winkeys)	Spanish (Winkeys)
-es(deadtilde)	Spanish (include dead tilde)
-es(sundeadkeys)	Spanish (Sun dead keys)
+es(nodeadkeys)	Spanish (no dead keys)
+es(winkeys)	Spanish (Win keys)
+es(deadtilde)	Spanish (dead tilde)
+es(sundeadkeys)	Spanish (with Sun dead keys)
 es(dvorak)	Spanish (Dvorak)
 es(ast)	Asturian (Spain, with bottom-dot H and bottom-dot L)
 es(cat)	Catalan (Spain, with middle-dot L)
@@ -714,10 +715,10 @@ es(mac)	Spanish (Macintosh)
 
 _
 se	Swedish
-se(nodeadkeys)	Swedish (eliminate dead keys)
+se(nodeadkeys)	Swedish (no dead keys)
 se(dvorak)	Swedish (Dvorak)
 se(rus)	Russian (Sweden, phonetic)
-se(rus_nodeadkeys)	Russian (Sweden, phonetic, eliminate dead keys)
+se(rus_nodeadkeys)	Russian (Sweden, phonetic, no dead keys)
 se(smi)	Northern Saami (Sweden)
 se(mac)	Swedish (Macintosh)
 se(svdvorak)	Swedish (Svdvorak)
@@ -726,11 +727,11 @@ se(swl)	Swedish Sign Language
 _
 ch	German (Switzerland)
 ch(legacy)	German (Switzerland, legacy)
-ch(de_nodeadkeys)	German (Switzerland, eliminate dead keys)
-ch(de_sundeadkeys)	German (Switzerland, Sun dead keys)
+ch(de_nodeadkeys)	German (Switzerland, no dead keys)
+ch(de_sundeadkeys)	German (Switzerland, with Sun dead keys)
 ch(fr)	French (Switzerland)
-ch(fr_nodeadkeys)	French (Switzerland, eliminate dead keys)
-ch(fr_sundeadkeys)	French (Switzerland, Sun dead keys)
+ch(fr_nodeadkeys)	French (Switzerland, no dead keys)
+ch(fr_sundeadkeys)	French (Switzerland, with Sun dead keys)
 ch(fr_mac)	French (Switzerland, Macintosh)
 ch(de_mac)	German (Switzerland, Macintosh)
 
@@ -750,7 +751,7 @@ _
 lk	Sinhala (phonetic)
 lk(tam_unicode)	Tamil (Sri Lanka, Unicode)
 lk(tam_TAB)	Tamil (Sri Lanka, TAB Typewriter)
-lk(us)	Sinhala (US keyboard with Sinhala letters)
+lk(us)	Sinhala (US, with Sinhala letters)
 
 _
 th	Thai
@@ -761,11 +762,11 @@ _
 tr	Turkish
 tr(f)	Turkish (F)
 tr(alt)	Turkish (Alt-Q)
-tr(sundeadkeys)	Turkish (Sun dead keys)
+tr(sundeadkeys)	Turkish (with Sun dead keys)
 tr(ku)	Kurdish (Turkey, Latin Q)
 tr(ku_f)	Kurdish (Turkey, F)
 tr(ku_alt)	Kurdish (Turkey, Latin Alt-Q)
-tr(intl)	Turkish (international with dead keys)
+tr(intl)	Turkish (intl., with dead keys)
 tr(crh)	Crimean Tatar (Turkish Q)
 tr(crh_f)	Crimean Tatar (Turkish F)
 tr(crh_alt)	Crimean Tatar (Turkish Alt-Q)
@@ -779,7 +780,7 @@ _
 ua	Ukrainian
 ua(phonetic)	Ukrainian (phonetic)
 ua(typewriter)	Ukrainian (typewriter)
-ua(winkeys)	Ukrainian (WinKeys)
+ua(winkeys)	Ukrainian (Win keys)
 ua(legacy)	Ukrainian (legacy)
 ua(rstu)	Ukrainian (standard RSTU)
 ua(rstu_ru)	Russian (Ukraine, standard RSTU)
@@ -787,12 +788,12 @@ ua(homophonic)	Ukrainian (homophonic)
 
 _
 gb	English (UK)
-gb(extd)	English (UK, extended WinKeys)
-gb(intl)	English (UK, international with dead keys)
+gb(extd)	English (UK, extended, with Win keys)
+gb(intl)	English (UK, intl., with dead keys)
 gb(dvorak)	English (UK, Dvorak)
-gb(dvorakukp)	English (UK, Dvorak with UK punctuation)
+gb(dvorakukp)	English (UK, Dvorak, with UK punctuation)
 gb(mac)	English (UK, Macintosh)
-gb(mac_intl)	English (UK, Macintosh international)
+gb(mac_intl)	English (UK, intl., Macintosh)
 gb(colemak)	English (UK, Colemak)
 
 _
@@ -807,7 +808,7 @@ kr	Korean
 kr(kr104)	Korean (101/104 key compatible)
 
 _
-nec_vndr/jp	Japanese (PC-98xx Series)
+nec_vndr/jp	Japanese (PC-98)
 
 _
 ie	Irish
@@ -840,7 +841,7 @@ _
 ng	English (Nigeria)
 ng(igbo)	Igbo
 ng(yoruba)	Yoruba
-ng(hausa)	Hausa
+ng(hausa)	Hausa (Nigeria)
 
 _
 et	Amharic
@@ -850,8 +851,8 @@ sn	Wolof
 
 _
 brai	Braille
-brai(left_hand)	Braille (left hand)
-brai(right_hand)	Braille (right hand)
+brai(left_hand)	Braille (left-handed)
+brai(right_hand)	Braille (right-handed)
 
 _
 tm	Turkmen
@@ -859,9 +860,9 @@ tm(alt)	Turkmen (Alt-Q)
 
 _
 ml	Bambara
-ml(fr-oss)	French (Mali, alternative)
-ml(us-mac)	English (Mali, US Macintosh)
-ml(us-intl)	English (Mali, US international)
+ml(fr-oss)	French (Mali, alt.)
+ml(us-mac)	English (Mali, US, Macintosh)
+ml(us-intl)	English (Mali, US, intl.)
 
 _
 tz	Swahili (Tanzania)
@@ -878,15 +879,15 @@ bw	Tswana
 
 _
 ph	Filipino
-ph(qwerty-bay)	Filipino (QWERTY Baybayin)
-ph(capewell-dvorak)	Filipino (Capewell-Dvorak Latin)
-ph(capewell-dvorak-bay)	Filipino (Capewell-Dvorak Baybayin)
-ph(capewell-qwerf2k6)	Filipino (Capewell-QWERF 2006 Latin)
-ph(capewell-qwerf2k6-bay)	Filipino (Capewell-QWERF 2006 Baybayin)
-ph(colemak)	Filipino (Colemak Latin)
-ph(colemak-bay)	Filipino (Colemak Baybayin)
-ph(dvorak)	Filipino (Dvorak Latin)
-ph(dvorak-bay)	Filipino (Dvorak Baybayin)
+ph(qwerty-bay)	Filipino (QWERTY, Baybayin)
+ph(capewell-dvorak)	Filipino (Capewell-Dvorak, Latin)
+ph(capewell-dvorak-bay)	Filipino (Capewell-Dvorak, Baybayin)
+ph(capewell-qwerf2k6)	Filipino (Capewell-QWERF 2006, Latin)
+ph(capewell-qwerf2k6-bay)	Filipino (Capewell-QWERF 2006, Baybayin)
+ph(colemak)	Filipino (Colemak, Latin)
+ph(colemak-bay)	Filipino (Colemak, Baybayin)
+ph(dvorak)	Filipino (Dvorak, Latin)
+ph(dvorak-bay)	Filipino (Dvorak, Baybayin)
 
 _
 md	Moldavian
@@ -899,9 +900,6 @@ _
 my	Malay (Jawi)
 
 _
-bn	Malay (Jawi)
-
-_
 
 .TE
 .SH OPTIONS
@@ -918,21 +916,21 @@ Option	Description
 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
@@ -942,21 +940,21 @@ grp:lalt_lshift_toggle	Left Alt+Left Shi
 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
+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
 
 .TE
 
 
 .SS
-Key to choose 3rd level
+Key to choose the 3rd level
 .BR
 .TS
 left,box;
@@ -966,27 +964,27 @@ lB l.
 Option	Description
 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
+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
 
 .TE
 
 
 .SS
-Ctrl key position
+Ctrl position
 .BR
 .TS
 left,box;
@@ -1001,10 +999,10 @@ ctrl:ac_ctrl	At left of 'A'
 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
 
 .TE
 
@@ -1047,7 +1045,7 @@ keypad:atm	ATM/phone-style
 
 
 .SS
-Numeric keypad delete key behaviour
+Numeric keypad Delete behaviour
 .BR
 .TS
 left,box;
@@ -1068,7 +1066,7 @@ kpdl:semi	Semicolon on third level
 
 
 .SS
-Caps Lock key behavior
+Caps Lock behavior
 .BR
 .TS
 left,box;
@@ -1077,13 +1075,13 @@ ___
 lB l.
 Option	Description
 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
@@ -1105,17 +1103,17 @@ ___
 lB l.
 Option	Description
 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
 
 .TE
 
@@ -1161,17 +1159,17 @@ ___
 lB l.
 Option	Description
 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
 
@@ -1205,16 +1203,16 @@ lB lB
 ___
 lB l.
 Option	Description
-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
+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
 
 .TE
 
 
 .SS
-Using space key to input non-breakable space character
+Using space key to input non-breaking space
 .BR
 .TS
 left,box;
@@ -1223,21 +1221,21 @@ ___
 lB l.
 Option	Description
 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
 
 .TE
 
@@ -1253,7 +1251,7 @@ lB l.
 Option	Description
 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
 
 .TE
 
@@ -1283,7 +1281,7 @@ lB lB
 ___
 lB l.
 Option	Description
-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
 
@@ -1313,7 +1311,7 @@ lB lB
 ___
 lB l.
 Option	Description
-terminate:ctrl_alt_bksp	Ctrl + Alt + Backspace
+terminate:ctrl_alt_bksp	Ctrl+Alt+Backspace
 
 .TE
 

Reply via email to