Module Name:    src
Committed By:   mrg
Date:           Sun Mar 11 20:17:19 UTC 2018

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

Log Message:
regen these files for xkeyboard-config 2.23.1.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.11 -r1.12 \
    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/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.4
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3	Mon Sep  4 16:51:11 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Sun Mar 11 20:17:19 2018
@@ -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.21" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.23.1" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -18,7 +18,7 @@ pc102	Generic 101-key PC (intl.)
 pc104	Generic 104-key PC
 pc105	Generic 105-key PC (intl.)
 dell101	Dell 101-key PC
-latitude	Dell Latutude laptop
+latitude	Dell Latitude laptop
 dellm65	Dell Precision M65 laptop
 everex	Everex STEPnote
 flexpro	Keytronic FlexPro
@@ -225,7 +225,7 @@ us(dvorak-classic)	English (classic Dvor
 us(dvp)	English (programmer Dvorak)
 us(rus)	Russian (US, phonetic)
 us(mac)	English (Macintosh)
-us(altgr-intl)	English (intl., with dead keys)
+us(altgr-intl)	English (intl., with AltGr dead keys)
 us(olpc2)	English (the divide/multiply keys toggle the layout)
 us(hbs)	Serbo-Croatian (US)
 us(workman)	English (Workman)
@@ -247,6 +247,7 @@ ara(digits)	Arabic (digits)
 ara(qwerty)	Arabic (QWERTY)
 ara(qwerty_digits)	Arabic (qwerty/digits)
 ara(buckwalter)	Arabic (Buckwalter)
+ara(olpc)	Arabic (OLPC)
 ara(mac)	Arabic (Macintosh)
 
 _
@@ -290,15 +291,49 @@ be(sundeadkeys)	Belgian (with Sun dead k
 be(wang)	Belgian (Wang 724 AZERTY)
 
 _
+bd	Bangla
+bd(probhat)	Bangla (Probhat)
+
+_
 in	Indian
+in(ben)	Bangla (India)
+in(ben_probhat)	Bangla (India, Probhat)
+in(ben_baishakhi)	Bangla (India, Baishakhi)
+in(ben_bornona)	Bangla (India, Bornona)
+in(ben_gitanjali)	Bangla (India, Uni Gitanjali)
+in(ben_inscript)	Bangla (India, Baishakhi Inscript)
+in(eeyek)	Manipuri (Eeyek)
+in(guj)	Gujarati
+in(guru)	Punjabi (Gurmukhi)
+in(jhelum)	Punjabi (Gurmukhi Jhelum)
+in(kan)	Kannada
+in(kan-kagapa)	Kannada (KaGaPa phonetic)
+in(mal)	Malayalam
+in(mal_lalitha)	Malayalam (Lalitha)
+in(mal_enhanced)	Malayalam (enhanced Inscript, with rupee)
+in(ori)	Oriya
+in(olck)	Ol Chiki
+in(tam_unicode)	Tamil (Unicode)
+in(tam_keyboard_with_numerals)	Tamil (keyboard with numerals)
+in(tam_TAB)	Tamil (TAB typewriter)
+in(tam_TSCII)	Tamil (TSCII typewriter)
+in(tam)	Tamil
+in(tel)	Telugu
+in(tel-kagapa)	Telugu (KaGaPa phonetic)
+in(tel-sarala)	Telugu (Sarala)
 in(urd-phonetic)	Urdu (phonetic)
 in(urd-phonetic3)	Urdu (alt. phonetic)
 in(urd-winkeys)	Urdu (Win keys)
+in(bolnagri)	Hindi (Bolnagri)
+in(hin-wx)	Hindi (Wx)
+in(hin-kagapa)	Hindi (KaGaPa phonetic)
+in(san-kagapa)	Sanskrit (KaGaPa phonetic)
+in(mar-kagapa)	Marathi (KaGaPa phonetic)
 in(eng)	English (India, with rupee)
 
 _
 ba	Bosnian
-ba(alternatequotes)	Bosnian (with guillements)
+ba(alternatequotes)	Bosnian (with guillemets)
 ba(unicode)	Bosnian (with Bosnian digraphs)
 ba(unicodeus)	Bosnian (US, with Bosnian digraphs)
 ba(us)	Bosnian (US, with Bosnian letters)
@@ -364,7 +399,7 @@ cn(ug)	Uyghur
 
 _
 hr	Croatian
-hr(alternatequotes)	Croatian (with guillements)
+hr(alternatequotes)	Croatian (with guillemets)
 hr(unicode)	Croatian (with Croatian digraphs)
 hr(unicodeus)	Croatian (US, with Croatian digraphs)
 hr(us)	Croatian (US, with Croatian letters)
@@ -540,6 +575,8 @@ it(mac)	Italian (Macintosh)
 it(us)	Italian (US, with Italian letters)
 it(geo)	Georgian (Italy)
 it(ibm)	Italian (IBM 142)
+it(intl)	Italian (intl., with dead keys)
+it(scn)	Sicilian
 
 _
 jp	Japanese
@@ -678,7 +715,7 @@ ru(bak)	Bashkirian
 ru(chm)	Mari
 ru(phonetic_azerty)	Russian (phonetic, AZERTY)
 ru(phonetic_dvorak)	Russian (phonetic, Dvorak)
-ru(phonetic_fr)	Russian Russian (phonetic, French)
+ru(phonetic_fr)	Russian (phonetic, French)
 
 _
 rs	Serbian
@@ -693,7 +730,7 @@ rs(rue)	Pannonian Rusyn
 
 _
 si	Slovenian
-si(alternatequotes)	Slovenian (with guillements)
+si(alternatequotes)	Slovenian (with guillemets)
 si(us)	Slovenian (US, with Slovenian letters)
 
 _
@@ -722,6 +759,7 @@ se(rus_nodeadkeys)	Russian (Sweden, phon
 se(smi)	Northern Saami (Sweden)
 se(mac)	Swedish (Macintosh)
 se(svdvorak)	Swedish (Svdvorak)
+se(us_dvorak)	Swedish (based on US Intl. Dvorak)
 se(swl)	Swedish Sign Language
 
 _
@@ -897,7 +935,8 @@ _
 id	Indonesian (Jawi)
 
 _
-my	Malay (Jawi)
+my	Malay (Jawi, Arabic Keyboard)
+my(phonetic)	Malay (Jawi, phonetic)
 
 _
 
@@ -918,6 +957,7 @@ grp:lswitch	Left Alt (while pressed)
 grp:lwin_switch	Left Win (while pressed)
 grp:rwin_switch	Left Win (while pressed)
 grp:win_switch	Any Win (while pressed)
+grp:menu_switch	Menu (while pressed), Shift+Menu for Menu
 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
@@ -1045,7 +1085,7 @@ keypad:atm	ATM/phone-style
 
 
 .SS
-Numeric keypad Delete behaviour
+Numeric keypad Delete behavior
 .BR
 .TS
 left,box;
@@ -1225,16 +1265,16 @@ nbsp:level2	Non-breaking space at the 2n
 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:level4	Non-breaking space at the 4th level
+nbsp:level4n	Non-breaking space at the 4th level, thin non-breaking space at the 6th level
+nbsp:level4nl	Non-breaking space at the 4th level, 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:zwnj2nb3nnb4	Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, thin non-breaking space at the 4th level
 nbsp:zwnj3zwj4	Zero-width non-joiner at the 3rd level, zero-width joiner at the 4th level
 
 .TE
@@ -1317,23 +1357,23 @@ terminate:ctrl_alt_bksp	Ctrl+Alt+Backspa
 
 
 .SH FILES
-/usr/X11R7/lib/X11/xkb/compat
+/usr/local/share/X11/xkb/compat
 
-/usr/X11R7/lib/X11/xkb/compiled
+/usr/local/share/X11/xkb/compiled
 
-/usr/X11R7/lib/X11/xkb/geometry
+/usr/local/share/X11/xkb/geometry
 
-/usr/X11R7/lib/X11/xkb/keycodes
+/usr/local/share/X11/xkb/keycodes
 
-/usr/X11R7/lib/X11/xkb/keymap
+/usr/local/share/X11/xkb/keymap
 
-/usr/X11R7/lib/X11/xkb/rules
+/usr/local/share/X11/xkb/rules
 
-/usr/X11R7/lib/X11/xkb/semantics
+/usr/local/share/X11/xkb/semantics
 
-/usr/X11R7/lib/X11/xkb/symbols
+/usr/local/share/X11/xkb/symbols
 
-/usr/X11R7/lib/X11/xkb/types
+/usr/local/share/X11/xkb/types
 
 .SH SEE ALSO
 setxkbmap(1)

Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.11 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.12
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.11	Tue Aug 29 20:27:54 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base	Sun Mar 11 20:17:19 2018
@@ -1090,6 +1090,7 @@
   grp:win_switch	=	+group(win_switch)
   grp:lwin_switch	=	+group(lwin_switch)
   grp:rwin_switch	=	+group(rwin_switch)
+  grp:menu_switch	=	+group(menu_switch)
   grp:toggle		=	+group(toggle)
   grp:shifts_toggle	=	+group(shifts_toggle)
   grp:ctrls_toggle	=	+group(ctrls_toggle)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.11 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.12
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.11	Tue Aug 29 20:27:54 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst	Sun Mar 11 20:17:19 2018
@@ -4,7 +4,7 @@
   pc104           Generic 104-key PC
   pc105           Generic 105-key PC (intl.)
   dell101         Dell 101-key PC
-  latitude        Dell Latutude laptop
+  latitude        Dell Latitude laptop
   dellm65         Dell Precision M65 laptop
   everex          Everex STEPnote
   flexpro         Keytronic FlexPro
@@ -199,6 +199,7 @@
   az              Azerbaijani
   by              Belarusian
   be              Belgian
+  bd              Bangla
   in              Indian
   ba              Bosnian
   br              Portuguese (Brazil)
@@ -285,7 +286,7 @@
   ph              Filipino
   md              Moldavian
   id              Indonesian (Jawi)
-  my              Malay (Jawi)
+  my              Malay (Jawi, Arabic Keyboard)
 
 ! variant
   chr             us: Cherokee
@@ -302,7 +303,7 @@
   dvp             us: English (programmer Dvorak)
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
-  altgr-intl      us: English (intl., with dead keys)
+  altgr-intl      us: English (intl., with AltGr dead keys)
   olpc2           us: English (the divide/multiply keys toggle the layout)
   hbs             us: Serbo-Croatian (US)
   workman         us: English (Workman)
@@ -318,6 +319,7 @@
   qwerty          ara: Arabic (QWERTY)
   qwerty_digits   ara: Arabic (qwerty/digits)
   buckwalter      ara: Arabic (Buckwalter)
+  olpc            ara: Arabic (OLPC)
   mac             ara: Arabic (Macintosh)
   plisi           al: Albanian (Plisi)
   phonetic        am: Armenian (phonetic)
@@ -338,11 +340,42 @@
   nodeadkeys      be: Belgian (no dead keys)
   sundeadkeys     be: Belgian (with Sun dead keys)
   wang            be: Belgian (Wang 724 AZERTY)
+  probhat         bd: Bangla (Probhat)
+  ben             in: Bangla (India)
+  ben_probhat     in: Bangla (India, Probhat)
+  ben_baishakhi   in: Bangla (India, Baishakhi)
+  ben_bornona     in: Bangla (India, Bornona)
+  ben_gitanjali   in: Bangla (India, Uni Gitanjali)
+  ben_inscript    in: Bangla (India, Baishakhi Inscript)
+  eeyek           in: Manipuri (Eeyek)
+  guj             in: Gujarati
+  guru            in: Punjabi (Gurmukhi)
+  jhelum          in: Punjabi (Gurmukhi Jhelum)
+  kan             in: Kannada
+  kan-kagapa      in: Kannada (KaGaPa phonetic)
+  mal             in: Malayalam
+  mal_lalitha     in: Malayalam (Lalitha)
+  mal_enhanced    in: Malayalam (enhanced Inscript, with rupee)
+  ori             in: Oriya
+  olck            in: Ol Chiki
+  tam_unicode     in: Tamil (Unicode)
+  tam_keyboard_with_numerals in: Tamil (keyboard with numerals)
+  tam_TAB         in: Tamil (TAB typewriter)
+  tam_TSCII       in: Tamil (TSCII typewriter)
+  tam             in: Tamil
+  tel             in: Telugu
+  tel-kagapa      in: Telugu (KaGaPa phonetic)
+  tel-sarala      in: Telugu (Sarala)
   urd-phonetic    in: Urdu (phonetic)
   urd-phonetic3   in: Urdu (alt. phonetic)
   urd-winkeys     in: Urdu (Win keys)
+  bolnagri        in: Hindi (Bolnagri)
+  hin-wx          in: Hindi (Wx)
+  hin-kagapa      in: Hindi (KaGaPa phonetic)
+  san-kagapa      in: Sanskrit (KaGaPa phonetic)
+  mar-kagapa      in: Marathi (KaGaPa phonetic)
   eng             in: English (India, with rupee)
-  alternatequotes ba: Bosnian (with guillements)
+  alternatequotes ba: Bosnian (with guillemets)
   unicode         ba: Bosnian (with Bosnian digraphs)
   unicodeus       ba: Bosnian (US, with Bosnian digraphs)
   us              ba: Bosnian (US, with Bosnian letters)
@@ -378,7 +411,7 @@
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
   ug              cn: Uyghur
-  alternatequotes hr: Croatian (with guillements)
+  alternatequotes hr: Croatian (with guillemets)
   unicode         hr: Croatian (with Croatian digraphs)
   unicodeus       hr: Croatian (US, with Croatian digraphs)
   us              hr: Croatian (US, with Croatian letters)
@@ -497,6 +530,8 @@
   us              it: Italian (US, with Italian letters)
   geo             it: Georgian (Italy)
   ibm             it: Italian (IBM 142)
+  intl            it: Italian (intl., with dead keys)
+  scn             it: Sicilian
   kana            jp: Japanese (Kana)
   kana86          jp: Japanese (Kana 86)
   OADG109A        jp: Japanese (OADG 109A)
@@ -581,7 +616,7 @@
   chm             ru: Mari
   phonetic_azerty ru: Russian (phonetic, AZERTY)
   phonetic_dvorak ru: Russian (phonetic, Dvorak)
-  phonetic_fr     ru: Russian Russian (phonetic, French)
+  phonetic_fr     ru: Russian (phonetic, French)
   yz              rs: Serbian (Cyrillic, ZE and ZHE swapped)
   latin           rs: Serbian (Latin)
   latinunicode    rs: Serbian (Latin, Unicode)
@@ -590,7 +625,7 @@
   alternatequotes rs: Serbian (Cyrillic with guillemets)
   latinalternatequotes rs: Serbian (Latin with guillemets)
   rue             rs: Pannonian Rusyn
-  alternatequotes si: Slovenian (with guillements)
+  alternatequotes si: Slovenian (with guillemets)
   us              si: Slovenian (US, with Slovenian letters)
   bksl            sk: Slovak (extended backslash)
   qwerty          sk: Slovak (QWERTY)
@@ -610,6 +645,7 @@
   smi             se: Northern Saami (Sweden)
   mac             se: Swedish (Macintosh)
   svdvorak        se: Swedish (Svdvorak)
+  us_dvorak       se: Swedish (based on US Intl. Dvorak)
   swl             se: Swedish Sign Language
   legacy          ch: German (Switzerland, legacy)
   de_nodeadkeys   ch: German (Switzerland, no dead keys)
@@ -687,6 +723,7 @@
   dvorak          ph: Filipino (Dvorak, Latin)
   dvorak-bay      ph: Filipino (Dvorak, Baybayin)
   gag             md: Moldavian (Gagauz)
+  phonetic        my: Malay (Jawi, phonetic)
 
 ! option
   grp                  Switching to another layout
@@ -695,6 +732,7 @@
   grp:lwin_switch      Left Win (while pressed)
   grp:rwin_switch      Left Win (while pressed)
   grp:win_switch       Any Win (while pressed)
+  grp:menu_switch      Menu (while pressed), Shift+Menu for Menu
   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
@@ -769,7 +807,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 behaviour
+  kpdl                 Numeric keypad Delete behavior
   kpdl:dot             Legacy key with dot
   kpdl:comma           Legacy key with comma
   kpdl:dotoss          Four-level key with dot
@@ -858,16 +896,16 @@
   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:level4          Non-breaking space at the 4th level
+  nbsp:level4n         Non-breaking space at the 4th level, thin non-breaking space at the 6th level
+  nbsp:level4nl        Non-breaking space at the 4th level, 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:zwnj2nb3nnb4    Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, thin non-breaking 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
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.11 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.12
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.11	Tue Aug 29 20:27:54 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev	Sun Mar 11 20:17:19 2018
@@ -978,6 +978,7 @@
   grp:win_switch	=	+group(win_switch)
   grp:lwin_switch	=	+group(lwin_switch)
   grp:rwin_switch	=	+group(rwin_switch)
+  grp:menu_switch	=	+group(menu_switch)
   grp:toggle		=	+group(toggle)
   grp:shifts_toggle	=	+group(shifts_toggle)
   grp:ctrls_toggle	=	+group(ctrls_toggle)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.11 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.12
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.11	Tue Aug 29 20:27:54 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst	Sun Mar 11 20:17:19 2018
@@ -4,7 +4,7 @@
   pc104           Generic 104-key PC
   pc105           Generic 105-key PC (intl.)
   dell101         Dell 101-key PC
-  latitude        Dell Latutude laptop
+  latitude        Dell Latitude laptop
   dellm65         Dell Precision M65 laptop
   everex          Everex STEPnote
   flexpro         Keytronic FlexPro
@@ -199,6 +199,7 @@
   az              Azerbaijani
   by              Belarusian
   be              Belgian
+  bd              Bangla
   in              Indian
   ba              Bosnian
   br              Portuguese (Brazil)
@@ -285,7 +286,7 @@
   ph              Filipino
   md              Moldavian
   id              Indonesian (Jawi)
-  my              Malay (Jawi)
+  my              Malay (Jawi, Arabic Keyboard)
 
 ! variant
   chr             us: Cherokee
@@ -302,7 +303,7 @@
   dvp             us: English (programmer Dvorak)
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
-  altgr-intl      us: English (intl., with dead keys)
+  altgr-intl      us: English (intl., with AltGr dead keys)
   olpc2           us: English (the divide/multiply keys toggle the layout)
   hbs             us: Serbo-Croatian (US)
   workman         us: English (Workman)
@@ -318,6 +319,7 @@
   qwerty          ara: Arabic (QWERTY)
   qwerty_digits   ara: Arabic (qwerty/digits)
   buckwalter      ara: Arabic (Buckwalter)
+  olpc            ara: Arabic (OLPC)
   mac             ara: Arabic (Macintosh)
   plisi           al: Albanian (Plisi)
   phonetic        am: Armenian (phonetic)
@@ -338,11 +340,42 @@
   nodeadkeys      be: Belgian (no dead keys)
   sundeadkeys     be: Belgian (with Sun dead keys)
   wang            be: Belgian (Wang 724 AZERTY)
+  probhat         bd: Bangla (Probhat)
+  ben             in: Bangla (India)
+  ben_probhat     in: Bangla (India, Probhat)
+  ben_baishakhi   in: Bangla (India, Baishakhi)
+  ben_bornona     in: Bangla (India, Bornona)
+  ben_gitanjali   in: Bangla (India, Uni Gitanjali)
+  ben_inscript    in: Bangla (India, Baishakhi Inscript)
+  eeyek           in: Manipuri (Eeyek)
+  guj             in: Gujarati
+  guru            in: Punjabi (Gurmukhi)
+  jhelum          in: Punjabi (Gurmukhi Jhelum)
+  kan             in: Kannada
+  kan-kagapa      in: Kannada (KaGaPa phonetic)
+  mal             in: Malayalam
+  mal_lalitha     in: Malayalam (Lalitha)
+  mal_enhanced    in: Malayalam (enhanced Inscript, with rupee)
+  ori             in: Oriya
+  olck            in: Ol Chiki
+  tam_unicode     in: Tamil (Unicode)
+  tam_keyboard_with_numerals in: Tamil (keyboard with numerals)
+  tam_TAB         in: Tamil (TAB typewriter)
+  tam_TSCII       in: Tamil (TSCII typewriter)
+  tam             in: Tamil
+  tel             in: Telugu
+  tel-kagapa      in: Telugu (KaGaPa phonetic)
+  tel-sarala      in: Telugu (Sarala)
   urd-phonetic    in: Urdu (phonetic)
   urd-phonetic3   in: Urdu (alt. phonetic)
   urd-winkeys     in: Urdu (Win keys)
+  bolnagri        in: Hindi (Bolnagri)
+  hin-wx          in: Hindi (Wx)
+  hin-kagapa      in: Hindi (KaGaPa phonetic)
+  san-kagapa      in: Sanskrit (KaGaPa phonetic)
+  mar-kagapa      in: Marathi (KaGaPa phonetic)
   eng             in: English (India, with rupee)
-  alternatequotes ba: Bosnian (with guillements)
+  alternatequotes ba: Bosnian (with guillemets)
   unicode         ba: Bosnian (with Bosnian digraphs)
   unicodeus       ba: Bosnian (US, with Bosnian digraphs)
   us              ba: Bosnian (US, with Bosnian letters)
@@ -378,7 +411,7 @@
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
   ug              cn: Uyghur
-  alternatequotes hr: Croatian (with guillements)
+  alternatequotes hr: Croatian (with guillemets)
   unicode         hr: Croatian (with Croatian digraphs)
   unicodeus       hr: Croatian (US, with Croatian digraphs)
   us              hr: Croatian (US, with Croatian letters)
@@ -497,6 +530,8 @@
   us              it: Italian (US, with Italian letters)
   geo             it: Georgian (Italy)
   ibm             it: Italian (IBM 142)
+  intl            it: Italian (intl., with dead keys)
+  scn             it: Sicilian
   kana            jp: Japanese (Kana)
   kana86          jp: Japanese (Kana 86)
   OADG109A        jp: Japanese (OADG 109A)
@@ -581,7 +616,7 @@
   chm             ru: Mari
   phonetic_azerty ru: Russian (phonetic, AZERTY)
   phonetic_dvorak ru: Russian (phonetic, Dvorak)
-  phonetic_fr     ru: Russian Russian (phonetic, French)
+  phonetic_fr     ru: Russian (phonetic, French)
   yz              rs: Serbian (Cyrillic, ZE and ZHE swapped)
   latin           rs: Serbian (Latin)
   latinunicode    rs: Serbian (Latin, Unicode)
@@ -590,7 +625,7 @@
   alternatequotes rs: Serbian (Cyrillic with guillemets)
   latinalternatequotes rs: Serbian (Latin with guillemets)
   rue             rs: Pannonian Rusyn
-  alternatequotes si: Slovenian (with guillements)
+  alternatequotes si: Slovenian (with guillemets)
   us              si: Slovenian (US, with Slovenian letters)
   bksl            sk: Slovak (extended backslash)
   qwerty          sk: Slovak (QWERTY)
@@ -610,6 +645,7 @@
   smi             se: Northern Saami (Sweden)
   mac             se: Swedish (Macintosh)
   svdvorak        se: Swedish (Svdvorak)
+  us_dvorak       se: Swedish (based on US Intl. Dvorak)
   swl             se: Swedish Sign Language
   legacy          ch: German (Switzerland, legacy)
   de_nodeadkeys   ch: German (Switzerland, no dead keys)
@@ -687,6 +723,7 @@
   dvorak          ph: Filipino (Dvorak, Latin)
   dvorak-bay      ph: Filipino (Dvorak, Baybayin)
   gag             md: Moldavian (Gagauz)
+  phonetic        my: Malay (Jawi, phonetic)
 
 ! option
   grp                  Switching to another layout
@@ -695,6 +732,7 @@
   grp:lwin_switch      Left Win (while pressed)
   grp:rwin_switch      Left Win (while pressed)
   grp:win_switch       Any Win (while pressed)
+  grp:menu_switch      Menu (while pressed), Shift+Menu for Menu
   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
@@ -769,7 +807,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 behaviour
+  kpdl                 Numeric keypad Delete behavior
   kpdl:dot             Legacy key with dot
   kpdl:comma           Legacy key with comma
   kpdl:dotoss          Four-level key with dot
@@ -858,16 +896,16 @@
   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:level4          Non-breaking space at the 4th level
+  nbsp:level4n         Non-breaking space at the 4th level, thin non-breaking space at the 6th level
+  nbsp:level4nl        Non-breaking space at the 4th level, 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:zwnj2nb3nnb4    Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, thin non-breaking 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

Reply via email to