diff --git a/fcitx5/conf/cached_layouts b/fcitx5/conf/cached_layouts
index 7d08f4a..4549c56 100644
--- a/fcitx5/conf/cached_layouts
+++ b/fcitx5/conf/cached_layouts
@@ -1,43 +1,108 @@
-[keyboard-bqn]
-Description="Keyboard - BQN"
-Language=en
-Label=bqn
+[keyboard-bd]
+Description="Keyboard - Bangla"
+Language=bn
+Label=bn
+
+[keyboard-bd-probhat]
+Description="Keyboard - Bangla - Bangla (Probhat)"
+Language=bn
+Label=bd
 
 [keyboard-apl]
-Description="Keyboard - APL"
+Description="Keyboard - APL keyboard symbols"
 Language=en
 Label=apl
 
 [keyboard-apl-dyalog]
-Description="Keyboard - APL - APL symbols (Dyalog APL)"
+Description="Keyboard - APL keyboard symbols - APL keyboard symbols (Dyalog)"
 Language=en
 Label=dlg
 
 [keyboard-apl-sax]
-Description="Keyboard - APL - APL symbols (SAX, Sharp APL for Unix)"
+Description="Keyboard - APL keyboard symbols - APL keyboard symbols (sax)"
 Language=en
 Label=sax
 
 [keyboard-apl-unified]
-Description="Keyboard - APL - APL symbols (unified)"
+Description="Keyboard - APL keyboard symbols - APL keyboard symbols (unified)"
 Language=en
 Label=ufd
 
 [keyboard-apl-apl2]
-Description="Keyboard - APL - APL symbols (IBM APL2)"
+Description="Keyboard - APL keyboard symbols - APL keyboard symbols (IBM APL2)"
 Language=en
 Label=apl2
 
 [keyboard-apl-aplplusII]
-Description="Keyboard - APL - APL symbols (Manugistics APL*PLUS II)"
+Description="Keyboard - APL keyboard symbols - APL keyboard symbols (Manugistics APL*PLUS II)"
 Language=en
 Label=aplII
 
 [keyboard-apl-aplx]
-Description="Keyboard - APL - APL symbols (APLX unified)"
+Description="Keyboard - APL keyboard symbols - APL keyboard symbols (APLX unified)"
 Language=en
 Label=aplx
 
+[keyboard-bn]
+Description="Keyboard - Malay (Jawi)"
+Language=id
+Label=ms
+
+[keyboard-my]
+Description="Keyboard - Malay (Jawi)"
+Language=id
+Label=ms
+
+[keyboard-ph]
+Description="Keyboard - Filipino"
+Language=fil
+Label=ph
+
+[keyboard-ph-qwerty-bay]
+Description="Keyboard - Filipino - Filipino (QWERTY Baybayin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-capewell-dvorak]
+Description="Keyboard - Filipino - Filipino (Capewell-Dvorak Latin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-capewell-dvorak-bay]
+Description="Keyboard - Filipino - Filipino (Capewell-Dvorak Baybayin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-capewell-qwerf2k6]
+Description="Keyboard - Filipino - Filipino (Capewell-QWERF 2006 Latin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-capewell-qwerf2k6-bay]
+Description="Keyboard - Filipino - Filipino (Capewell-QWERF 2006 Baybayin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-colemak]
+Description="Keyboard - Filipino - Filipino (Colemak Latin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-colemak-bay]
+Description="Keyboard - Filipino - Filipino (Colemak Baybayin)"
+Language=fil
+Label=ph
+
+[keyboard-ph-dvorak]
+Description="Keyboard - Filipino - ipino (Dvorak Latin)"
+Language=en
+Label=ph
+
+[keyboard-ph-dvorak-bay]
+Description="Keyboard - Filipino - Filipino (Dvorak Baybayin)"
+Language=fil
+Label=ph
+
 [keyboard-tz]
 Description="Keyboard - Swahili (Tanzania)"
 Language=sw
@@ -49,144 +114,134 @@ Language=
 Label=brl
 
 [keyboard-brai-left_hand]
-Description="Keyboard - Braille - Braille (left-handed)"
-Language=
-Label=brai
-
-[keyboard-brai-left_hand_invert]
-Description="Keyboard - Braille - Braille (left-handed inverted thumb)"
+Description="Keyboard - Braille - Braille (left hand)"
 Language=
 Label=brai
 
 [keyboard-brai-right_hand]
-Description="Keyboard - Braille - Braille (right-handed)"
+Description="Keyboard - Braille - Braille (right hand)"
 Language=
 Label=brai
 
-[keyboard-brai-right_hand_invert]
-Description="Keyboard - Braille - Braille (right-handed inverted thumb)"
-Language=
-Label=brai
+[keyboard-sn]
+Description="Keyboard - Wolof"
+Language=wo
+Label=wo
 
-[keyboard-et]
-Description="Keyboard - Amharic"
-Language=am
-Label=am
+[keyboard-nec_vndr/jp]
+Description="Keyboard - Japanese (PC-98xx Series)"
+Language=ja
+Label=ja
 
-[keyboard-tm]
-Description="Keyboard - Turkmen"
-Language=tk
-Label=tk
+[keyboard-ca]
+Description="Keyboard - French (Canada)"
+Language=fr
+Label=fr
 
-[keyboard-tm-alt]
-Description="Keyboard - Turkmen - Turkmen (Alt-Q)"
-Language=tk
-Label=tm
+[keyboard-ca-fr-dvorak]
+Description="Keyboard - French (Canada) - French (Canada, Dvorak)"
+Language=fr
+Label=fr
 
-[keyboard-np]
-Description="Keyboard - Nepali"
-Language=ne
-Label=ne
+[keyboard-ca-fr-legacy]
+Description="Keyboard - French (Canada) - French (Canada, legacy)"
+Language=fr
+Label=fr
 
-[keyboard-epo]
-Description="Keyboard - Esperanto"
-Language=eo
-Label=eo
+[keyboard-ca-multix]
+Description="Keyboard - French (Canada) - Canadian Multilingual"
+Language=fr
+Label=ca
 
-[keyboard-epo-legacy]
-Description="Keyboard - Esperanto - Esperanto (legacy)"
-Language=eo
-Label=epo
+[keyboard-ca-multi]
+Description="Keyboard - French (Canada) - Canadian Multilingual (first part)"
+Language=fr
+Label=ca
 
-[keyboard-eu]
-Description="Keyboard - EurKEY (US)"
-Language=ca
-Label=eu
+[keyboard-ca-multi-2gr]
+Description="Keyboard - French (Canada) - Canadian Multilingual (second part)"
+Language=fr
+Label=ca
 
-[keyboard-za]
-Description="Keyboard - English (South Africa)"
+[keyboard-ca-ike]
+Description="Keyboard - French (Canada) - Inuktitut"
+Language=iu
+Label=ike
+
+[keyboard-ca-eng]
+Description="Keyboard - French (Canada) - English (Canada)"
 Language=en
 Label=en
 
-[keyboard-bw]
-Description="Keyboard - Tswana"
-Language=tn
-Label=tn
+[keyboard-ca-kut]
+Description="Keyboard - French (Canada) - Kutenai"
+Language=fr
+Label=kut
 
-[keyboard-kr]
-Description="Keyboard - Korean"
-Language=ko
-Label=ko
+[keyboard-ca-shs]
+Description="Keyboard - French (Canada) - Secwepemctsin"
+Language=fr
+Label=shs
 
-[keyboard-kr-kr104]
-Description="Keyboard - Korean - Korean (101/104-key compatible)"
-Language=ko
-Label=kr
+[keyboard-ca-sun_type6]
+Description="Keyboard - French (Canada) - Multilingual (Canada, Sun Type 6/7)"
+Language=fr
+Label=ca
 
-[keyboard-kr-sun_type6]
-Description="Keyboard - Korean - Korean (Sun Type 6/7)"
-Language=ko
-Label=kr
+[keyboard-tg]
+Description="Keyboard - French (Togo)"
+Language=fr
+Label=fr-tg
 
-[keyboard-gb]
-Description="Keyboard - English (UK)"
-Language=en
-Label=en
+[keyboard-uz]
+Description="Keyboard - Uzbek"
+Language=uz
+Label=uz
 
-[keyboard-gb-extd]
-Description="Keyboard - English (UK) - English (UK, extended, Windows)"
-Language=en
-Label=gb
+[keyboard-uz-latin]
+Description="Keyboard - Uzbek - Uzbek (Latin)"
+Language=uz
+Label=uz
 
-[keyboard-gb-intl]
-Description="Keyboard - English (UK) - English (UK, intl., with dead keys)"
-Language=en
-Label=gb
+[keyboard-fi]
+Description="Keyboard - Finnish"
+Language=fi
+Label=fi
 
-[keyboard-gb-dvorak]
-Description="Keyboard - English (UK) - English (UK, Dvorak)"
-Language=en
-Label=gb
+[keyboard-fi-classic]
+Description="Keyboard - Finnish - Finnish (classic)"
+Language=fi
+Label=fi
 
-[keyboard-gb-dvorakukp]
-Description="Keyboard - English (UK) - English (UK, Dvorak, with UK punctuation)"
-Language=en
-Label=gb
+[keyboard-fi-nodeadkeys]
+Description="Keyboard - Finnish - Finnish (classic, eliminate dead keys)"
+Language=fi
+Label=fi
 
-[keyboard-gb-mac]
-Description="Keyboard - English (UK) - English (UK, Macintosh)"
-Language=en
-Label=gb
+[keyboard-fi-winkeys]
+Description="Keyboard - Finnish - Finnish (Winkeys)"
+Language=fi
+Label=fi
 
-[keyboard-gb-mac_intl]
-Description="Keyboard - English (UK) - English (UK, Macintosh, intl.)"
-Language=en
-Label=gb
+[keyboard-fi-smi]
+Description="Keyboard - Finnish - Northern Saami (Finland)"
+Language=se
+Label=fi
 
-[keyboard-gb-colemak]
-Description="Keyboard - English (UK) - English (UK, Colemak)"
-Language=en
-Label=gb
+[keyboard-fi-mac]
+Description="Keyboard - Finnish - Finnish (Macintosh)"
+Language=fi
+Label=fi
 
-[keyboard-gb-colemak_dh]
-Description="Keyboard - English (UK) - English (UK, Colemak-DH)"
-Language=en
-Label=gb
+[keyboard-fi-das]
+Description="Keyboard - Finnish - Finnish (DAS)"
+Language=fi
+Label=fi
 
-[keyboard-gb-pl]
-Description="Keyboard - English (UK) - Polish (British keyboard)"
-Language=pl
-Label=pl
-
-[keyboard-gb-gla]
-Description="Keyboard - English (UK) - Scottish Gaelic"
-Language=en
-Label=gd
-
-[keyboard-gb-sun_type6]
-Description="Keyboard - English (UK) - English (UK, Sun Type 6/7)"
-Language=en
-Label=gb
+[keyboard-fi-sun_type6]
+Description="Keyboard - Finnish - Finnish (Sun Type 6/7)"
+Language=fi
+Label=fi
 
 [keyboard-ua]
 Description="Keyboard - Ukrainian"
@@ -204,12 +259,7 @@ Language=uk
 Label=ua
 
 [keyboard-ua-winkeys]
-Description="Keyboard - Ukrainian - Ukrainian (Windows)"
-Language=uk
-Label=ua
-
-[keyboard-ua-macOS]
-Description="Keyboard - Ukrainian - Ukrainian (macOS)"
+Description="Keyboard - Ukrainian - Ukrainian (WinKeys)"
 Language=uk
 Label=ua
 
@@ -225,7 +275,7 @@ Label=ua
 
 [keyboard-ua-rstu_ru]
 Description="Keyboard - Ukrainian - Russian (Ukraine, standard RSTU)"
-Language=ru
+Language=uk
 Label=ua
 
 [keyboard-ua-homophonic]
@@ -233,45 +283,75 @@ Description="Keyboard - Ukrainian - Ukrainian (homophonic)"
 Language=uk
 Label=ua
 
-[keyboard-ua-crh]
-Description="Keyboard - Ukrainian - Crimean Tatar (Turkish Q)"
-Language=crh
-Label=crh
-
-[keyboard-ua-crh_f]
-Description="Keyboard - Ukrainian - Crimean Tatar (Turkish F)"
-Language=crh
-Label=crh
-
-[keyboard-ua-crh_alt]
-Description="Keyboard - Ukrainian - Crimean Tatar (Turkish Alt-Q)"
-Language=crh
-Label=crh
-
 [keyboard-ua-sun_type6]
 Description="Keyboard - Ukrainian - Ukrainian (Sun Type 6/7)"
 Language=uk
 Label=ua
 
-[keyboard-th]
-Description="Keyboard - Thai"
-Language=th
-Label=th
+[keyboard-cd]
+Description="Keyboard - French (Democratic Republic of the Congo)"
+Language=fr
+Label=fr
 
-[keyboard-th-tis]
-Description="Keyboard - Thai - Thai (TIS-820.2538)"
-Language=th
-Label=th
+[keyboard-tr]
+Description="Keyboard - Turkish"
+Language=tr
+Label=tr
 
-[keyboard-th-pat]
-Description="Keyboard - Thai - Thai (Pattachote)"
-Language=th
-Label=th
+[keyboard-tr-f]
+Description="Keyboard - Turkish - Turkish (F)"
+Language=tr
+Label=tr
 
-[keyboard-mv]
-Description="Keyboard - Dhivehi"
-Language=dv
-Label=dv
+[keyboard-tr-alt]
+Description="Keyboard - Turkish - Turkish (Alt-Q)"
+Language=tr
+Label=tr
+
+[keyboard-tr-sundeadkeys]
+Description="Keyboard - Turkish - Turkish (Sun dead keys)"
+Language=tr
+Label=tr
+
+[keyboard-tr-ku]
+Description="Keyboard - Turkish - Kurdish (Turkey, Latin Q)"
+Language=ku
+Label=ku
+
+[keyboard-tr-ku_f]
+Description="Keyboard - Turkish - Kurdish (Turkey, F)"
+Language=ku
+Label=ku
+
+[keyboard-tr-ku_alt]
+Description="Keyboard - Turkish - Kurdish (Turkey, Latin Alt-Q)"
+Language=ku
+Label=ku
+
+[keyboard-tr-intl]
+Description="Keyboard - Turkish - Turkish (international with dead keys)"
+Language=tr
+Label=tr
+
+[keyboard-tr-crh]
+Description="Keyboard - Turkish - Crimean Tatar (Turkish Q)"
+Language=crh
+Label=crh
+
+[keyboard-tr-crh_f]
+Description="Keyboard - Turkish - Crimean Tatar (Turkish F)"
+Language=crh
+Label=crh
+
+[keyboard-tr-crh_alt]
+Description="Keyboard - Turkish - Crimean Tatar (Turkish Alt-Q)"
+Language=crh
+Label=crh
+
+[keyboard-tr-sun_type6]
+Description="Keyboard - Turkish - Turkish (Sun Type 6/7)"
+Language=tr
+Label=tr
 
 [keyboard-tj]
 Description="Keyboard - Tajik"
@@ -283,35 +363,120 @@ Description="Keyboard - Tajik - Tajik (legacy)"
 Language=tg
 Label=tj
 
-[keyboard-sk]
-Description="Keyboard - Slovak"
-Language=sk
-Label=sk
+[keyboard-se]
+Description="Keyboard - Swedish"
+Language=sv
+Label=sv
 
-[keyboard-sk-bksl]
-Description="Keyboard - Slovak - Slovak (extended backslash)"
-Language=sk
-Label=sk
+[keyboard-se-nodeadkeys]
+Description="Keyboard - Swedish - Swedish (eliminate dead keys)"
+Language=sv
+Label=se
 
-[keyboard-sk-qwerty]
-Description="Keyboard - Slovak - Slovak (QWERTY)"
-Language=sk
-Label=sk
+[keyboard-se-dvorak]
+Description="Keyboard - Swedish - Swedish (Dvorak)"
+Language=sv
+Label=se
 
-[keyboard-sk-qwerty_bksl]
-Description="Keyboard - Slovak - Slovak (QWERTY, extended backslash)"
-Language=sk
-Label=sk
+[keyboard-se-rus]
+Description="Keyboard - Swedish - Russian (Sweden, phonetic)"
+Language=ru
+Label=ru
 
-[keyboard-sk-acc]
-Description="Keyboard - Slovak - Slovak (ACC layout, only accented letters)"
-Language=sk
-Label=sk
+[keyboard-se-rus_nodeadkeys]
+Description="Keyboard - Swedish - Russian (Sweden, phonetic, eliminate dead keys)"
+Language=ru
+Label=ru
 
-[keyboard-sk-sun_type6]
-Description="Keyboard - Slovak - Slovak (Sun Type 6/7)"
-Language=sk
-Label=sk
+[keyboard-se-smi]
+Description="Keyboard - Swedish - Northern Saami (Sweden)"
+Language=se
+Label=se
+
+[keyboard-se-mac]
+Description="Keyboard - Swedish - Swedish (Macintosh)"
+Language=sv
+Label=se
+
+[keyboard-se-svdvorak]
+Description="Keyboard - Swedish - Swedish (Svdvorak)"
+Language=sv
+Label=se
+
+[keyboard-se-swl]
+Description="Keyboard - Swedish - Swedish Sign Language"
+Language=swl
+Label=se
+
+[keyboard-se-dvorak_a5]
+Description="Keyboard - Swedish - Swedish (Dvorak A5)"
+Language=sv
+Label=se
+
+[keyboard-se-sun_type6]
+Description="Keyboard - Swedish - Swedish (Sun Type 6/7)"
+Language=sv
+Label=se
+
+[keyboard-se-ovd]
+Description="Keyboard - Swedish - Elfdalian (Swedish, with combining ogonek)"
+Language=ovd
+Label=se
+
+[keyboard-rs]
+Description="Keyboard - Serbian"
+Language=sr
+Label=sr
+
+[keyboard-rs-yz]
+Description="Keyboard - Serbian - Serbian (Cyrillic, ZE and ZHE swapped)"
+Language=sr
+Label=rs
+
+[keyboard-rs-latin]
+Description="Keyboard - Serbian - Serbian (Latin)"
+Language=sr
+Label=rs
+
+[keyboard-rs-latinunicode]
+Description="Keyboard - Serbian - Serbian (Latin Unicode)"
+Language=sr
+Label=rs
+
+[keyboard-rs-latinyz]
+Description="Keyboard - Serbian - Serbian (Latin qwerty)"
+Language=sr
+Label=rs
+
+[keyboard-rs-latinunicodeyz]
+Description="Keyboard - Serbian - Serbian (Latin Unicode qwerty)"
+Language=sr
+Label=rs
+
+[keyboard-rs-alternatequotes]
+Description="Keyboard - Serbian - Serbian (Cyrillic with guillemets)"
+Language=sr
+Label=rs
+
+[keyboard-rs-latinalternatequotes]
+Description="Keyboard - Serbian - Serbian (Latin with guillemets)"
+Language=sr
+Label=rs
+
+[keyboard-rs-rue]
+Description="Keyboard - Serbian - Pannonian Rusyn"
+Language=rue
+Label=rs
+
+[keyboard-rs-combiningkeys]
+Description="Keyboard - Serbian - Serbian (combining accents instead of dead keys)"
+Language=sr
+Label=rs
+
+[keyboard-za]
+Description="Keyboard - English (South Africa)"
+Language=en
+Label=en
 
 [keyboard-ru]
 Description="Keyboard - Russian"
@@ -324,12 +489,7 @@ Language=ru
 Label=ru
 
 [keyboard-ru-phonetic_winkeys]
-Description="Keyboard - Russian - Russian (phonetic, Windows)"
-Language=ru
-Label=ru
-
-[keyboard-ru-phonetic_YAZHERTY]
-Description="Keyboard - Russian - Russian (phonetic, YAZHERTY)"
+Description="Keyboard - Russian - Russian (phonetic WinKeys)"
 Language=ru
 Label=ru
 
@@ -338,16 +498,6 @@ Description="Keyboard - Russian - Russian (typewriter)"
 Language=ru
 Label=ru
 
-[keyboard-ru-ruchey_ru]
-Description="Keyboard - Russian - Russian (engineering, RU)"
-Language=ru
-Label=ru
-
-[keyboard-ru-ruchey_en]
-Description="Keyboard - Russian - Russian (engineering, EN)"
-Language=ru
-Label=en
-
 [keyboard-ru-legacy]
 Description="Keyboard - Russian - Russian (legacy)"
 Language=ru
@@ -369,7 +519,7 @@ Language=os
 Label=ru
 
 [keyboard-ru-os_winkeys]
-Description="Keyboard - Russian - Ossetian (Windows)"
+Description="Keyboard - Russian - Ossetian (WinKeys)"
 Language=os
 Label=ru
 
@@ -429,25 +579,20 @@ Language=chm
 Label=ru
 
 [keyboard-ru-phonetic_azerty]
-Description="Keyboard - Russian - Russian (phonetic, AZERTY)"
+Description="Keyboard - Russian - Russian (phonetic azerty)"
 Language=ru
 Label=ru
 
 [keyboard-ru-phonetic_dvorak]
-Description="Keyboard - Russian - Russian (phonetic, Dvorak)"
+Description="Keyboard - Russian - Russian (phonetic dvorak)"
 Language=ru
 Label=ru
 
 [keyboard-ru-phonetic_fr]
-Description="Keyboard - Russian - Russian (phonetic, French)"
+Description="Keyboard - Russian - Russian (phonetic French)"
 Language=ru
 Label=ru
 
-[keyboard-ru-ab]
-Description="Keyboard - Russian - Abkhazian (Russia)"
-Language=ab
-Label=ru
-
 [keyboard-ru-chu]
 Description="Keyboard - Russian - Church Slavonic"
 Language=cu
@@ -463,695 +608,120 @@ Description="Keyboard - Russian - Russian (Rulemak, phonetic Colemak)"
 Language=ru
 Label=ru
 
-[keyboard-ru-phonetic_mac]
-Description="Keyboard - Russian - Russian (phonetic Macintosh)"
-Language=ru
-Label=ru
-
 [keyboard-ru-sun_type6]
-Description="Keyboard - Russian - 6/7)"
+Description="Keyboard - Russian - Russian (Sun Type 6/7)"
 Language=ru
 Label=ru
 
-[keyboard-ru-unipunct]
-Description="Keyboard - Russian - Russian (with US punctuation)"
-Language=ru
-Label=ru
-
-[keyboard-ru-gost-6431-75-48]
-Description="Keyboard - Russian - Russian (GOST 6431-75)"
-Language=ru
-Label=ru
-
-[keyboard-ru-gost-14289-88]
-Description="Keyboard - Russian - Russian (GOST 14289-88)"
-Language=ru
-Label=ru
-
-[keyboard-ru-prxn]
-Description="Keyboard - Russian - Russian (Polyglot and Reactionary)"
-Language=ru
-Label=ru
-
-[keyboard-ru-winkeys-p]
-Description="Keyboard - Russian - Russian (Programmer)"
-Language=ru
-Label=winkeys-p
-
-[keyboard-trans]
-Description="Keyboard - International Phonetic Alphabet"
-Language=
-Label=ipa
-
-[keyboard-trans-qwerty]
-Description="Keyboard - International Phonetic Alphabet - International Phonetic Alphabet (QWERTY)"
-Language=
-Label=trans
-
-[keyboard-ir]
-Description="Keyboard - Persian"
-Language=fa
-Label=fa
-
-[keyboard-ir-pes_keypad]
-Description="Keyboard - Persian - Persian (with Persian keypad)"
-Language=fa
-Label=ir
-
-[keyboard-ir-azb]
-Description="Keyboard - Persian - Azerbaijani (Iran)"
-Language=azb
-Label=azb
-
-[keyboard-ir-ku]
-Description="Keyboard - Persian - Kurdish (Iran, Latin Q)"
-Language=ku
-Label=ku
-
-[keyboard-ir-ku_f]
-Description="Keyboard - Persian - Kurdish (Iran, F)"
-Language=ku
-Label=ku
-
-[keyboard-ir-ku_alt]
-Description="Keyboard - Persian - Kurdish (Iran, Latin Alt-Q)"
-Language=ku
-Label=ku
-
-[keyboard-ir-ku_ara]
-Description="Keyboard - Persian - Kurdish (Iran, Arabic-Latin)"
-Language=ku
-Label=ku
-
-[keyboard-ir-ave]
-Description="Keyboard - Persian - Avestan"
-Language=ae
-Label=ir
-
-[keyboard-ng]
-Description="Keyboard - English (Nigeria)"
-Language=en
-Label=en
-
-[keyboard-ng-igbo]
-Description="Keyboard - English (Nigeria) - Igbo"
-Language=ig
-Label=ig
-
-[keyboard-ng-yoruba]
-Description="Keyboard - English (Nigeria) - Yoruba"
-Language=yo
-Label=yo
-
-[keyboard-ng-hausa]
-Description="Keyboard - English (Nigeria) - Hausa (Nigeria)"
-Language=ha
-Label=ha
-
-[keyboard-is]
-Description="Keyboard - Icelandic"
-Language=is
-Label=is
-
-[keyboard-is-mac_legacy]
-Description="Keyboard - Icelandic - Icelandic (Macintosh, legacy)"
-Language=is
-Label=is
-
-[keyboard-is-mac]
-Description="Keyboard - Icelandic - Icelandic (Macintosh)"
-Language=is
-Label=is
-
-[keyboard-is-dvorak]
-Description="Keyboard - Icelandic - Icelandic (Dvorak)"
-Language=is
-Label=is
-
-[keyboard-es]
-Description="Keyboard - Spanish"
-Language=es
-Label=es
-
-[keyboard-es-nodeadkeys]
-Description="Keyboard - Spanish - Spanish (no dead keys)"
-Language=es
-Label=es
-
-[keyboard-es-winkeys]
-Description="Keyboard - Spanish - Spanish (Windows)"
-Language=es
-Label=es
-
-[keyboard-es-deadtilde]
-Description="Keyboard - Spanish - Spanish (dead tilde)"
-Language=es
-Label=es
-
-[keyboard-es-dvorak]
-Description="Keyboard - Spanish - Spanish (Dvorak)"
-Language=es
-Label=es
-
-[keyboard-es-ast]
-Description="Keyboard - Spanish - Asturian (Spain, with bottom-dot H and L)"
-Language=ast
-Label=ast
-
-[keyboard-es-cat]
-Description="Keyboard - Spanish - Catalan (Spain, with middle-dot L)"
-Language=ca
-Label=ca
-
-[keyboard-es-mac]
-Description="Keyboard - Spanish - Spanish (Macintosh)"
-Language=es
-Label=es
-
-[keyboard-es-sun_type6]
-Description="Keyboard - Spanish - Spanish (Sun Type 6/7)"
-Language=es
-Label=es
-
-[keyboard-ee]
-Description="Keyboard - Estonian"
-Language=et
-Label=et
-
-[keyboard-ee-nodeadkeys]
-Description="Keyboard - Estonian - Estonian (no dead keys)"
-Language=et
-Label=ee
-
-[keyboard-ee-dvorak]
-Description="Keyboard - Estonian - Estonian (Dvorak)"
-Language=et
-Label=ee
-
-[keyboard-ee-us]
-Description="Keyboard - Estonian - Estonian (US)"
-Language=et
-Label=ee
-
-[keyboard-ee-sun_type6]
-Description="Keyboard - Estonian - Estonian (Sun Type 6/7)"
-Language=et
-Label=ee
-
-[keyboard-nl]
-Description="Keyboard - Dutch"
-Language=nl
-Label=nl
-
-[keyboard-nl-us]
-Description="Keyboard - Dutch - Dutch (US)"
-Language=nl
-Label=nl
-
-[keyboard-nl-mac]
-Description="Keyboard - Dutch - Dutch (Macintosh)"
-Language=nl
-Label=nl
-
-[keyboard-nl-std]
-Description="Keyboard - Dutch - Dutch (standard)"
-Language=nl
-Label=nl
-
-[keyboard-nl-sun_type6]
-Description="Keyboard - Dutch - Dutch (Sun Type 6/7)"
-Language=nl
-Label=nl
-
-[keyboard-cz]
-Description="Keyboard - Czech"
-Language=cs
-Label=cs
-
-[keyboard-cz-bksl]
-Description="Keyboard - Czech - key)"
-Language=cs
-Label=cz
-
-[keyboard-cz-qwerty]
-Description="Keyboard - Czech - Czech (QWERTY)"
-Language=cs
-Label=cz
-
-[keyboard-cz-qwerty_bksl]
-Description="Keyboard - Czech - Czech (QWERTY, extended backslash)"
-Language=cs
-Label=cz
-
-[keyboard-cz-qwerty-mac]
-Description="Keyboard - Czech - Czech (QWERTY, Macintosh)"
-Language=cs
-Label=cz
-
-[keyboard-cz-ucw]
-Description="Keyboard - Czech - Czech (UCW, only accented letters)"
-Language=cs
-Label=cz
-
-[keyboard-cz-dvorak-ucw]
-Description="Keyboard - Czech - Czech (US, Dvorak, UCW support)"
-Language=cs
-Label=cz
-
-[keyboard-cz-rus]
-Description="Keyboard - Czech - Russian (Czech, phonetic)"
-Language=ru
-Label=ru
-
-[keyboard-cz-sun_type6]
-Description="Keyboard - Czech - Czech (Sun Type 6/7)"
-Language=cs
-Label=cz
-
-[keyboard-cz-prog]
-Description="Keyboard - Czech - Czech (programming)"
-Language=cs
-Label=cz
-
-[keyboard-cz-typo]
-Description="Keyboard - Czech - Czech (typographic)"
-Language=cs
-Label=cz
-
-[keyboard-cz-coder]
-Description="Keyboard - Czech - Czech (coder)"
-Language=cs
-Label=cz
-
-[keyboard-cz-prog_typo]
-Description="Keyboard - Czech - Czech (programming, typographic)"
-Language=cs
-Label=cz
-
-[keyboard-cz-colemak-ucw]
-Description="Keyboard - Czech - Czech (US, Colemak, UCW support)"
-Language=cs
-Label=cz
-
-[keyboard-se]
-Description="Keyboard - Swedish"
-Language=sv
-Label=sv
-
-[keyboard-se-nodeadkeys]
-Description="Keyboard - Swedish - Swedish (no dead keys)"
-Language=sv
-Label=se
-
-[keyboard-se-dvorak]
-Description="Keyboard - Swedish - Swedish (Dvorak)"
-Language=sv
-Label=se
-
-[keyboard-se-rus]
-Description="Keyboard - Swedish - Russian (Sweden, phonetic)"
-Language=ru
-Label=ru
-
-[keyboard-se-rus_nodeadkeys]
-Description="Keyboard - Swedish - Russian (Sweden, phonetic, no dead keys)"
-Language=ru
-Label=ru
-
-[keyboard-se-smi]
-Description="Keyboard - Swedish - Northern Saami (Sweden)"
-Language=se
-Label=se
-
-[keyboard-se-mac]
-Description="Keyboard - Swedish - Swedish (Macintosh)"
-Language=sv
-Label=se
-
-[keyboard-se-svdvorak]
-Description="Keyboard - Swedish - Swedish (Svdvorak)"
-Language=sv
-Label=se
-
-[keyboard-se-us_dvorak]
-Description="Keyboard - Swedish - Swedish (Dvorak, intl.)"
-Language=sv
-Label=se
-
-[keyboard-se-us]
-Description="Keyboard - Swedish - Swedish (US)"
-Language=sv
-Label=se
-
-[keyboard-se-swl]
-Description="Keyboard - Swedish - Swedish Sign Language"
-Language=swl
-Label=se
-
-[keyboard-se-dvorak_a5]
-Description="Keyboard - Swedish - Swedish (Dvorak A5)"
-Language=sv
-Label=se
-
-[keyboard-se-sun_type6]
-Description="Keyboard - Swedish - Swedish (Sun Type 6/7)"
-Language=sv
-Label=se
-
-[keyboard-se-ovd]
-Description="Keyboard - Swedish - Elfdalian (Swedish, with combining ogonek)"
-Language=ovd
-Label=se
-
-[keyboard-bg]
-Description="Keyboard - Bulgarian"
-Language=bg
-Label=bg
-
-[keyboard-bg-phonetic]
-Description="Keyboard - Bulgarian - Bulgarian (traditional phonetic)"
-Language=bg
-Label=bg
-
-[keyboard-bg-bas_phonetic]
-Description="Keyboard - Bulgarian - Bulgarian (new phonetic)"
-Language=bg
-Label=bg
-
-[keyboard-bg-bekl]
-Description="Keyboard - Bulgarian - Bulgarian (enhanced)"
-Language=bg
-Label=bg
-
-[keyboard-md]
-Description="Keyboard - Moldavian"
+[keyboard-ro]
+Description="Keyboard - Romanian"
 Language=ro
-Label=md
+Label=ro
 
-[keyboard-md-gag]
-Description="Keyboard - Moldavian - Moldavian (Gagauz)"
-Language=gag
-Label=gag
+[keyboard-ro-cedilla]
+Description="Keyboard - Romanian - Romanian (cedilla)"
+Language=ro
+Label=ro
 
-[keyboard-ke]
-Description="Keyboard - Swahili (Kenya)"
-Language=sw
-Label=sw
+[keyboard-ro-std]
+Description="Keyboard - Romanian - Romanian (standard)"
+Language=ro
+Label=ro
 
-[keyboard-ke-kik]
-Description="Keyboard - Swahili (Kenya) - Kikuyu"
-Language=ki
-Label=ki
+[keyboard-ro-std_cedilla]
+Description="Keyboard - Romanian - Romanian (standard cedilla)"
+Language=ro
+Label=ro
 
-[keyboard-us]
-Description="Keyboard - English (US)"
+[keyboard-ro-winkeys]
+Description="Keyboard - Romanian - Romanian (WinKeys)"
+Language=ro
+Label=ro
+
+[keyboard-ro-crh_dobruja]
+Description="Keyboard - Romanian - Crimean Tatar (Dobruja Q)"
+Language=crh
+Label=crh
+
+[keyboard-ro-ergonomic]
+Description="Keyboard - Romanian - Romanian (ergonomic Touchtype)"
+Language=ro
+Label=ro
+
+[keyboard-ro-sun_type6]
+Description="Keyboard - Romanian - Romanian (Sun Type 6/7)"
+Language=ro
+Label=ro
+
+[keyboard-pt]
+Description="Keyboard - Portuguese"
+Language=pt
+Label=pt
+
+[keyboard-pt-nodeadkeys]
+Description="Keyboard - Portuguese - Portuguese (eliminate dead keys)"
+Language=pt
+Label=pt
+
+[keyboard-pt-sundeadkeys]
+Description="Keyboard - Portuguese - Portuguese (Sun dead keys)"
+Language=pt
+Label=pt
+
+[keyboard-pt-mac]
+Description="Keyboard - Portuguese - Portuguese (Macintosh)"
+Language=pt
+Label=pt
+
+[keyboard-pt-mac_nodeadkeys]
+Description="Keyboard - Portuguese - Portuguese (Macintosh, eliminate dead keys)"
+Language=pt
+Label=pt
+
+[keyboard-pt-mac_sundeadkeys]
+Description="Keyboard - Portuguese - Portuguese (Macintosh, Sun dead keys)"
+Language=pt
+Label=pt
+
+[keyboard-pt-nativo]
+Description="Keyboard - Portuguese - Portuguese (Nativo)"
+Language=pt
+Label=pt
+
+[keyboard-pt-nativo-us]
+Description="Keyboard - Portuguese - Portuguese (Nativo for US keyboards)"
+Language=pt
+Label=pt
+
+[keyboard-pt-nativo-epo]
+Description="Keyboard - Portuguese - Esperanto (Portugal, Nativo)"
+Language=eo
+Label=pt
+
+[keyboard-pt-sun_type6]
+Description="Keyboard - Portuguese - Portuguese (Sun Type 6/7)"
+Language=pt
+Label=pt
+
+[keyboard-ml]
+Description="Keyboard - Bambara"
+Language=bm
+Label=bm
+
+[keyboard-ml-fr-oss]
+Description="Keyboard - Bambara - French (Mali, alternative)"
+Language=fr
+Label=fr
+
+[keyboard-ml-us-mac]
+Description="Keyboard - Bambara - English (Mali, US Macintosh)"
 Language=en
 Label=en
 
-[keyboard-us-chr]
-Description="Keyboard - English (US) - Cherokee"
-Language=chr
-Label=chr
-
-[keyboard-us-haw]
-Description="Keyboard - English (US) - Hawaiian"
-Language=haw
-Label=haw
-
-[keyboard-us-euro]
-Description="Keyboard - English (US) - English (US, euro on 5)"
+[keyboard-ml-us-intl]
+Description="Keyboard - Bambara - English (Mali, US international)"
 Language=en
-Label=us
-
-[keyboard-us-intl]
-Description="Keyboard - English (US) - English (US, intl., with dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-alt-intl]
-Description="Keyboard - English (US) - English (US, alt. intl.)"
-Language=en
-Label=us
-
-[keyboard-us-colemak]
-Description="Keyboard - English (US) - English (Colemak)"
-Language=en
-Label=us
-
-[keyboard-us-colemak_dh]
-Description="Keyboard - English (US) - English (Colemak-DH)"
-Language=en
-Label=us
-
-[keyboard-us-colemak_dh_iso]
-Description="Keyboard - English (US) - English (Colemak-DH ISO)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak]
-Description="Keyboard - English (US) - English (Dvorak)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak-intl]
-Description="Keyboard - English (US) - English (Dvorak, intl., with dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak-alt-intl]
-Description="Keyboard - English (US) - English (Dvorak, alt. intl.)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak-l]
-Description="Keyboard - English (US) - English (Dvorak, left-handed)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak-r]
-Description="Keyboard - English (US) - English (Dvorak, right-handed)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak-classic]
-Description="Keyboard - English (US) - English (classic Dvorak)"
-Language=en
-Label=us
-
-[keyboard-us-dvp]
-Description="Keyboard - English (US) - English (programmer Dvorak)"
-Language=en
-Label=us
-
-[keyboard-us-dvorak-mac]
-Description="Keyboard - English (US) - English (Dvorak, Macintosh)"
-Language=en
-Label=us
-
-[keyboard-us-symbolic]
-Description="Keyboard - English (US) - English (US, Symbolic)"
-Language=en
-Label=us
-
-[keyboard-us-rus]
-Description="Keyboard - English (US) - Russian (US, phonetic)"
-Language=ru
-Label=ru
-
-[keyboard-us-mac]
-Description="Keyboard - English (US) - English (Macintosh)"
-Language=en
-Label=us
-
-[keyboard-us-altgr-intl]
-Description="Keyboard - English (US) - English (intl., with AltGr dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-olpc2]
-Description="Keyboard - English (US) - English (the divide/multiply toggle the layout)"
-Language=en
-Label=us
-
-[keyboard-us-hbs]
-Description="Keyboard - English (US) - Serbo-Croatian (US)"
-Language=en
-Label=us
-
-[keyboard-us-norman]
-Description="Keyboard - English (US) - English (Norman)"
-Language=en
-Label=us
-
-[keyboard-us-workman]
-Description="Keyboard - English (US) - English (Workman)"
-Language=en
-Label=us
-
-[keyboard-us-workman-intl]
-Description="Keyboard - English (US) - English (Workman, intl., with dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-intl-unicode]
-Description="Keyboard - English (US) - English (US, intl., AltGr Unicode combining)"
-Language=en
-Label=us
-
-[keyboard-us-alt-intl-unicode]
-Description="Keyboard - English (US) - English (US, intl., AltGr Unicode combining, alt.)"
-Language=en
-Label=us
-
-[keyboard-us-ats]
-Description="Keyboard - English (US) - Atsina"
-Language=en
-Label=us
-
-[keyboard-us-crd]
-Description="Keyboard - English (US) - Coeur d'Alene Salish"
-Language=crd
-Label=us
-
-[keyboard-us-cz_sk_de]
-Description="Keyboard - English (US) - Czech Slovak and German (US)"
-Language=en
-Label=us
-
-[keyboard-us-cz_sk_pl_de_es_fi_sv]
-Description="Keyboard - English (US) - Czech, Slovak, Polish, Spanish, Finnish, Swedish and German (US)"
-Language=en
-Label=us
-
-[keyboard-us-drix]
-Description="Keyboard - English (US) - English (Drix)"
-Language=en
-Label=us
-
-[keyboard-us-de_se_fi]
-Description="Keyboard - English (US) - German, Swedish and Finnish (US)"
-Language=en
-Label=us
-
-[keyboard-us-ibm238l]
-Description="Keyboard - English (US) - English (US, IBM Arabic 238_L)"
-Language=en
-Label=us
-
-[keyboard-us-sun_type6]
-Description="Keyboard - English (US) - English (US, Sun Type 6/7)"
-Language=en
-Label=us
-
-[keyboard-us-carpalx]
-Description="Keyboard - English (US) - English (Carpalx)"
-Language=en
-Label=us
-
-[keyboard-us-carpalx-intl]
-Description="Keyboard - English (US) - English (Carpalx, intl., with dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-carpalx-altgr-intl]
-Description="Keyboard - English (US) - ntl., with AltGr dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-carpalx-full]
-Description="Keyboard - English (US) - English (Carpalx, full optimization)"
-Language=en
-Label=us
-
-[keyboard-us-carpalx-full-intl]
-Description="Keyboard - English (US) - English (Carpalx, full optimization, intl., with dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-carpalx-full-altgr-intl]
-Description="Keyboard - English (US) - English (Carpalx, full optimization, intl., with AltGr dead keys)"
-Language=en
-Label=us
-
-[keyboard-us-3l]
-Description="Keyboard - English (US) - English (3l)"
-Language=en
-Label=us
-
-[keyboard-us-3l-cros]
-Description="Keyboard - English (US) - English (3l, Chromebook)"
-Language=en
-Label=us
-
-[keyboard-us-3l-emacs]
-Description="Keyboard - English (US) - English (3l, emacs)"
-Language=en
-Label=us
-
-[keyboard-us-workman-p]
-Description="Keyboard - English (US) - English (Workman-P)"
-Language=en
-Label=workman-p
-
-[keyboard-us-scn]
-Description="Keyboard - English (US) - Sicilian (US keyboard)"
-Language=en
-Label=us
-
-[keyboard-us-altgr-weur]
-Description="Keyboard - English (US) - English (Western European AltGr dead keys)"
-Language=en
-Label=us
-
-[keyboard-ge]
-Description="Keyboard - Georgian"
-Language=ka
-Label=ka
-
-[keyboard-ge-ergonomic]
-Description="Keyboard - Georgian - Georgian (ergonomic)"
-Language=ka
-Label=ge
-
-[keyboard-ge-mess]
-Description="Keyboard - Georgian - Georgian (MESS)"
-Language=ka
-Label=ge
-
-[keyboard-ge-ru]
-Description="Keyboard - Georgian - Russian (Georgia)"
-Language=ru
-Label=ru
-
-[keyboard-ge-os]
-Description="Keyboard - Georgian - Ossetian (Georgia)"
-Language=os
-Label=ge
-
-[keyboard-hr]
-Description="Keyboard - Croatian"
-Language=hr
-Label=hr
-
-[keyboard-hr-alternatequotes]
-Description="Keyboard - Croatian - Croatian (with guillemets)"
-Language=hr
-Label=hr
-
-[keyboard-hr-unicode]
-Description="Keyboard - Croatian - Croatian (with Croatian digraphs)"
-Language=hr
-Label=hr
-
-[keyboard-hr-unicodeus]
-Description="Keyboard - Croatian - Croatian (US, with Croatian digraphs)"
-Language=hr
-Label=hr
-
-[keyboard-hr-us]
-Description="Keyboard - Croatian - Croatian (US)"
-Language=hr
-Label=hr
+Label=en
 
 [keyboard-sy]
 Description="Keyboard - Arabic (Syria)"
@@ -1183,1060 +753,115 @@ Description="Keyboard - Arabic (Syria) - Kurdish (Syria, Latin Alt-Q)"
 Language=ku
 Label=ku
 
-[keyboard-ma]
-Description="Keyboard - Arabic (Morocco)"
-Language=ary
-Label=ar
+[keyboard-vn]
+Description="Keyboard - Vietnamese"
+Language=vi
+Label=vi
 
-[keyboard-ma-french]
-Description="Keyboard - Arabic (Morocco) - French (Morocco)"
-Language=fr
-Label=fr
+[keyboard-pl]
+Description="Keyboard - Polish"
+Language=pl
+Label=pl
 
-[keyboard-ma-tifinagh]
-Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh)"
-Language=
-Label=ber
+[keyboard-pl-legacy]
+Description="Keyboard - Polish - Polish (legacy)"
+Language=pl
+Label=pl
 
-[keyboard-ma-tifinagh-alt]
-Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh alt.)"
-Language=
-Label=ber
+[keyboard-pl-qwertz]
+Description="Keyboard - Polish - Polish (qwertz)"
+Language=pl
+Label=pl
 
-[keyboard-ma-tifinagh-alt-phonetic]
-Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh phonetic, alt.)"
-Language=
-Label=ber
+[keyboard-pl-dvorak]
+Description="Keyboard - Polish - Polish (Dvorak)"
+Language=pl
+Label=pl
 
-[keyboard-ma-tifinagh-extended]
-Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh extended)"
-Language=
-Label=ber
+[keyboard-pl-dvorak_quotes]
+Description="Keyboard - Polish - Polish (Dvorak, Polish quotes on quotemark key)"
+Language=pl
+Label=pl
 
-[keyboard-ma-tifinagh-phonetic]
-Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh phonetic)"
-Language=
-Label=ber
+[keyboard-pl-dvorak_altquotes]
+Description="Keyboard - Polish - Polish (Dvorak, Polish quotes on key 1)"
+Language=pl
+Label=pl
 
-[keyboard-ma-tifinagh-extended-phonetic]
-Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh extended phonetic)"
-Language=
-Label=ber
+[keyboard-pl-csb]
+Description="Keyboard - Polish - Kashubian"
+Language=csb
+Label=pl
 
-[keyboard-ma-rif]
-Description="Keyboard - Arabic (Morocco) - Tarifit"
-Language=rif
-Label=rif
+[keyboard-pl-szl]
+Description="Keyboard - Polish - Silesian"
+Language=szl
+Label=pl
 
-[keyboard-af]
-Description="Keyboard - Dari"
-Language=drs
-Label=fa
+[keyboard-pl-ru_phonetic_dvorak]
+Description="Keyboard - Polish - Russian (Poland, phonetic Dvorak)"
+Language=ru
+Label=ru
 
-[keyboard-af-ps]
-Description="Keyboard - Dari - Pashto"
-Language=ps
-Label=ps
+[keyboard-pl-dvp]
+Description="Keyboard - Polish - Polish (programmer Dvorak)"
+Language=pl
+Label=pl
 
-[keyboard-af-uz]
-Description="Keyboard - Dari - Uzbek (Afghanistan)"
-Language=uz
-Label=uz
+[keyboard-pl-intl]
+Description="Keyboard - Polish - Polish (international with dead keys)"
+Language=pl
+Label=pl
 
-[keyboard-af-ps-olpc]
-Description="Keyboard - Dari - Pashto (Afghanistan, OLPC)"
-Language=ps
-Label=ps
+[keyboard-pl-colemak]
+Description="Keyboard - Polish - Polish (Colemak)"
+Language=pl
+Label=pl
 
-[keyboard-af-fa-olpc]
-Description="Keyboard - Dari - Dari (Afghanistan, OLPC)"
-Language=drs
-Label=fa
+[keyboard-pl-sun_type6]
+Description="Keyboard - Polish - Polish (Sun Type 6/7)"
+Language=pl
+Label=pl
 
-[keyboard-af-uz-olpc]
-Description="Keyboard - Dari - Uzbek (Afghanistan, OLPC)"
-Language=uz
-Label=uz
+[keyboard-th]
+Description="Keyboard - Thai"
+Language=th
+Label=th
 
-[keyboard-dz]
-Description="Keyboard - Berber (Algeria, Latin)"
-Language=tzm
-Label=kab
+[keyboard-th-tis]
+Description="Keyboard - Thai - Thai (TIS-820.2538)"
+Language=th
+Label=th
 
-[keyboard-dz-azerty-deadkeys]
-Description="Keyboard - Berber (Algeria, Latin) - Kabyle (AZERTY, with dead keys)"
-Language=kab
-Label=kab
-
-[keyboard-dz-qwerty-gb-deadkeys]
-Description="Keyboard - Berber (Algeria, Latin) - Kabyle (QWERTY, UK, with dead keys)"
-Language=kab
-Label=kab
-
-[keyboard-dz-qwerty-us-deadkeys]
-Description="Keyboard - Berber (Algeria, Latin) - Kabyle (QWERTY, US, with dead keys)"
-Language=kab
-Label=kab
-
-[keyboard-dz-ber]
-Description="Keyboard - Berber (Algeria, Latin) - Berber (Algeria, Tifinagh)"
-Language=kab
-Label=kab
-
-[keyboard-dz-ar]
-Description="Keyboard - Berber (Algeria, Latin) - Arabic (Algeria)"
-Language=ar
-Label=ar
+[keyboard-th-pat]
+Description="Keyboard - Thai - Thai (Pattachote)"
+Language=th
+Label=th
 
 [keyboard-mn]
 Description="Keyboard - Mongolian"
 Language=mn
 Label=mn
 
-[keyboard-pk]
-Description="Keyboard - Urdu (Pakistan)"
-Language=ur
-Label=ur
-
-[keyboard-pk-urd-crulp]
-Description="Keyboard - Urdu (Pakistan) - Urdu (Pakistan, CRULP)"
-Language=ur
-Label=pk
-
-[keyboard-pk-urd-nla]
-Description="Keyboard - Urdu (Pakistan) - Urdu (Pakistan, NLA)"
-Language=ur
-Label=pk
-
-[keyboard-pk-ara]
-Description="Keyboard - Urdu (Pakistan) - Arabic (Pakistan)"
-Language=ar
-Label=ar
-
-[keyboard-pk-snd]
-Description="Keyboard - Urdu (Pakistan) - Sindhi"
-Language=sd
-Label=sd
-
-[keyboard-pk-urd-navees]
-Description="Keyboard - Urdu (Pakistan) - Urdu (Pakistan, Navees)"
-Language=ur
-Label=pk
-
-[keyboard-au]
-Description="Keyboard - English (Australian)"
-Language=en
-Label=en
-
-[keyboard-ml]
-Description="Keyboard - Bambara"
-Language=bm
-Label=bm
-
-[keyboard-ml-fr-oss]
-Description="Keyboard - Bambara - French (Mali, alt.)"
-Language=fr
-Label=fr
-
-[keyboard-ml-us-mac]
-Description="Keyboard - Bambara - English (Mali, US, Macintosh)"
-Language=en
-Label=en
-
-[keyboard-ml-us-intl]
-Description="Keyboard - Bambara - English (Mali, US, intl.)"
-Language=en
-Label=en
-
-[keyboard-vn]
-Description="Keyboard - Vietnamese"
-Language=vi
-Label=vi
-
-[keyboard-vn-us]
-Description="Keyboard - Vietnamese - Vietnamese (US)"
-Language=vi
-Label=vn
-
-[keyboard-vn-fr]
-Description="Keyboard - Vietnamese - Vietnamese (France)"
-Language=vi
-Label=vn
-
-[keyboard-vn-aderty]
-Description="Keyboard - Vietnamese - Vietnamese (AÐERTY)"
-Language=vi
-Label=vn
-
-[keyboard-vn-qderty]
-Description="Keyboard - Vietnamese - Vietnamese (QĐERTY)"
-Language=vi
-Label=vn
-
-[keyboard-ara]
-Description="Keyboard - Arabic"
-Language=ar
-Label=ar
-
-[keyboard-ara-azerty]
-Description="Keyboard - Arabic - Arabic (AZERTY)"
-Language=ar
-Label=ara
-
-[keyboard-ara-azerty_digits]
-Description="Keyboard - Arabic - Arabic (AZERTY, Eastern Arabic numerals)"
-Language=ar
-Label=ara
-
-[keyboard-ara-digits]
-Description="Keyboard - Arabic - Arabic (Eastern Arabic numerals)"
-Language=ar
-Label=ara
-
-[keyboard-ara-qwerty]
-Description="Keyboard - Arabic - Arabic (QWERTY)"
-Language=ar
-Label=ara
-
-[keyboard-ara-qwerty_digits]
-Description="Keyboard - Arabic - Arabic (QWERTY, Eastern Arabic numerals)"
-Language=ar
-Label=ara
-
-[keyboard-ara-buckwalter]
-Description="Keyboard - Arabic - Arabic (Buckwalter)"
-Language=ar
-Label=ara
-
-[keyboard-ara-olpc]
-Description="Keyboard - Arabic - Arabic (OLPC)"
-Language=ar
-Label=ara
-
-[keyboard-ara-mac]
-Description="Keyboard - Arabic - Arabic (Macintosh)"
-Language=ar
-Label=ara
-
-[keyboard-ara-sun_type6]
-Description="Keyboard - Arabic - Arabic (Sun Type 6/7)"
-Language=ar
-Label=ara
-
-[keyboard-ara-basic_ext]
-Description="Keyboard - Arabic - Arabic (Arabic numerals, extensions in the 4th level)"
-Language=ar
-Label=ara
-
-[keyboard-ara-basic_ext_digits]
-Description="Keyboard - Arabic - Arabic (Eastern Arabic numerals, extensions in the 4th level)"
-Language=ar
-Label=ara
-
-[keyboard-ara-uga]
-Description="Keyboard - Arabic - Ugaritic instead of Arabic"
-Language=ar
-Label=ara
-
-[keyboard-ara-ergoarabic]
-Description="Keyboard - Arabic - Arabic (ErgoArabic)"
-Language=ar
-Label=ara
-
-[keyboard-ie]
-Description="Keyboard - Irish"
-Language=en
-Label=ie
-
-[keyboard-ie-CloGaelach]
-Description="Keyboard - Irish - CloGaelach"
-Language=ga
-Label=ie
-
-[keyboard-ie-UnicodeExpert]
-Description="Keyboard - Irish - Irish (UnicodeExpert)"
-Language=en
-Label=ie
-
-[keyboard-ie-ogam]
-Description="Keyboard - Irish - Ogham"
-Language=sga
-Label=ie
-
-[keyboard-ie-ogam_is434]
-Description="Keyboard - Irish - Ogham (IS434)"
-Language=sga
-Label=ie
-
-[keyboard-cm]
-Description="Keyboard - English (Cameroon)"
-Language=en
-Label=cm
-
-[keyboard-cm-french]
-Description="Keyboard - English (Cameroon) - French (Cameroon)"
-Language=fr
-Label=cm
-
-[keyboard-cm-qwerty]
-Description="Keyboard - English (Cameroon) - Cameroon Multilingual (QWERTY, intl.)"
-Language=en
-Label=cm
-
-[keyboard-cm-azerty]
-Description="Keyboard - English (Cameroon) - Cameroon (AZERTY, intl.)"
-Language=fr
-Label=cm
-
-[keyboard-cm-dvorak]
-Description="Keyboard - English (Cameroon) - Cameroon (Dvorak, intl.)"
-Language=en
-Label=cm
-
-[keyboard-cm-mmuock]
-Description="Keyboard - English (Cameroon) - Mmuock"
-Language=en
-Label=cm
-
-[keyboard-kg]
-Description="Keyboard - Kyrgyz"
-Language=ky
-Label=ki
-
-[keyboard-kg-phonetic]
-Description="Keyboard - Kyrgyz - Kyrgyz (phonetic)"
-Language=ky
-Label=kg
-
-[keyboard-ph]
-Description="Keyboard - Filipino"
-Language=fil
-Label=ph
-
-[keyboard-ph-qwerty-bay]
-Description="Keyboard - Filipino - Filipino (QWERTY, Baybayin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-capewell-dvorak]
-Description="Keyboard - Filipino - Filipino (Capewell-Dvorak, Latin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-capewell-dvorak-bay]
-Description="Keyboard - Filipino - Filipino (Capewell-Dvorak, Baybayin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-capewell-qwerf2k6]
-Description="Keyboard - Filipino - Filipino (Capewell-QWERF 2006, Latin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-capewell-qwerf2k6-bay]
-Description="Keyboard - Filipino - Filipino (Capewell-QWERF 2006, Baybayin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-colemak]
-Description="Keyboard - Filipino - Filipino (Colemak, Latin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-colemak-bay]
-Description="Keyboard - Filipino - Filipino (Colemak, Baybayin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-dvorak]
-Description="Keyboard - Filipino - Filipino (Dvorak, Latin)"
-Language=fil
-Label=ph
-
-[keyboard-ph-dvorak-bay]
-Description="Keyboard - Filipino - Filipino (Dvorak, Baybayin)"
-Language=fil
-Label=ph
-
-[keyboard-bd]
-Description="Keyboard - Bangla"
-Language=bn
-Label=bn
-
-[keyboard-bd-probhat]
-Description="Keyboard - Bangla - Bangla (Probhat)"
-Language=bn
-Label=bd
-
-[keyboard-lk]
-Description="Keyboard - Sinhala (phonetic)"
-Language=si
-Label=si
-
-[keyboard-lk-tam_unicode]
-Description="Keyboard - Sinhala (phonetic) - (Sri Lanka, TamilNet '99)"
-Language=ta
-Label=ta
-
-[keyboard-lk-tam_TAB]
-Description="Keyboard - Sinhala (phonetic) - Tamil (Sri Lanka, TamilNet '99, TAB encoding)"
-Language=ta
-Label=lk
-
-[keyboard-lk-us]
-Description="Keyboard - Sinhala (phonetic) - Sinhala (US)"
-Language=si
-Label=us
-
-[keyboard-al]
-Description="Keyboard - Albanian"
-Language=sq
-Label=sq
-
-[keyboard-al-plisi]
-Description="Keyboard - Albanian - Albanian (Plisi)"
-Language=sq
-Label=al
-
-[keyboard-al-veqilharxhi]
-Description="Keyboard - Albanian - Albanian (Veqilharxhi)"
-Language=sq
-Label=al
-
-[keyboard-tw]
-Description="Keyboard - Taiwanese"
-Language=
-Label=zh
-
-[keyboard-tw-indigenous]
-Description="Keyboard - Taiwanese - Taiwanese (indigenous)"
-Language=tay
-Label=tw
-
-[keyboard-tw-saisiyat]
-Description="Keyboard - Taiwanese - Saisiyat (Taiwan)"
-Language=xsy
-Label=xsy
-
-[keyboard-rs]
-Description="Keyboard - Serbian"
-Language=sr
-Label=sr
-
-[keyboard-rs-yz]
-Description="Keyboard - Serbian - Serbian (Cyrillic, ZE and ZHE swapped)"
-Language=sr
-Label=rs
-
-[keyboard-rs-latin]
-Description="Keyboard - Serbian - Serbian (Latin)"
-Language=sr
-Label=rs
-
-[keyboard-rs-latinunicode]
-Description="Keyboard - Serbian - Serbian (Latin, Unicode)"
-Language=sr
-Label=rs
-
-[keyboard-rs-latinyz]
-Description="Keyboard - Serbian - Serbian (Latin, QWERTY)"
-Language=sr
-Label=rs
-
-[keyboard-rs-latinunicodeyz]
-Description="Keyboard - Serbian - Serbian (Latin, Unicode, QWERTY)"
-Language=sr
-Label=rs
-
-[keyboard-rs-alternatequotes]
-Description="Keyboard - Serbian - Serbian (Cyrillic, with guillemets)"
-Language=sr
-Label=rs
-
-[keyboard-rs-latinalternatequotes]
-Description="Keyboard - Serbian - Serbian (Latin, with guillemets)"
-Language=sr
-Label=rs
-
-[keyboard-rs-rue]
-Description="Keyboard - Serbian - Pannonian Rusyn"
-Language=rue
-Label=rs
-
-[keyboard-rs-combiningkeys]
-Description="Keyboard - Serbian - Serbian (combining accents instead of dead keys)"
-Language=sr
-Label=rs
-
-[keyboard-dk]
-Description="Keyboard - Danish"
-Language=da
-Label=da
-
-[keyboard-dk-nodeadkeys]
-Description="Keyboard - Danish - Danish (no dead keys)"
-Language=da
-Label=dk
-
-[keyboard-dk-winkeys]
-Description="Keyboard - Danish - Danish (Windows)"
-Language=da
-Label=dk
-
-[keyboard-dk-mac]
-Description="Keyboard - Danish - Danish (Macintosh)"
-Language=da
-Label=dk
-
-[keyboard-dk-mac_nodeadkeys]
-Description="Keyboard - Danish - Danish (Macintosh, no dead keys)"
-Language=da
-Label=dk
-
-[keyboard-dk-dvorak]
-Description="Keyboard - Danish - Danish (Dvorak)"
-Language=da
-Label=dk
-
-[keyboard-dk-sun_type6]
-Description="Keyboard - Danish - Danish (Sun Type 6/7)"
-Language=da
-Label=dk
-
-[keyboard-bt]
-Description="Keyboard - Dzongkha"
-Language=dz
-Label=dz
-
-[keyboard-la]
-Description="Keyboard - Lao"
-Language=lo
-Label=lo
-
-[keyboard-la-stea]
-Description="Keyboard - Lao - Lao (STEA)"
-Language=lo
-Label=la
-
-[keyboard-mm]
-Description="Keyboard - Burmese"
-Language=my
-Label=my
-
-[keyboard-mm-zawgyi]
-Description="Keyboard - Burmese - Burmese Zawgyi"
-Language=my
-Label=zg
-
-[keyboard-mm-shn]
-Description="Keyboard - Burmese - Shan"
-Language=shn
-Label=shn
-
-[keyboard-mm-zgt]
-Description="Keyboard - Burmese - Shan (Zawgyi Tai)"
-Language=shn
-Label=zgt
-
-[keyboard-mm-mnw]
-Description="Keyboard - Burmese - Mon"
-Language=mnw
-Label=mon
-
-[keyboard-mm-mnw-a1]
-Description="Keyboard - Burmese - Mon (A1)"
-Language=mnw
-Label=mon-a1
-
-[keyboard-si]
-Description="Keyboard - Slovenian"
-Language=sl
-Label=sl
-
-[keyboard-si-alternatequotes]
-Description="Keyboard - Slovenian - Slovenian (with guillemets)"
-Language=sl
-Label=si
-
-[keyboard-si-us]
-Description="Keyboard - Slovenian - Slovenian (US)"
-Language=sl
-Label=si
-
-[keyboard-am]
-Description="Keyboard - Armenian"
-Language=hy
-Label=hy
-
-[keyboard-am-phonetic]
-Description="Keyboard - Armenian - Armenian (phonetic)"
-Language=hy
-Label=am
-
-[keyboard-am-phonetic-alt]
-Description="Keyboard - Armenian - Armenian (alt. phonetic)"
-Language=hy
-Label=am
-
-[keyboard-am-eastern]
-Description="Keyboard - Armenian - Armenian (eastern)"
-Language=hy
-Label=am
-
-[keyboard-am-western]
-Description="Keyboard - Armenian - Armenian (western)"
-Language=hy
-Label=am
-
-[keyboard-am-eastern-alt]
-Description="Keyboard - Armenian - Armenian (alt. eastern)"
-Language=hy
-Label=am
-
-[keyboard-am-olpc-phonetic]
-Description="Keyboard - Armenian - Armenian (OLPC, phonetic)"
-Language=hy
-Label=am
-
-[keyboard-by]
-Description="Keyboard - Belarusian"
-Language=be
-Label=by
-
-[keyboard-by-legacy]
-Description="Keyboard - Belarusian - Belarusian (legacy)"
-Language=be
-Label=by
-
-[keyboard-by-latin]
-Description="Keyboard - Belarusian - Belarusian (Latin)"
-Language=be
-Label=by
-
-[keyboard-by-ru]
-Description="Keyboard - Belarusian - Russian (Belarus)"
-Language=ru
-Label=by
-
-[keyboard-by-intl]
-Description="Keyboard - Belarusian - Belarusian (intl.)"
-Language=be
-Label=by
-
-[keyboard-by-phonetic]
-Description="Keyboard - Belarusian - Belarusian (phonetic)"
-Language=be
-Label=by
-
-[keyboard-br]
-Description="Keyboard - Portuguese (Brazil)"
-Language=pt
-Label=pt
-
-[keyboard-br-nodeadkeys]
-Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, no dead keys)"
-Language=pt
-Label=br
-
-[keyboard-br-dvorak]
-Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Dvorak)"
-Language=pt
-Label=br
-
-[keyboard-br-nativo]
-Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Nativo)"
-Language=pt
-Label=br
-
-[keyboard-br-nativo-us]
-Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Nativo for US keyboards)"
-Language=pt
-Label=br
-
-[keyboard-br-nativo-epo]
-Description="Keyboard - Portuguese (Brazil) - Esperanto (Brazil, Nativo)"
-Language=eo
-Label=br
-
-[keyboard-br-thinkpad]
-Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, IBM/Lenovo ThinkPad)"
-Language=pt
-Label=br
-
-[keyboard-br-sun_type6]
-Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Sun Type 6/7)"
-Language=pt
-Label=br
-
-[keyboard-in]
-Description="Keyboard - Indian"
-Language=hi
-Label=in
-
-[keyboard-in-ben]
-Description="Keyboard - Indian - Bangla (India)"
-Language=bn
-Label=bn
-
-[keyboard-in-ben_probhat]
-Description="Keyboard - Indian - Bangla (India, Probhat)"
-Language=bn
-Label=bn
-
-[keyboard-in-ben_baishakhi]
-Description="Keyboard - Indian - Bangla (India, Baishakhi)"
-Language=bn
-Label=in
-
-[keyboard-in-ben_bornona]
-Description="Keyboard - Indian - Bangla (India, Bornona)"
-Language=bn
-Label=in
-
-[keyboard-in-ben_gitanjali]
-Description="Keyboard - Indian - Bangla (India, Gitanjali)"
-Language=bn
-Label=in
-
-[keyboard-in-ben_inscript]
-Description="Keyboard - Indian - Bangla (India, Baishakhi InScript)"
-Language=bn
-Label=in
-
-[keyboard-in-eeyek]
-Description="Keyboard - Indian - Manipuri (Eeyek)"
-Language=mni
-Label=in
-
-[keyboard-in-guj]
-Description="Keyboard - Indian - Gujarati"
-Language=gu
-Label=gu
-
-[keyboard-in-guru]
-Description="Keyboard - Indian - Punjabi (Gurmukhi)"
-Language=pa
-Label=pa
-
-[keyboard-in-jhelum]
-Description="Keyboard - Indian - Punjabi (Gurmukhi Jhelum)"
-Language=pa
-Label=pa
-
-[keyboard-in-kan]
-Description="Keyboard - Indian - Kannada"
-Language=kn
-Label=kn
-
-[keyboard-in-kan-kagapa]
-Description="Keyboard - Indian - Kannada (KaGaPa, phonetic)"
-Language=kn
-Label=kn
-
-[keyboard-in-mal]
-Description="Keyboard - Indian - Malayalam"
-Language=ml
-Label=ml
-
-[keyboard-in-mal_lalitha]
-Description="Keyboard - Indian - Malayalam (Lalitha)"
-Language=ml
-Label=ml
-
-[keyboard-in-mal_enhanced]
-Description="Keyboard - Indian - Malayalam (enhanced InScript, with rupee)"
-Language=ml
-Label=ml
-
-[keyboard-in-ori]
-Description="Keyboard - Indian - Oriya"
-Language=or
-Label=or
-
-[keyboard-in-ori-bolnagri]
-Description="Keyboard - Indian - Oriya (Bolnagri)"
-Language=or
-Label=or
-
-[keyboard-in-ori-wx]
-Description="Keyboard - Indian - Oriya (Wx)"
-Language=or
-Label=or
-
-[keyboard-in-olck]
-Description="Keyboard - Indian - Ol Chiki"
-Language=sat
-Label=sat
-
-[keyboard-in-tamilnet]
-Description="Keyboard - Indian - Tamil (TamilNet '99)"
-Language=ta
-Label=ta
-
-[keyboard-in-tamilnet_tamilnumbers]
-Description="Keyboard - Indian - Tamil (TamilNet '99 with Tamil numerals)"
-Language=ta
-Label=ta
-
-[keyboard-in-tamilnet_TAB]
-Description="Keyboard - Indian - Tamil (TamilNet '99, TAB encoding)"
-Language=ta
-Label=ta
-
-[keyboard-in-tamilnet_TSCII]
-Description="Keyboard - Indian - Tamil (TamilNet '99, TSCII encoding)"
-Language=ta
-Label=ta
-
-[keyboard-in-tam]
-Description="Keyboard - Indian - Tamil (InScript, with Arabic numerals)"
-Language=ta
-Label=ta
-
-[keyboard-in-tam_tamilnumbers]
-Description="Keyboard - Indian - Tamil (InScript, with Tamil numerals)"
-Language=ta
-Label=ta
-
-[keyboard-in-tel]
-Description="Keyboard - Indian - Telugu"
-Language=te
-Label=te
-
-[keyboard-in-tel-kagapa]
-Description="Keyboard - Indian - Telugu (KaGaPa, phonetic)"
-Language=te
-Label=te
-
-[keyboard-in-tel-sarala]
-Description="Keyboard - Indian - Telugu (Sarala)"
-Language=te
-Label=te
-
-[keyboard-in-urd-phonetic]
-Description="Keyboard - Indian - Urdu (phonetic)"
-Language=ur
-Label=ur
-
-[keyboard-in-urd-phonetic3]
-Description="Keyboard - Indian - Urdu (alt. phonetic)"
-Language=ur
-Label=ur
-
-[keyboard-in-urd-winkeys]
-Description="Keyboard - Indian - Urdu (Windows)"
-Language=ur
-Label=ur
-
-[keyboard-in-bolnagri]
-Description="Keyboard - Indian - Hindi (Bolnagri)"
-Language=hi
-Label=hi
-
-[keyboard-in-hin-wx]
-Description="Keyboard - Indian - Hindi (Wx)"
-Language=hi
-Label=hi
-
-[keyboard-in-hin-kagapa]
-Description="Keyboard - Indian - Hindi (KaGaPa, phonetic)"
-Language=hi
-Label=hi
-
-[keyboard-in-san-kagapa]
-Description="Keyboard - Indian - Sanskrit (KaGaPa, phonetic)"
-Language=sa
-Label=sa
-
-[keyboard-in-mar-kagapa]
-Description="Keyboard - Indian - Marathi (KaGaPa, phonetic)"
-Language=mr
-Label=mr
-
-[keyboard-in-eng]
-Description="Keyboard - Indian - English (India, with rupee)"
-Language=en
-Label=en
-
-[keyboard-in-iipa]
-Description="Keyboard - Indian - Indic IPA"
-Language=en
-Label=in
-
-[keyboard-in-marathi]
-Description="Keyboard - Indian - Marathi (enhanced InScript)"
-Language=mr
-Label=in
-
-[keyboard-in-modi-kagapa]
-Description="Keyboard - Indian - Modi (KaGaPa phonetic)"
-Language=mr
-Label=mr
-
-[keyboard-in-san-misc]
-Description="Keyboard - Indian - Sanskrit symbols"
-Language=sa
-Label=sas
-
-[keyboard-in-urd-navees]
-Description="Keyboard - Indian - Urdu (Navees)"
-Language=ur
-Label=ur
-
-[keyboard-be]
-Description="Keyboard - Belgian"
-Language=de
-Label=be
-
-[keyboard-be-oss]
-Description="Keyboard - Belgian - Belgian (alt.)"
-Language=de
-Label=be
-
-[keyboard-be-oss_latin9]
-Description="Keyboard - Belgian - Belgian (Latin-9 only, alt.)"
-Language=de
-Label=be
-
-[keyboard-be-iso-alternate]
-Description="Keyboard - Belgian - Belgian (ISO, alt.)"
-Language=de
-Label=be
-
-[keyboard-be-nodeadkeys]
-Description="Keyboard - Belgian - Belgian (no dead keys)"
-Language=de
-Label=be
-
-[keyboard-be-wang]
-Description="Keyboard - Belgian - Belgian (Wang 724 AZERTY)"
-Language=de
-Label=be
-
-[keyboard-be-sun_type6]
-Description="Keyboard - Belgian - Belgian (Sun Type 6/7)"
-Language=de
-Label=be
-
-[keyboard-eg]
-Description="Keyboard - Coptic"
-Language=cop
-Label=cop
-
-[keyboard-cd]
-Description="Keyboard - French (Democratic Republic of the Congo)"
-Language=fr
-Label=fr
-
-[keyboard-ba]
-Description="Keyboard - Bosnian"
-Language=bs
-Label=bs
-
-[keyboard-ba-alternatequotes]
-Description="Keyboard - Bosnian - Bosnian (with guillemets)"
-Language=bs
-Label=ba
-
-[keyboard-ba-unicode]
-Description="Keyboard - Bosnian - Bosnian (with Bosnian digraphs)"
-Language=bs
-Label=ba
-
-[keyboard-ba-unicodeus]
-Description="Keyboard - Bosnian - Bosnian (US, with Bosnian digraphs)"
-Language=bs
-Label=ba
-
-[keyboard-ba-us]
-Description="Keyboard - Bosnian - Bosnian (US)"
-Language=bs
-Label=ba
-
-[keyboard-lv]
-Description="Keyboard - Latvian"
-Language=lv
-Label=lv
-
-[keyboard-lv-apostrophe]
-Description="Keyboard - Latvian - Latvian (apostrophe)"
-Language=lv
-Label=lv
-
-[keyboard-lv-tilde]
-Description="Keyboard - Latvian - Latvian (tilde)"
-Language=lv
-Label=lv
-
-[keyboard-lv-fkey]
-Description="Keyboard - Latvian - Latvian (F)"
-Language=lv
-Label=lv
-
-[keyboard-lv-modern]
-Description="Keyboard - Latvian - Latvian (modern)"
-Language=lv
-Label=lv
-
-[keyboard-lv-ergonomic]
-Description="Keyboard - Latvian - Latvian (ergonomic, ŪGJRMV)"
-Language=lv
-Label=lv
-
-[keyboard-lv-adapted]
-Description="Keyboard - Latvian - Latvian (adapted)"
-Language=lv
-Label=lv
-
-[keyboard-lv-dvorak]
-Description="Keyboard - Latvian - Latvian (Dvorak)"
-Language=lv
-Label=lv
-
-[keyboard-lv-ykeydvorak]
-Description="Keyboard - Latvian - Latvian (Dvorak, with Y)"
-Language=lv
-Label=lv
-
-[keyboard-lv-minuskeydvorak]
-Description="Keyboard - Latvian - Latvian (Dvorak, with minus)"
-Language=lv
-Label=lv
-
-[keyboard-lv-dvorakprogr]
-Description="Keyboard - Latvian - Latvian (programmer Dvorak)"
-Language=lv
-Label=lv
-
-[keyboard-lv-ykeydvorakprogr]
-Description="Keyboard - Latvian - Latvian (programmer Dvorak, with Y)"
-Language=lv
-Label=lv
-
-[keyboard-lv-minuskeydvorakprogr]
-Description="Keyboard - Latvian - Latvian (programmer Dvorak, with minus)"
-Language=lv
-Label=lv
-
-[keyboard-lv-colemak]
-Description="Keyboard - Latvian - Latvian (Colemak)"
-Language=lv
-Label=lv
-
-[keyboard-lv-apostrophecolemak]
-Description="Keyboard - Latvian - Latvian (Colemak, with apostrophe)"
-Language=lv
-Label=lv
-
-[keyboard-lv-sun_type6]
-Description="Keyboard - Latvian - Latvian (Sun Type 6/7)"
-Language=lv
-Label=lv
-
-[keyboard-lv-apostrophe-deadquotes]
-Description="Keyboard - Latvian - ad quotes)"
-Language=lv
-Label=lv
+[keyboard-mt]
+Description="Keyboard - Maltese"
+Language=mt
+Label=mt
+
+[keyboard-mt-us]
+Description="Keyboard - Maltese - Maltese (with US layout)"
+Language=mt
+Label=mt
+
+[keyboard-mk]
+Description="Keyboard - Macedonian"
+Language=mk
+Label=mk
+
+[keyboard-mk-nodeadkeys]
+Description="Keyboard - Macedonian - Macedonian (eliminate dead keys)"
+Language=mk
+Label=mk
 
 [keyboard-me]
 Description="Keyboard - Montenegrin"
@@ -2254,474 +879,134 @@ Language=sr
 Label=me
 
 [keyboard-me-latinunicode]
-Description="Keyboard - Montenegrin - Montenegrin (Latin, Unicode)"
+Description="Keyboard - Montenegrin - Montenegrin (Latin Unicode)"
 Language=sr
 Label=me
 
 [keyboard-me-latinyz]
-Description="Keyboard - Montenegrin - Montenegrin (Latin, QWERTY)"
+Description="Keyboard - Montenegrin - Montenegrin (Latin qwerty)"
 Language=sr
 Label=me
 
 [keyboard-me-latinunicodeyz]
-Description="Keyboard - Montenegrin - Montenegrin (Latin, Unicode, QWERTY)"
+Description="Keyboard - Montenegrin - Montenegrin (Latin Unicode qwerty)"
 Language=sr
 Label=me
 
 [keyboard-me-cyrillicalternatequotes]
-Description="Keyboard - Montenegrin - Montenegrin (Cyrillic, with guillemets)"
+Description="Keyboard - Montenegrin - Montenegrin (Cyrillic with guillemets)"
 Language=sr
 Label=me
 
 [keyboard-me-latinalternatequotes]
-Description="Keyboard - Montenegrin - Montenegrin (Latin, with guillemets)"
+Description="Keyboard - Montenegrin - Montenegrin (Latin with guillemets)"
 Language=sr
 Label=me
 
-[keyboard-at]
-Description="Keyboard - German (Austria)"
-Language=de
-Label=de
-
-[keyboard-at-nodeadkeys]
-Description="Keyboard - German (Austria) - German (Austria, no dead keys)"
-Language=de
-Label=at
-
-[keyboard-at-mac]
-Description="Keyboard - German (Austria) - German (Austria, Macintosh)"
-Language=de
-Label=at
-
-[keyboard-ch]
-Description="Keyboard - German (Switzerland)"
-Language=de
-Label=de
-
-[keyboard-ch-legacy]
-Description="Keyboard - German (Switzerland) - German (Switzerland, legacy)"
-Language=de
-Label=ch
-
-[keyboard-ch-de_nodeadkeys]
-Description="Keyboard - German (Switzerland) - German (Switzerland, no dead keys)"
-Language=de
-Label=de
-
-[keyboard-ch-fr]
-Description="Keyboard - German (Switzerland) - French (Switzerland)"
-Language=fr
-Label=fr
-
-[keyboard-ch-fr_nodeadkeys]
-Description="Keyboard - German (Switzerland) - French (Switzerland, no dead keys)"
-Language=fr
-Label=fr
-
-[keyboard-ch-fr_mac]
-Description="Keyboard - German (Switzerland) - French (Switzerland, Macintosh)"
-Language=fr
-Label=fr
-
-[keyboard-ch-de_mac]
-Description="Keyboard - German (Switzerland) - German (Switzerland, Macintosh)"
-Language=de
-Label=de
-
-[keyboard-ch-sun_type6_de]
-Description="Keyboard - German (Switzerland) - German (Switzerland, Sun Type 6/7)"
-Language=de
-Label=ch
-
-[keyboard-ch-sun_type6_fr]
-Description="Keyboard - German (Switzerland) - French (Switzerland, Sun Type 6/7)"
-Language=de
-Label=ch
-
-[keyboard-kz]
-Description="Keyboard - Kazakh"
-Language=kk
-Label=kk
-
-[keyboard-kz-ruskaz]
-Description="Keyboard - Kazakh - Russian (Kazakhstan, with Kazakh)"
-Language=ru
-Label=ru
-
-[keyboard-kz-kazrus]
-Description="Keyboard - Kazakh - Kazakh (with Russian)"
-Language=kk
-Label=kz
-
-[keyboard-kz-ext]
-Description="Keyboard - Kazakh - Kazakh (extended)"
-Language=kk
-Label=kz
-
-[keyboard-kz-latin]
-Description="Keyboard - Kazakh - Kazakh (Latin)"
-Language=kk
-Label=kz
-
-[keyboard-iq]
-Description="Keyboard - Iraqi"
-Language=ar
-Label=ar
-
-[keyboard-iq-ku]
-Description="Keyboard - Iraqi - Kurdish (Iraq, Latin Q)"
-Language=ku
-Label=ku
-
-[keyboard-iq-ku_f]
-Description="Keyboard - Iraqi - Kurdish (Iraq, F)"
-Language=ku
-Label=ku
-
-[keyboard-iq-ku_alt]
-Description="Keyboard - Iraqi - Kurdish (Iraq, Latin Alt-Q)"
-Language=ku
-Label=ku
-
-[keyboard-iq-ku_ara]
-Description="Keyboard - Iraqi - Kurdish (Iraq, Arabic-Latin)"
-Language=ku
-Label=ku
-
-[keyboard-fo]
-Description="Keyboard - Faroese"
-Language=fo
-Label=fo
-
-[keyboard-fo-nodeadkeys]
-Description="Keyboard - Faroese - Faroese (no dead keys)"
-Language=fo
-Label=fo
-
-[keyboard-mk]
-Description="Keyboard - Macedonian"
-Language=mk
-Label=mk
-
-[keyboard-mk-nodeadkeys]
-Description="Keyboard - Macedonian - Macedonian (no dead keys)"
-Language=mk
-Label=mk
-
-[keyboard-cn]
-Description="Keyboard - Chinese"
-Language=zh
-Label=zh
-
-[keyboard-cn-mon_trad]
-Description="Keyboard - Chinese - Mongolian (Bichig)"
-Language=mvf
-Label=cn
-
-[keyboard-cn-mon_trad_todo]
-Description="Keyboard - Chinese - Mongolian (Todo)"
-Language=mvf
-Label=cn
-
-[keyboard-cn-mon_trad_xibe]
-Description="Keyboard - Chinese - Mongolian (Xibe)"
-Language=sjo
-Label=cn
-
-[keyboard-cn-mon_trad_manchu]
-Description="Keyboard - Chinese - Mongolian (Manchu)"
-Language=mnc
-Label=cn
-
-[keyboard-cn-mon_trad_galik]
-Description="Keyboard - Chinese - Mongolian (Galik)"
-Language=mvf
-Label=cn
-
-[keyboard-cn-mon_todo_galik]
-Description="Keyboard - Chinese - Mongolian (Todo Galik)"
-Language=mvf
-Label=cn
-
-[keyboard-cn-mon_manchu_galik]
-Description="Keyboard - Chinese - Mongolian (Manchu Galik)"
-Language=mnc
-Label=cn
-
-[keyboard-cn-tib]
-Description="Keyboard - Chinese - Tibetan"
-Language=bo
-Label=cn
-
-[keyboard-cn-tib_asciinum]
-Description="Keyboard - Chinese - Tibetan (with ASCII numerals)"
-Language=bo
-Label=cn
-
-[keyboard-cn-ug]
-Description="Keyboard - Chinese - Uyghur"
-Language=ug
-Label=ug
-
-[keyboard-cn-altgr-pinyin]
-Description="Keyboard - Chinese - Hanyu Pinyin Letters (with AltGr dead keys)"
-Language=zh
-Label=cn
-
-[keyboard-ca]
-Description="Keyboard - French (Canada)"
-Language=fr
-Label=fr
-
-[keyboard-ca-fr-dvorak]
-Description="Keyboard - French (Canada) - French (Canada, Dvorak)"
-Language=fr
-Label=fr
-
-[keyboard-ca-fr-legacy]
-Description="Keyboard - French (Canada) - French (Canada, legacy)"
-Language=fr
-Label=fr
-
-[keyboard-ca-multix]
-Description="Keyboard - French (Canada) - Canadian (CSA)"
-Language=fr
-Label=ca
-
-[keyboard-ca-ike]
-Description="Keyboard - French (Canada) - Inuktitut"
-Language=iu
-Label=ike
-
-[keyboard-ca-eng]
-Description="Keyboard - French (Canada) - English (Canada)"
-Language=en
-Label=en
-
-[keyboard-ca-kut]
-Description="Keyboard - French (Canada) - Kutenai"
-Language=fr
-Label=kut
-
-[keyboard-ca-shs]
-Description="Keyboard - French (Canada) - Secwepemctsin"
-Language=fr
-Label=shs
-
-[keyboard-ca-sun_type6]
-Description="Keyboard - French (Canada) - Multilingual (Canada, Sun Type 6/7)"
-Language=fr
-Label=ca
-
-[keyboard-gh]
-Description="Keyboard - English (Ghana)"
-Language=en
-Label=en
-
-[keyboard-gh-generic]
-Description="Keyboard - English (Ghana) - English (Ghana, multilingual)"
-Language=en
-Label=gh
-
-[keyboard-gh-akan]
-Description="Keyboard - English (Ghana) - Akan"
-Language=ak
-Label=ak
-
-[keyboard-gh-ewe]
-Description="Keyboard - English (Ghana) - Ewe"
-Language=ee
-Label=ee
-
-[keyboard-gh-fula]
-Description="Keyboard - English (Ghana) - Fula"
-Language=ff
-Label=ff
-
-[keyboard-gh-ga]
-Description="Keyboard - English (Ghana) - Ga"
-Language=gaa
-Label=gaa
-
-[keyboard-gh-hausa]
-Description="Keyboard - English (Ghana) - Hausa (Ghana)"
-Language=ha
-Label=ha
-
-[keyboard-gh-avn]
-Description="Keyboard - English (Ghana) - Avatime"
-Language=avn
-Label=avn
-
-[keyboard-gh-gillbt]
-Description="Keyboard - English (Ghana) - English (Ghana, GILLBT)"
-Language=en
-Label=gh
-
-[keyboard-fr]
-Description="Keyboard - French"
-Language=fr
-Label=fr
-
-[keyboard-fr-nodeadkeys]
-Description="Keyboard - French - French (no dead keys)"
-Language=fr
-Label=fr
-
-[keyboard-fr-oss]
-Description="Keyboard - French - French (alt.)"
-Language=fr
-Label=fr
-
-[keyboard-fr-oss_latin9]
-Description="Keyboard - French - French (alt., Latin-9 only)"
-Language=fr
-Label=fr
-
-[keyboard-fr-oss_nodeadkeys]
-Description="Keyboard - French - French (alt., no dead keys)"
-Language=fr
-Label=fr
-
-[keyboard-fr-latin9]
-Description="Keyboard - French - French (legacy, alt.)"
-Language=fr
-Label=fr
-
-[keyboard-fr-latin9_nodeadkeys]
-Description="Keyboard - French - French (legacy, alt., no dead keys)"
-Language=fr
-Label=fr
-
-[keyboard-fr-bepo]
-Description="Keyboard - French - French (BEPO)"
-Language=fr
-Label=fr
-
-[keyboard-fr-bepo_latin9]
-Description="Keyboard - French - French (BEPO, Latin-9 only)"
-Language=fr
-Label=fr
-
-[keyboard-fr-bepo_afnor]
-Description="Keyboard - French - French (BEPO, AFNOR)"
-Language=fr
-Label=fr
-
-[keyboard-fr-dvorak]
-Description="Keyboard - French - French (Dvorak)"
-Language=fr
-Label=fr
-
-[keyboard-fr-mac]
-Description="Keyboard - French - French (Macintosh)"
-Language=fr
-Label=fr
-
-[keyboard-fr-azerty]
-Description="Keyboard - French - French (AZERTY)"
-Language=fr
-Label=fr
-
-[keyboard-fr-afnor]
-Description="Keyboard - French - French (AZERTY, AFNOR)"
-Language=fr
-Label=fr
-
-[keyboard-fr-bre]
-Description="Keyboard - French - Breton (France)"
-Language=br
-Label=fr
-
-[keyboard-fr-oci]
-Description="Keyboard - French - Occitan"
-Language=oc
-Label=fr
-
-[keyboard-fr-geo]
-Description="Keyboard - French - Georgian (France, AZERTY Tskapo)"
-Language=ka
-Label=fr
-
-[keyboard-fr-us]
-Description="Keyboard - French - French (US)"
-Language=fr
-Label=fr
-
-[keyboard-fr-sun_type6]
-Description="Keyboard - French - French (Sun Type 6/7)"
-Language=fr
-Label=fr
-
-[keyboard-fr-us-alt]
-Description="Keyboard - French - French (US with dead keys, alt.)"
-Language=fr
-Label=fr
-
-[keyboard-fr-us-azerty]
-Description="Keyboard - French - French (US, AZERTY)"
-Language=fr
-Label=fr
-
-[keyboard-gn]
-Description="Keyboard - N'Ko (AZERTY)"
-Language=nqo
-Label=nqo
-
-[keyboard-uz]
-Description="Keyboard - Uzbek"
-Language=uz
-Label=uz
-
-[keyboard-uz-latin]
-Description="Keyboard - Uzbek - Uzbek (Latin)"
-Language=uz
-Label=uz
-
-[keyboard-fi]
-Description="Keyboard - Finnish"
-Language=fi
-Label=fi
-
-[keyboard-fi-winkeys]
-Description="Keyboard - Finnish - Finnish (Windows)"
-Language=fi
-Label=fi
-
-[keyboard-fi-classic]
-Description="Keyboard - Finnish - Finnish (classic)"
-Language=fi
-Label=fi
-
-[keyboard-fi-nodeadkeys]
-Description="Keyboard - Finnish - Finnish (classic, no dead keys)"
-Language=fi
-Label=fi
-
-[keyboard-fi-smi]
-Description="Keyboard - Finnish - Northern Saami (Finland)"
-Language=se
-Label=fi
-
-[keyboard-fi-mac]
-Description="Keyboard - Finnish - Finnish (Macintosh)"
-Language=fi
-Label=fi
-
-[keyboard-fi-sun_type6]
-Description="Keyboard - Finnish - Finnish (Sun Type 6/7)"
-Language=fi
-Label=fi
-
-[keyboard-fi-das]
-Description="Keyboard - Finnish - Finnish (DAS)"
-Language=fi
-Label=fi
-
-[keyboard-fi-fidvorak]
-Description="Keyboard - Finnish - Finnish (Dvorak)"
-Language=fi
-Label=fi
+[keyboard-lk]
+Description="Keyboard - Sinhala (phonetic)"
+Language=si
+Label=si
+
+[keyboard-lk-tam_unicode]
+Description="Keyboard - Sinhala (phonetic) - Tamil (Sri Lanka, Unicode)"
+Language=ta
+Label=ta
+
+[keyboard-lk-tam_TAB]
+Description="Keyboard - Sinhala (phonetic) - Tamil (Sri Lanka, TAB Typewriter)"
+Language=ta
+Label=lk
+
+[keyboard-lk-us]
+Description="Keyboard - Sinhala (phonetic) - Sinhala (US keyboard with Sinhala letters)"
+Language=si
+Label=us
+
+[keyboard-mao]
+Description="Keyboard - Maori"
+Language=mi
+Label=mi
+
+[keyboard-lv]
+Description="Keyboard - Latvian"
+Language=lv
+Label=lv
+
+[keyboard-lv-apostrophe]
+Description="Keyboard - Latvian - Latvian (apostrophe variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-tilde]
+Description="Keyboard - Latvian - Latvian (tilde variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-fkey]
+Description="Keyboard - Latvian - Latvian (F variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-modern]
+Description="Keyboard - Latvian - Latvian (modern)"
+Language=lv
+Label=lv
+
+[keyboard-lv-ergonomic]
+Description="Keyboard - Latvian - MV)"
+Language=lv
+Label=lv
+
+[keyboard-lv-adapted]
+Description="Keyboard - Latvian - Latvian (adapted)"
+Language=lv
+Label=lv
+
+[keyboard-lv-dvorak]
+Description="Keyboard - Latvian - Latvian (US Dvorak)"
+Language=lv
+Label=lv
+
+[keyboard-lv-ykeydvorak]
+Description="Keyboard - Latvian - Latvian (US Dvorak, Y variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-minuskeydvorak]
+Description="Keyboard - Latvian - Latvian (US Dvorak, minus variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-dvorakprogr]
+Description="Keyboard - Latvian - Latvian (programmer US Dvorak)"
+Language=lv
+Label=lv
+
+[keyboard-lv-ykeydvorakprogr]
+Description="Keyboard - Latvian - Latvian (programmer US Dvorak, Y variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-minuskeydvorakprogr]
+Description="Keyboard - Latvian - Latvian (programmer US Dvorak, minus variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-colemak]
+Description="Keyboard - Latvian - Latvian (US Colemak)"
+Language=lv
+Label=lv
+
+[keyboard-lv-apostrophecolemak]
+Description="Keyboard - Latvian - Latvian (US Colemak, apostrophe variant)"
+Language=lv
+Label=lv
+
+[keyboard-lv-sun_type6]
+Description="Keyboard - Latvian - Latvian (Sun Type 6/7)"
+Language=lv
+Label=lv
 
 [keyboard-lt]
 Description="Keyboard - Lithuanian"
@@ -2734,7 +1019,7 @@ Language=lt
 Label=lt
 
 [keyboard-lt-us]
-Description="Keyboard - Lithuanian - Lithuanian (US)"
+Description="Keyboard - Lithuanian - Lithuanian (US keyboard with Lithuanian letters)"
 Language=lt
 Label=lt
 
@@ -2753,18 +1038,8 @@ Description="Keyboard - Lithuanian - Lithuanian (LEKPa)"
 Language=lt
 Label=lt
 
-[keyboard-lt-sgs]
-Description="Keyboard - Lithuanian - Samogitian"
-Language=sgs
-Label=lt
-
-[keyboard-lt-ratise]
-Description="Keyboard - Lithuanian - Lithuanian (Ratise)"
-Language=lt
-Label=lt
-
 [keyboard-lt-us_dvorak]
-Description="Keyboard - Lithuanian - Lithuanian (Dvorak)"
+Description="Keyboard - Lithuanian - Lithuanian (US Dvorak with Lithuanian letters)"
 Language=lt
 Label=lt
 
@@ -2773,580 +1048,55 @@ Description="Keyboard - Lithuanian - Lithuanian (Sun Type 6/7)"
 Language=lt
 Label=lt
 
-[keyboard-my]
-Description="Keyboard - Malay (Jawi, Arabic Keyboard)"
-Language=id
-Label=ms
+[keyboard-np]
+Description="Keyboard - Nepali"
+Language=ne
+Label=ne
 
-[keyboard-my-phonetic]
-Description="Keyboard - Malay (Jawi, Arabic Keyboard) - Malay (Jawi, phonetic)"
-Language=id
-Label=my
+[keyboard-la]
+Description="Keyboard - Lao"
+Language=lo
+Label=lo
 
-[keyboard-pt]
-Description="Keyboard - Portuguese"
-Language=pt
-Label=pt
+[keyboard-la-stea]
+Description="Keyboard - Lao - Lao (STEA proposed standard layout)"
+Language=lo
+Label=la
 
-[keyboard-pt-nodeadkeys]
-Description="Keyboard - Portuguese - Portuguese (no dead keys)"
-Language=pt
-Label=pt
-
-[keyboard-pt-mac]
-Description="Keyboard - Portuguese - Portuguese (Macintosh)"
-Language=pt
-Label=pt
-
-[keyboard-pt-mac_nodeadkeys]
-Description="Keyboard - Portuguese - Portuguese (Macintosh, no dead keys)"
-Language=pt
-Label=pt
-
-[keyboard-pt-nativo]
-Description="Keyboard - Portuguese - Portuguese (Nativo)"
-Language=pt
-Label=pt
-
-[keyboard-pt-nativo-us]
-Description="Keyboard - Portuguese - Portuguese (Nativo for US keyboards)"
-Language=pt
-Label=pt
-
-[keyboard-pt-nativo-epo]
-Description="Keyboard - Portuguese - Esperanto (Portugal, Nativo)"
-Language=eo
-Label=pt
-
-[keyboard-pt-sun_type6]
-Description="Keyboard - Portuguese - Portuguese (Sun Type 6/7)"
-Language=pt
-Label=pt
-
-[keyboard-pt-colemak]
-Description="Keyboard - Portuguese - Portuguese (Colemak)"
-Language=pt
-Label=pt
-
-[keyboard-id]
-Description="Keyboard - Indonesian (Latin)"
-Language=id
-Label=id
-
-[keyboard-id-javanese]
-Description="Keyboard - Indonesian (Latin) - Javanese"
-Language=jax
-Label=id
-
-[keyboard-id-melayu-phonetic]
-Description="Keyboard - Indonesian (Latin) - Indonesian (Arab Melayu, phonetic)"
-Language=id
-Label=id
-
-[keyboard-id-melayu-phoneticx]
-Description="Keyboard - Indonesian (Latin) - Indonesian (Arab Melayu, extended phonetic)"
-Language=id
-Label=id
-
-[keyboard-id-pegon-phonetic]
-Description="Keyboard - Indonesian (Latin) - Indonesian (Arab Pegon, phonetic)"
-Language=id
-Label=id
-
-[keyboard-de]
-Description="Keyboard - German"
-Language=de
-Label=de
-
-[keyboard-de-deadacute]
-Description="Keyboard - German - German (dead acute)"
-Language=de
-Label=de
-
-[keyboard-de-deadgraveacute]
-Description="Keyboard - German - German (dead grave acute)"
-Language=de
-Label=de
-
-[keyboard-de-nodeadkeys]
-Description="Keyboard - German - German (no dead keys)"
-Language=de
-Label=de
-
-[keyboard-de-e1]
-Description="Keyboard - German - German (E1)"
-Language=de
-Label=de
-
-[keyboard-de-e2]
-Description="Keyboard - German - German (E2)"
-Language=de
-Label=de
-
-[keyboard-de-T3]
-Description="Keyboard - German - German (T3)"
-Language=de
-Label=de
-
-[keyboard-de-us]
-Description="Keyboard - German - German (US)"
-Language=de
-Label=de
-
-[keyboard-de-ro]
-Description="Keyboard - German - Romanian (Germany)"
+[keyboard-md]
+Description="Keyboard - Moldavian"
 Language=ro
-Label=de
-
-[keyboard-de-ro_nodeadkeys]
-Description="Keyboard - German - Romanian (Germany, no dead keys)"
-Language=ro
-Label=de
-
-[keyboard-de-dvorak]
-Description="Keyboard - German - German (Dvorak)"
-Language=de
-Label=de
-
-[keyboard-de-neo]
-Description="Keyboard - German - German (Neo 2)"
-Language=de
-Label=de
-
-[keyboard-de-mac]
-Description="Keyboard - German - German (Macintosh)"
-Language=de
-Label=de
-
-[keyboard-de-mac_nodeadkeys]
-Description="Keyboard - German - German (Macintosh, no dead keys)"
-Language=de
-Label=de
-
-[keyboard-de-dsb]
-Description="Keyboard - German - Lower Sorbian"
-Language=dsb
-Label=de
-
-[keyboard-de-dsb_qwertz]
-Description="Keyboard - German - Lower Sorbian (QWERTZ)"
-Language=dsb
-Label=de
-
-[keyboard-de-qwerty]
-Description="Keyboard - German - German (QWERTY)"
-Language=de
-Label=de
-
-[keyboard-de-tr]
-Description="Keyboard - German - Turkish (Germany)"
-Language=tr
-Label=de
-
-[keyboard-de-ru]
-Description="Keyboard - German - Russian (Germany, phonetic)"
-Language=ru
-Label=ru
-
-[keyboard-de-deadtilde]
-Description="Keyboard - German - German (dead tilde)"
-Language=de
-Label=de
-
-[keyboard-de-hu]
-Description="Keyboard - German - German (with Hungarian letters, no dead keys)"
-Language=de
-Label=de
-
-[keyboard-de-pl]
-Description="Keyboard - German - Polish (Germany, no dead keys)"
-Language=de
-Label=de
-
-[keyboard-de-sun_type6]
-Description="Keyboard - German - German (Sun Type 6/7)"
-Language=de
-Label=de
-
-[keyboard-de-adnw]
-Description="Keyboard - German - German (Aus der Neo-Welt)"
-Language=de
-Label=de
-
-[keyboard-de-koy]
-Description="Keyboard - German - German (KOY)"
-Language=de
-Label=de
-
-[keyboard-de-bone]
-Description="Keyboard - German - German (Bone)"
-Language=de
-Label=de
-
-[keyboard-de-bone_eszett_home]
-Description="Keyboard - German - German (Bone, eszett in the home row)"
-Language=de
-Label=de
-
-[keyboard-de-neo_qwertz]
-Description="Keyboard - German - German (Neo, QWERTZ)"
-Language=de
-Label=de
-
-[keyboard-de-neo_qwerty]
-Description="Keyboard - German - German (Neo, QWERTY)"
-Language=de
-Label=de
-
-[keyboard-de-ru-recom]
-Description="Keyboard - German - Russian (Germany, recommended)"
-Language=ru
-Label=ru
-
-[keyboard-de-ru-translit]
-Description="Keyboard - German - Russian (Germany, transliteration)"
-Language=ru
-Label=ru
-
-[keyboard-de-lld]
-Description="Keyboard - German - German (Ladin)"
-Language=de
-Label=de_lld
-
-[keyboard-gr]
-Description="Keyboard - Greek"
-Language=el
-Label=gr
-
-[keyboard-gr-simple]
-Description="Keyboard - Greek - Greek (simple)"
-Language=el
-Label=gr
-
-[keyboard-gr-extended]
-Description="Keyboard - Greek - Greek (extended)"
-Language=el
-Label=gr
-
-[keyboard-gr-nodeadkeys]
-Description="Keyboard - Greek - Greek (no dead keys)"
-Language=el
-Label=gr
-
-[keyboard-gr-polytonic]
-Description="Keyboard - Greek - Greek (polytonic)"
-Language=el
-Label=gr
-
-[keyboard-gr-sun_type6]
-Description="Keyboard - Greek - Greek (Sun Type 6/7)"
-Language=el
-Label=gr
-
-[keyboard-gr-colemak]
-Description="Keyboard - Greek - Greek (Colemak)"
-Language=el
-Label=gr
-
-[keyboard-tg]
-Description="Keyboard - French (Togo)"
-Language=fr
-Label=fr-tg
-
-[keyboard-mao]
-Description="Keyboard - Maori"
-Language=mi
-Label=mi
-
-[keyboard-sn]
-Description="Keyboard - Wolof"
-Language=wo
-Label=wo
-
-[keyboard-kh]
-Description="Keyboard - Khmer (Cambodia)"
-Language=km
-Label=km
-
-[keyboard-az]
-Description="Keyboard - Azerbaijani"
-Language=az
-Label=az
-
-[keyboard-az-cyrillic]
-Description="Keyboard - Azerbaijani - Azerbaijani (Cyrillic)"
-Language=az
-Label=az
-
-[keyboard-hu]
-Description="Keyboard - Hungarian"
-Language=hu
-Label=hu
-
-[keyboard-hu-standard]
-Description="Keyboard - Hungarian - Hungarian (standard)"
-Language=hu
-Label=hu
-
-[keyboard-hu-nodeadkeys]
-Description="Keyboard - Hungarian - Hungarian (no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-qwerty]
-Description="Keyboard - Hungarian - Hungarian (QWERTY)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwertz_comma_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 101-key, comma, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwertz_comma_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 101-key, comma, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwertz_dot_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 101-key, dot, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwertz_dot_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 101-key, dot, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwerty_comma_dead]
-Description="Keyboard - Hungarian - )"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwerty_comma_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 101-key, comma, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwerty_dot_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 101-key, dot, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-101_qwerty_dot_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 101-key, dot, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwertz_comma_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 102-key, comma, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwertz_comma_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 102-key, comma, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwertz_dot_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 102-key, dot, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwertz_dot_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTZ, 102-key, dot, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwerty_comma_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 102-key, comma, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwerty_comma_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 102-key, comma, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwerty_dot_dead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 102-key, dot, dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-102_qwerty_dot_nodead]
-Description="Keyboard - Hungarian - Hungarian (QWERTY, 102-key, dot, no dead keys)"
-Language=hu
-Label=hu
-
-[keyboard-hu-oldhun]
-Description="Keyboard - Hungarian - Old Hungarian"
-Language=hu
-Label=oldhun
-
-[keyboard-hu-oldhunlig]
-Description="Keyboard - Hungarian - Old Hungarian (for ligatures)"
-Language=hu
-Label=oldhun(lig)
-
-[keyboard-tr]
-Description="Keyboard - Turkish"
-Language=tr
-Label=tr
-
-[keyboard-tr-f]
-Description="Keyboard - Turkish - Turkish (F)"
-Language=tr
-Label=tr
-
-[keyboard-tr-e]
-Description="Keyboard - Turkish - Turkish (E)"
-Language=tr
-Label=tr
-
-[keyboard-tr-alt]
-Description="Keyboard - Turkish - Turkish (Alt-Q)"
-Language=tr
-Label=tr
-
-[keyboard-tr-ku]
-Description="Keyboard - Turkish - Kurdish (Turkey, Latin Q)"
-Language=ku
-Label=ku
-
-[keyboard-tr-ku_f]
-Description="Keyboard - Turkish - Kurdish (Turkey, F)"
-Language=ku
-Label=ku
-
-[keyboard-tr-ku_alt]
-Description="Keyboard - Turkish - Kurdish (Turkey, Latin Alt-Q)"
-Language=ku
-Label=ku
-
-[keyboard-tr-intl]
-Description="Keyboard - Turkish - Turkish (intl., with dead keys)"
-Language=tr
-Label=tr
-
-[keyboard-tr-ot]
-Description="Keyboard - Turkish - Ottoman (Q)"
-Language=tr
-Label=tr
-
-[keyboard-tr-otf]
-Description="Keyboard - Turkish - Ottoman (F)"
-Language=tr
-Label=tr
-
-[keyboard-tr-otk]
-Description="Keyboard - Turkish - Old Turkic"
-Language=tr
-Label=tr
-
-[keyboard-tr-otkf]
-Description="Keyboard - Turkish - Old Turkic (F)"
-Language=tr
-Label=tr
-
-[keyboard-tr-sun_type6]
-Description="Keyboard - Turkish - Turkish (Sun Type 6/7)"
-Language=tr
-Label=tr
-
-[keyboard-tr-us]
-Description="Keyboard - Turkish - Turkish (Turkey, Latin Q, Swap i and ı)"
-Language=tr
-Label=tr
-
-[keyboard-il]
-Description="Keyboard - Hebrew"
-Language=he
-Label=he
-
-[keyboard-il-lyx]
-Description="Keyboard - Hebrew - Hebrew (lyx)"
-Language=he
-Label=il
-
-[keyboard-il-phonetic]
-Description="Keyboard - Hebrew - Hebrew (phonetic)"
-Language=he
-Label=il
-
-[keyboard-il-biblical]
-Description="Keyboard - Hebrew - Hebrew (Biblical, Tiro)"
-Language=he
-Label=il
-
-[keyboard-il-biblicalSIL]
-Description="Keyboard - Hebrew - Hebrew (Biblical, SIL phonetic)"
-Language=he
-Label=il
-
-[keyboard-it]
-Description="Keyboard - Italian"
-Language=it
-Label=it
-
-[keyboard-it-nodeadkeys]
-Description="Keyboard - Italian - Italian (no dead keys)"
-Language=it
-Label=it
-
-[keyboard-it-winkeys]
-Description="Keyboard - Italian - Italian (Windows)"
-Language=it
-Label=it
-
-[keyboard-it-mac]
-Description="Keyboard - Italian - Italian (Macintosh)"
-Language=it
-Label=it
-
-[keyboard-it-us]
-Description="Keyboard - Italian - Italian (US)"
-Language=it
-Label=it
-
-[keyboard-it-geo]
-Description="Keyboard - Italian - Georgian (Italy)"
-Language=ka
-Label=it
-
-[keyboard-it-ibm]
-Description="Keyboard - Italian - Italian (IBM 142)"
-Language=it
-Label=it
-
-[keyboard-it-intl]
-Description="Keyboard - Italian - Italian (intl., with dead keys)"
-Language=it
-Label=it
-
-[keyboard-it-scn]
-Description="Keyboard - Italian - Sicilian"
-Language=it
-Label=it
-
-[keyboard-it-fur]
-Description="Keyboard - Italian - Friulian (Italy)"
-Language=fur
-Label=it
-
-[keyboard-it-sun_type6]
-Description="Keyboard - Italian - Italian (Sun Type 6/7)"
-Language=it
-Label=it
-
-[keyboard-it-lld]
-Description="Keyboard - Italian - Italian (Ladin)"
-Language=it
-Label=it_lld
-
-[keyboard-it-dvorak]
-Description="Keyboard - Italian - Italian (Dvorak)"
-Language=it
-Label=it
+Label=md
+
+[keyboard-md-gag]
+Description="Keyboard - Moldavian - Moldavian (Gagauz)"
+Language=gag
+Label=gag
+
+[keyboard-kg]
+Description="Keyboard - Kyrgyz"
+Language=ky
+Label=ki
+
+[keyboard-kg-phonetic]
+Description="Keyboard - Kyrgyz - Kyrgyz (phonetic)"
+Language=ky
+Label=kg
+
+[keyboard-kr]
+Description="Keyboard - Korean"
+Language=ko
+Label=ko
+
+[keyboard-kr-kr104]
+Description="Keyboard - Korean - Korean (101/104 key compatible)"
+Language=ko
+Label=kr
+
+[keyboard-kr-sun_type6]
+Description="Keyboard - Korean - Korean (Sun Type 6/7)"
+Language=ko
+Label=kr
 
 [keyboard-jp]
 Description="Keyboard - Japanese"
@@ -3384,64 +1134,539 @@ Language=ja
 Label=jp
 
 [keyboard-jp-sun_type7]
-Description="Keyboard - Japanese - Japanese (Sun Type 7, PC-compatible)"
+Description="Keyboard - Japanese - Japanese (Sun Type 7 - pc compatible)"
 Language=ja
 Label=jp
 
 [keyboard-jp-sun_type7_suncompat]
-Description="Keyboard - Japanese - Japanese (Sun Type 7, Sun-compatible)"
+Description="Keyboard - Japanese - Japanese (Sun Type 7 - sun compatible)"
 Language=ja
 Label=jp
 
-[keyboard-latam]
-Description="Keyboard - Spanish (Latin American)"
-Language=es
-Label=es
+[keyboard-us]
+Description="Keyboard - English (US)"
+Language=en
+Label=en
 
-[keyboard-latam-nodeadkeys]
-Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, no dead keys)"
-Language=es
-Label=latam
+[keyboard-us-chr]
+Description="Keyboard - English (US) - Cherokee"
+Language=chr
+Label=chr
 
-[keyboard-latam-deadtilde]
-Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, dead tilde)"
-Language=es
-Label=latam
+[keyboard-us-euro]
+Description="Keyboard - English (US) - English (US, with euro on 5)"
+Language=en
+Label=us
 
-[keyboard-latam-dvorak]
-Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, Dvorak)"
-Language=es
-Label=latam
+[keyboard-us-intl]
+Description="Keyboard - English (US) - English (US, international with dead keys)"
+Language=en
+Label=us
 
-[keyboard-latam-colemak]
-Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, Colemak)"
-Language=es
-Label=latam
+[keyboard-us-alt-intl]
+Description="Keyboard - English (US) - English (US, alternative international)"
+Language=en
+Label=us
 
-[keyboard-mt]
-Description="Keyboard - Maltese"
-Language=mt
-Label=mt
+[keyboard-us-colemak]
+Description="Keyboard - English (US) - English (Colemak)"
+Language=en
+Label=us
 
-[keyboard-mt-us]
-Description="Keyboard - Maltese - Maltese (US)"
-Language=mt
-Label=mt
+[keyboard-us-dvorak]
+Description="Keyboard - English (US) - English (Dvorak)"
+Language=en
+Label=us
 
-[keyboard-mt-alt-us]
-Description="Keyboard - Maltese - Maltese (US, with AltGr overrides)"
-Language=mt
-Label=mt
+[keyboard-us-dvorak-intl]
+Description="Keyboard - English (US) - English (Dvorak, international with dead keys)"
+Language=en
+Label=us
 
-[keyboard-mt-alt-gb]
-Description="Keyboard - Maltese - Maltese (UK, with AltGr overrides)"
-Language=mt
-Label=mt
+[keyboard-us-dvorak-alt-intl]
+Description="Keyboard - English (US) - English (Dvorak alternative international no dead keys)"
+Language=en
+Label=us
 
-[keyboard-custom]
-Description="Keyboard - A user-defined custom Layout"
+[keyboard-us-dvorak-l]
+Description="Keyboard - English (US) - English (left handed Dvorak)"
+Language=en
+Label=us
+
+[keyboard-us-dvorak-r]
+Description="Keyboard - English (US) - English (right handed Dvorak)"
+Language=en
+Label=us
+
+[keyboard-us-dvorak-classic]
+Description="Keyboard - English (US) - English (classic Dvorak)"
+Language=en
+Label=us
+
+[keyboard-us-dvp]
+Description="Keyboard - English (US) - English (Programmer Dvorak)"
+Language=en
+Label=us
+
+[keyboard-us-rus]
+Description="Keyboard - English (US) - Russian (US, phonetic)"
+Language=ru
+Label=ru
+
+[keyboard-us-mac]
+Description="Keyboard - English (US) - English (Macintosh)"
+Language=en
+Label=us
+
+[keyboard-us-altgr-intl]
+Description="Keyboard - English (US) - English (international AltGr dead keys)"
+Language=en
+Label=us
+
+[keyboard-us-olpc2]
+Description="Keyboard - English (US) - English (the divide/multiply keys toggle the layout)"
+Language=en
+Label=us
+
+[keyboard-us-hbs]
+Description="Keyboard - English (US) - Serbo-Croatian (US)"
+Language=en
+Label=us
+
+[keyboard-us-workman]
+Description="Keyboard - English (US) - English (Workman)"
+Language=en
+Label=us
+
+[keyboard-us-workman-intl]
+Description="Keyboard - English (US) - English (Workman, international with dead keys)"
+Language=en
+Label=us
+
+[keyboard-us-intl-unicode]
+Description="Keyboard - English (US) - English (US, international AltGr Unicode combining)"
+Language=en
+Label=us
+
+[keyboard-us-alt-intl-unicode]
+Description="Keyboard - English (US) - English (US, international AltGr Unicode combining, alternative)"
+Language=en
+Label=us
+
+[keyboard-us-ats]
+Description="Keyboard - English (US) - Atsina"
+Language=en
+Label=us
+
+[keyboard-us-crd]
+Description="Keyboard - English (US) - Coeur d'Alene Salish"
+Language=crd
+Label=us
+
+[keyboard-us-cz_sk_de]
+Description="Keyboard - English (US) - Czech Slovak and German (US)"
+Language=en
+Label=us
+
+[keyboard-us-ibm238l]
+Description="Keyboard - English (US) - English (US, IBM Arabic 238_L)"
+Language=en
+Label=us
+
+[keyboard-us-sun_type6]
+Description="Keyboard - English (US) - English (US, Sun Type 6/7)"
+Language=en
+Label=us
+
+[keyboard-us-norman]
+Description="Keyboard - English (US) - English (Norman)"
+Language=en
+Label=us
+
+[keyboard-us-carpalx]
+Description="Keyboard - English (US) - English (Carpalx)"
+Language=en
+Label=us
+
+[keyboard-us-carpalx-intl]
+Description="Keyboard - English (US) - English (Carpalx, international with dead keys)"
+Language=en
+Label=us
+
+[keyboard-us-carpalx-altgr-intl]
+Description="Keyboard - English (US) - English (Carpalx, international AltGr dead keys)"
+Language=en
+Label=us
+
+[keyboard-us-carpalx-full]
+Description="Keyboard - English (US) - English (Carpalx, full optimization)"
+Language=en
+Label=us
+
+[keyboard-us-carpalx-full-intl]
+Description="Keyboard - English (US) - English (Carpalx, full optimization, international with dead keys)"
+Language=en
+Label=us
+
+[keyboard-us-carpalx-full-altgr-intl]
+Description="Keyboard - English (US) - English (Carpalx, full optimization, international AltGr dead keys)"
+Language=en
+Label=us
+
+[keyboard-il]
+Description="Keyboard - Hebrew"
+Language=he
+Label=he
+
+[keyboard-il-lyx]
+Description="Keyboard - Hebrew - Hebrew (lyx)"
+Language=he
+Label=il
+
+[keyboard-il-phonetic]
+Description="Keyboard - Hebrew - Hebrew (phonetic)"
+Language=he
+Label=il
+
+[keyboard-il-biblical]
+Description="Keyboard - Hebrew - Hebrew (Biblical, Tiro)"
+Language=he
+Label=il
+
+[keyboard-il-biblicalSIL]
+Description="Keyboard - Hebrew - Hebrew (Biblical, SIL phonetic)"
+Language=he
+Label=il
+
+[keyboard-is]
+Description="Keyboard - Icelandic"
+Language=is
+Label=is
+
+[keyboard-is-Sundeadkeys]
+Description="Keyboard - Icelandic - Icelandic (Sun dead keys)"
+Language=is
+Label=is
+
+[keyboard-is-nodeadkeys]
+Description="Keyboard - Icelandic - Icelandic (eliminate dead keys)"
+Language=is
+Label=is
+
+[keyboard-is-mac_legacy]
+Description="Keyboard - Icelandic - Icelandic (Macintosh, legacy)"
+Language=is
+Label=is
+
+[keyboard-is-mac]
+Description="Keyboard - Icelandic - Icelandic (Macintosh)"
+Language=is
+Label=is
+
+[keyboard-is-dvorak]
+Description="Keyboard - Icelandic - Icelandic (Dvorak)"
+Language=is
+Label=is
+
+[keyboard-mv]
+Description="Keyboard - Dhivehi"
+Language=dv
+Label=dv
+
+[keyboard-cz]
+Description="Keyboard - Czech"
+Language=cs
+Label=cs
+
+[keyboard-cz-bksl]
+Description="Keyboard - Czech - key)"
+Language=cs
+Label=cz
+
+[keyboard-cz-qwerty]
+Description="Keyboard - Czech - Czech (qwerty)"
+Language=cs
+Label=cz
+
+[keyboard-cz-qwerty_bksl]
+Description="Keyboard - Czech - Czech (qwerty, extended Backslash)"
+Language=cs
+Label=cz
+
+[keyboard-cz-ucw]
+Description="Keyboard - Czech - Czech (UCW layout, accented letters only)"
+Language=cs
+Label=cz
+
+[keyboard-cz-dvorak-ucw]
+Description="Keyboard - Czech - Czech (US Dvorak with CZ UCW support)"
+Language=cs
+Label=cz
+
+[keyboard-cz-rus]
+Description="Keyboard - Czech - Russian (Czech, phonetic)"
+Language=ru
+Label=ru
+
+[keyboard-cz-sun_type6]
+Description="Keyboard - Czech - Czech (Sun Type 6/7)"
+Language=cs
+Label=cz
+
+[keyboard-bt]
+Description="Keyboard - Dzongkha"
+Language=dz
+Label=dz
+
+[keyboard-de]
+Description="Keyboard - German"
+Language=de
+Label=de
+
+[keyboard-de-deadacute]
+Description="Keyboard - German - German (dead acute)"
+Language=de
+Label=de
+
+[keyboard-de-deadgraveacute]
+Description="Keyboard - German - German (dead grave acute)"
+Language=de
+Label=de
+
+[keyboard-de-nodeadkeys]
+Description="Keyboard - German - German (eliminate dead keys)"
+Language=de
+Label=de
+
+[keyboard-de-T3]
+Description="Keyboard - German - German (T3)"
+Language=de
+Label=de
+
+[keyboard-de-ro]
+Description="Keyboard - German - Romanian (Germany)"
+Language=ro
+Label=de
+
+[keyboard-de-ro_nodeadkeys]
+Description="Keyboard - German - Romanian (Germany, eliminate dead keys)"
+Language=ro
+Label=de
+
+[keyboard-de-dvorak]
+Description="Keyboard - German - German (Dvorak)"
+Language=de
+Label=de
+
+[keyboard-de-sundeadkeys]
+Description="Keyboard - German - German (Sun dead keys)"
+Language=de
+Label=de
+
+[keyboard-de-neo]
+Description="Keyboard - German - German (Neo 2)"
+Language=de
+Label=de
+
+[keyboard-de-mac]
+Description="Keyboard - German - German (Macintosh)"
+Language=de
+Label=de
+
+[keyboard-de-mac_nodeadkeys]
+Description="Keyboard - German - German (Macintosh, eliminate dead keys)"
+Language=de
+Label=de
+
+[keyboard-de-dsb]
+Description="Keyboard - German - Lower Sorbian"
+Language=dsb
+Label=de
+
+[keyboard-de-dsb_qwertz]
+Description="Keyboard - German - Lower Sorbian (qwertz)"
+Language=dsb
+Label=de
+
+[keyboard-de-qwerty]
+Description="Keyboard - German - German (qwerty)"
+Language=de
+Label=de
+
+[keyboard-de-tr]
+Description="Keyboard - German - Turkish (Germany)"
 Language=
-Label=custom
+Label=de
+
+[keyboard-de-ru]
+Description="Keyboard - German - Russian (Germany, phonetic)"
+Language=ru
+Label=ru
+
+[keyboard-de-deadtilde]
+Description="Keyboard - German - German (dead tilde)"
+Language=de
+Label=de
+
+[keyboard-de-us]
+Description="Keyboard - German - German (US keyboard with German letters)"
+Language=en
+Label=de
+
+[keyboard-de-hu]
+Description="Keyboard - German - German (with Hungarian letters and no dead keys)"
+Language=de
+Label=de
+
+[keyboard-de-pl]
+Description="Keyboard - German - Polish (Germany, eliminate dead keys)"
+Language=de
+Label=de
+
+[keyboard-de-sun_type6]
+Description="Keyboard - German - German (Sun Type 6/7)"
+Language=de
+Label=de
+
+[keyboard-de-adnw]
+Description="Keyboard - German - German (Aus der Neo-Welt)"
+Language=de
+Label=de
+
+[keyboard-de-koy]
+Description="Keyboard - German - German (KOY)"
+Language=de
+Label=de
+
+[keyboard-de-bone]
+Description="Keyboard - German - German (Bone)"
+Language=de
+Label=de
+
+[keyboard-de-bone_eszett_home]
+Description="Keyboard - German - German (Bone, eszett home row)"
+Language=de
+Label=de
+
+[keyboard-de-neo_qwertz]
+Description="Keyboard - German - German (Neo qwertz)"
+Language=de
+Label=de
+
+[keyboard-de-neo_qwerty]
+Description="Keyboard - German - German (Neo qwerty)"
+Language=de
+Label=de
+
+[keyboard-hu]
+Description="Keyboard - Hungarian"
+Language=hu
+Label=hu
+
+[keyboard-hu-standard]
+Description="Keyboard - Hungarian - Hungarian (standard)"
+Language=hu
+Label=hu
+
+[keyboard-hu-nodeadkeys]
+Description="Keyboard - Hungarian - Hungarian (eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-qwerty]
+Description="Keyboard - Hungarian - Hungarian (qwerty)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwertz_comma_dead]
+Description="Keyboard - Hungarian - Hungarian (101/qwertz/comma/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwertz_comma_nodead]
+Description="Keyboard - Hungarian - Hungarian (101/qwertz/comma/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwertz_dot_dead]
+Description="Keyboard - Hungarian - Hungarian (101/qwertz/dot/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwertz_dot_nodead]
+Description="Keyboard - Hungarian - Hungarian (101/qwertz/dot/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwerty_comma_dead]
+Description="Keyboard - Hungarian - Hungarian (101/qwerty/comma/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwerty_comma_nodead]
+Description="Keyboard - Hungarian - Hungarian (101/qwerty/comma/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwerty_dot_dead]
+Description="Keyboard - Hungarian - Hungarian (101/qwerty/dot/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-101_qwerty_dot_nodead]
+Description="Keyboard - Hungarian - Hungarian (101/qwerty/dot/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwertz_comma_dead]
+Description="Keyboard - Hungarian - Hungarian (102/qwertz/comma/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwertz_comma_nodead]
+Description="Keyboard - Hungarian - Hungarian (102/qwertz/comma/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwertz_dot_dead]
+Description="Keyboard - Hungarian - Hungarian (102/qwertz/dot/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwertz_dot_nodead]
+Description="Keyboard - Hungarian - Hungarian (102/qwertz/dot/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwerty_comma_dead]
+Description="Keyboard - Hungarian - Hungarian (102/qwerty/comma/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwerty_comma_nodead]
+Description="Keyboard - Hungarian - Hungarian (102/qwerty/comma/eliminate dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwerty_dot_dead]
+Description="Keyboard - Hungarian - Hungarian (102/qwerty/dot/dead keys)"
+Language=hu
+Label=hu
+
+[keyboard-hu-102_qwerty_dot_nodead]
+Description="Keyboard - Hungarian - s)"
+Language=hu
+Label=hu
+
+[keyboard-epo]
+Description="Keyboard - Esperanto"
+Language=eo
+Label=eo
+
+[keyboard-epo-legacy]
+Description="Keyboard - Esperanto - Esperanto (displaced semicolon and quote, obsolete)"
+Language=eo
+Label=epo
 
 [keyboard-no]
 Description="Keyboard - Norwegian"
@@ -3449,12 +1674,12 @@ Language=no
 Label=no
 
 [keyboard-no-nodeadkeys]
-Description="Keyboard - Norwegian - Norwegian (no dead keys)"
+Description="Keyboard - Norwegian - Norwegian (eliminate dead keys)"
 Language=no
 Label=no
 
 [keyboard-no-winkeys]
-Description="Keyboard - Norwegian - Norwegian (Windows)"
+Description="Keyboard - Norwegian - Norwegian (Winkeys)"
 Language=no
 Label=no
 
@@ -3469,7 +1694,7 @@ Language=se
 Label=no
 
 [keyboard-no-smi_nodeadkeys]
-Description="Keyboard - Norwegian - Northern Saami (Norway, no dead keys)"
+Description="Keyboard - Norwegian - Northern Saami (Norway, eliminate dead keys)"
 Language=se
 Label=no
 
@@ -3479,7 +1704,7 @@ Language=no
 Label=no
 
 [keyboard-no-mac_nodeadkeys]
-Description="Keyboard - Norwegian - Norwegian (Macintosh, no dead keys)"
+Description="Keyboard - Norwegian - Norwegian (Macintosh, eliminate dead keys)"
 Language=no
 Label=no
 
@@ -3493,118 +1718,1363 @@ Description="Keyboard - Norwegian - Norwegian (Sun Type 6/7)"
 Language=no
 Label=no
 
-[keyboard-pl]
-Description="Keyboard - Polish"
-Language=pl
-Label=pl
+[keyboard-af]
+Description="Keyboard - Afghani"
+Language=
+Label=fa
 
-[keyboard-pl-legacy]
-Description="Keyboard - Polish - Polish (legacy)"
-Language=pl
-Label=pl
+[keyboard-af-ps]
+Description="Keyboard - Afghani - Pashto"
+Language=ps
+Label=ps
 
-[keyboard-pl-qwertz]
-Description="Keyboard - Polish - Polish (QWERTZ)"
-Language=pl
-Label=pl
+[keyboard-af-uz]
+Description="Keyboard - Afghani - Uzbek (Afghanistan)"
+Language=uz
+Label=uz
 
-[keyboard-pl-dvorak]
-Description="Keyboard - Polish - Polish (Dvorak)"
-Language=pl
-Label=pl
+[keyboard-af-olpc-ps]
+Description="Keyboard - Afghani - Pashto (Afghanistan, OLPC)"
+Language=ps
+Label=ps
 
-[keyboard-pl-dvorak_quotes]
-Description="Keyboard - Polish - Polish (Dvorak, with Polish quotes on quotemark key)"
-Language=pl
-Label=pl
+[keyboard-af-fa-olpc]
+Description="Keyboard - Afghani - Persian (Afghanistan, Dari OLPC)"
+Language=
+Label=fa
 
-[keyboard-pl-dvorak_altquotes]
-Description="Keyboard - Polish - Polish (Dvorak, with Polish quotes on key 1)"
-Language=pl
-Label=pl
+[keyboard-af-uz-olpc]
+Description="Keyboard - Afghani - Uzbek (Afghanistan, OLPC)"
+Language=uz
+Label=uz
 
-[keyboard-pl-csb]
-Description="Keyboard - Polish - Kashubian"
-Language=csb
-Label=pl
+[keyboard-gr]
+Description="Keyboard - Greek"
+Language=el
+Label=gr
 
-[keyboard-pl-szl]
-Description="Keyboard - Polish - Silesian"
-Language=szl
-Label=pl
+[keyboard-gr-simple]
+Description="Keyboard - Greek - Greek (simple)"
+Language=el
+Label=gr
 
-[keyboard-pl-ru_phonetic_dvorak]
-Description="Keyboard - Polish - Russian (Poland, phonetic Dvorak)"
+[keyboard-gr-extended]
+Description="Keyboard - Greek - Greek (extended)"
+Language=el
+Label=gr
+
+[keyboard-gr-nodeadkeys]
+Description="Keyboard - Greek - Greek (eliminate dead keys)"
+Language=el
+Label=gr
+
+[keyboard-gr-polytonic]
+Description="Keyboard - Greek - Greek (polytonic)"
+Language=el
+Label=gr
+
+[keyboard-gr-sun_type6]
+Description="Keyboard - Greek - Greek (Sun Type 6/7)"
+Language=el
+Label=gr
+
+[keyboard-ge]
+Description="Keyboard - Georgian"
+Language=ka
+Label=ka
+
+[keyboard-ge-ergonomic]
+Description="Keyboard - Georgian - Georgian (ergonomic)"
+Language=ka
+Label=ge
+
+[keyboard-ge-mess]
+Description="Keyboard - Georgian - Georgian (MESS)"
+Language=ka
+Label=ge
+
+[keyboard-ge-ru]
+Description="Keyboard - Georgian - Russian (Georgia)"
 Language=ru
 Label=ru
 
-[keyboard-pl-dvp]
-Description="Keyboard - Polish - Polish (programmer Dvorak)"
-Language=pl
-Label=pl
+[keyboard-ge-os]
+Description="Keyboard - Georgian - Ossetian (Georgia)"
+Language=os
+Label=ge
 
-[keyboard-pl-intl]
-Description="Keyboard - Polish - Polish (intl., with dead keys)"
-Language=pl
-Label=pl
+[keyboard-cn]
+Description="Keyboard - Chinese"
+Language=zh
+Label=zh
 
-[keyboard-pl-colemak]
-Description="Keyboard - Polish - Polish (Colemak)"
-Language=pl
-Label=pl
+[keyboard-cn-tib]
+Description="Keyboard - Chinese - Tibetan"
+Language=bo
+Label=cn
 
-[keyboard-pl-colemak_dh_ansi]
-Description="Keyboard - Polish - Polish (Colemak-DH)"
-Language=pl
-Label=pl
+[keyboard-cn-tib_asciinum]
+Description="Keyboard - Chinese - Tibetan (with ASCII numerals)"
+Language=bo
+Label=cn
 
-[keyboard-pl-colemak_dh]
-Description="Keyboard - Polish - Polish (Colemak-DH ISO)"
-Language=pl
-Label=pl
+[keyboard-cn-ug]
+Description="Keyboard - Chinese - Uyghur"
+Language=ug
+Label=ug
 
-[keyboard-pl-sun_type6]
-Description="Keyboard - Polish - Polish (Sun Type 6/7)"
-Language=pl
-Label=pl
+[keyboard-iq]
+Description="Keyboard - Iraqi"
+Language=ar
+Label=ar
 
-[keyboard-pl-glagolica]
-Description="Keyboard - Polish - Polish (Glagolica)"
-Language=pl
-Label=pl
+[keyboard-iq-ku]
+Description="Keyboard - Iraqi - Kurdish (Iraq, Latin Q)"
+Language=ku
+Label=ku
 
-[keyboard-pl-lefty]
-Description="Keyboard - Polish - Polish (lefty)"
-Language=pl
-Label=pl
+[keyboard-iq-ku_f]
+Description="Keyboard - Iraqi - Kurdish (Iraq, F)"
+Language=ku
+Label=ku
 
-[keyboard-ro]
-Description="Keyboard - Romanian"
-Language=ro
-Label=ro
+[keyboard-iq-ku_alt]
+Description="Keyboard - Iraqi - Kurdish (Iraq, Latin Alt-Q)"
+Language=ku
+Label=ku
 
-[keyboard-ro-std]
-Description="Keyboard - Romanian - Romanian (standard)"
-Language=ro
-Label=ro
+[keyboard-iq-ku_ara]
+Description="Keyboard - Iraqi - Kurdish (Iraq, Arabic-Latin)"
+Language=ku
+Label=ku
 
-[keyboard-ro-winkeys]
-Description="Keyboard - Romanian - Romanian (Windows)"
-Language=ro
-Label=ro
+[keyboard-gn]
+Description="Keyboard - French (Guinea)"
+Language=fr
+Label=fr
 
-[keyboard-ro-crh_dobruja]
-Description="Keyboard - Romanian - Crimean Tatar (Dobruja Q)"
-Language=crh
-Label=crh
+[keyboard-ma]
+Description="Keyboard - Arabic (Morocco)"
+Language=
+Label=ar
 
-[keyboard-ro-ergonomic]
-Description="Keyboard - Romanian - Romanian (ergonomic Touchtype)"
-Language=ro
-Label=ro
+[keyboard-ma-french]
+Description="Keyboard - Arabic (Morocco) - French (Morocco)"
+Language=fr
+Label=fr
 
-[keyboard-ro-sun_type6]
-Description="Keyboard - Romanian - Romanian (Sun Type 6/7)"
-Language=ro
-Label=ro
+[keyboard-ma-tifinagh]
+Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh)"
+Language=
+Label=ber
+
+[keyboard-ma-tifinagh-alt]
+Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh alternative)"
+Language=
+Label=ber
+
+[keyboard-ma-tifinagh-alt-phonetic]
+Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh alternative phonetic)"
+Language=
+Label=ber
+
+[keyboard-ma-tifinagh-extended]
+Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh extended)"
+Language=
+Label=ber
+
+[keyboard-ma-tifinagh-phonetic]
+Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh phonetic)"
+Language=
+Label=ber
+
+[keyboard-ma-tifinagh-extended-phonetic]
+Description="Keyboard - Arabic (Morocco) - Berber (Morocco, Tifinagh extended phonetic)"
+Language=
+Label=ber
+
+[keyboard-it]
+Description="Keyboard - Italian"
+Language=it
+Label=it
+
+[keyboard-it-nodeadkeys]
+Description="Keyboard - Italian - Italian (eliminate dead keys)"
+Language=it
+Label=it
+
+[keyboard-it-winkeys]
+Description="Keyboard - Italian - Italian (Winkeys)"
+Language=it
+Label=it
+
+[keyboard-it-mac]
+Description="Keyboard - Italian - Italian (Macintosh)"
+Language=it
+Label=it
+
+[keyboard-it-us]
+Description="Keyboard - Italian - Italian (US keyboard with Italian letters)"
+Language=it
+Label=it
+
+[keyboard-it-geo]
+Description="Keyboard - Italian - Georgian (Italy)"
+Language=ka
+Label=it
+
+[keyboard-it-ibm]
+Description="Keyboard - Italian - Italian (IBM 142)"
+Language=it
+Label=it
+
+[keyboard-it-sun_type6]
+Description="Keyboard - Italian - Italian (Sun Type 6/7)"
+Language=it
+Label=it
+
+[keyboard-latam]
+Description="Keyboard - Spanish (Latin American)"
+Language=es
+Label=es
+
+[keyboard-latam-nodeadkeys]
+Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, eliminate dead keys)"
+Language=es
+Label=latam
+
+[keyboard-latam-deadtilde]
+Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, include dead tilde)"
+Language=es
+Label=latam
+
+[keyboard-latam-sundeadkeys]
+Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, Sun dead keys)"
+Language=es
+Label=latam
+
+[keyboard-latam-dvorak]
+Description="Keyboard - Spanish (Latin American) - Spanish (Latin American, Dvorak)"
+Language=es
+Label=latam
+
+[keyboard-et]
+Description="Keyboard - Amharic"
+Language=am
+Label=am
+
+[keyboard-gb]
+Description="Keyboard - English (UK)"
+Language=en
+Label=en
+
+[keyboard-gb-extd]
+Description="Keyboard - English (UK) - English (UK, extended WinKeys)"
+Language=en
+Label=gb
+
+[keyboard-gb-intl]
+Description="Keyboard - English (UK) - English (UK, international with dead keys)"
+Language=en
+Label=gb
+
+[keyboard-gb-dvorak]
+Description="Keyboard - English (UK) - English (UK, Dvorak)"
+Language=en
+Label=gb
+
+[keyboard-gb-dvorakukp]
+Description="Keyboard - English (UK) - English (UK, Dvorak with UK punctuation)"
+Language=en
+Label=gb
+
+[keyboard-gb-mac]
+Description="Keyboard - English (UK) - English (UK, Macintosh)"
+Language=en
+Label=gb
+
+[keyboard-gb-mac_intl]
+Description="Keyboard - English (UK) - English (UK, Macintosh international)"
+Language=en
+Label=gb
+
+[keyboard-gb-colemak]
+Description="Keyboard - English (UK) - English (UK, Colemak)"
+Language=en
+Label=gb
+
+[keyboard-gb-sun_type6]
+Description="Keyboard - English (UK) - English (UK, Sun Type 6/7)"
+Language=en
+Label=gb
+
+[keyboard-si]
+Description="Keyboard - Slovenian"
+Language=sl
+Label=sl
+
+[keyboard-si-alternatequotes]
+Description="Keyboard - Slovenian - Slovenian (with guillemets for quotes)"
+Language=sl
+Label=si
+
+[keyboard-si-us]
+Description="Keyboard - Slovenian - Slovenian (US keyboard with Slovenian letters)"
+Language=sl
+Label=si
+
+[keyboard-fo]
+Description="Keyboard - Faroese"
+Language=fo
+Label=fo
+
+[keyboard-fo-nodeadkeys]
+Description="Keyboard - Faroese - Faroese (eliminate dead keys)"
+Language=fo
+Label=fo
+
+[keyboard-by]
+Description="Keyboard - Belarusian"
+Language=be
+Label=by
+
+[keyboard-by-legacy]
+Description="Keyboard - Belarusian - Belarusian (legacy)"
+Language=be
+Label=by
+
+[keyboard-by-latin]
+Description="Keyboard - Belarusian - Belarusian (Latin)"
+Language=be
+Label=by
+
+[keyboard-ke]
+Description="Keyboard - Swahili (Kenya)"
+Language=sw
+Label=sw
+
+[keyboard-ke-kik]
+Description="Keyboard - Swahili (Kenya) - Kikuyu"
+Language=ki
+Label=ki
+
+[keyboard-ee]
+Description="Keyboard - Estonian"
+Language=et
+Label=et
+
+[keyboard-ee-nodeadkeys]
+Description="Keyboard - Estonian - Estonian (eliminate dead keys)"
+Language=et
+Label=ee
+
+[keyboard-ee-dvorak]
+Description="Keyboard - Estonian - Estonian (Dvorak)"
+Language=et
+Label=ee
+
+[keyboard-ee-us]
+Description="Keyboard - Estonian - Estonian (US keyboard with Estonian letters)"
+Language=et
+Label=ee
+
+[keyboard-ee-sun_type6]
+Description="Keyboard - Estonian - Estonian (Sun Type 6/7)"
+Language=et
+Label=ee
+
+[keyboard-gh]
+Description="Keyboard - English (Ghana)"
+Language=en
+Label=en
+
+[keyboard-gh-generic]
+Description="Keyboard - English (Ghana) - English (Ghana, multilingual)"
+Language=en
+Label=gh
+
+[keyboard-gh-akan]
+Description="Keyboard - English (Ghana) - Akan"
+Language=ak
+Label=ak
+
+[keyboard-gh-ewe]
+Description="Keyboard - English (Ghana) - Ewe"
+Language=ee
+Label=ee
+
+[keyboard-gh-fula]
+Description="Keyboard - English (Ghana) - Fula"
+Language=ff
+Label=ff
+
+[keyboard-gh-ga]
+Description="Keyboard - English (Ghana) - Ga"
+Language=gaa
+Label=gaa
+
+[keyboard-gh-hausa]
+Description="Keyboard - English (Ghana) - Hausa"
+Language=ha
+Label=ha
+
+[keyboard-gh-avn]
+Description="Keyboard - English (Ghana) - Avatime"
+Language=avn
+Label=avn
+
+[keyboard-gh-gillbt]
+Description="Keyboard - English (Ghana) - English (Ghana, GILLBT)"
+Language=en
+Label=gh
+
+[keyboard-au]
+Description="Keyboard - English (Australian)"
+Language=en
+Label=en
+
+[keyboard-in]
+Description="Keyboard - Indian"
+Language=
+Label=in
+
+[keyboard-in-urd-phonetic]
+Description="Keyboard - Indian - Urdu (phonetic)"
+Language=ur
+Label=ur
+
+[keyboard-in-urd-phonetic3]
+Description="Keyboard - Indian - Urdu (alternative phonetic)"
+Language=ur
+Label=ur
+
+[keyboard-in-urd-winkeys]
+Description="Keyboard - Indian - Urdu (WinKeys)"
+Language=ur
+Label=ur
+
+[keyboard-in-eng]
+Description="Keyboard - Indian - English (India, with rupee sign)"
+Language=en
+Label=en
+
+[keyboard-in-ben]
+Description="Keyboard - Indian - Bangla (India)"
+Language=bn
+Label=bn
+
+[keyboard-in-ben_probhat]
+Description="Keyboard - Indian - Bangla (India, Probhat)"
+Language=bn
+Label=bn
+
+[keyboard-in-ben_baishakhi]
+Description="Keyboard - Indian - Bangla (India, Baishakhi)"
+Language=bn
+Label=in
+
+[keyboard-in-ben_bornona]
+Description="Keyboard - Indian - Bangla (India, Bornona)"
+Language=bn
+Label=in
+
+[keyboard-in-ben_gitanjali]
+Description="Keyboard - Indian - Bangla (India, Uni Gitanjali)"
+Language=bn
+Label=in
+
+[keyboard-in-ben_inscript]
+Description="Keyboard - Indian - Bangla (India, Baishakhi Inscript)"
+Language=bn
+Label=in
+
+[keyboard-in-eeyek]
+Description="Keyboard - Indian - Manipuri (Eeyek)"
+Language=mni
+Label=in
+
+[keyboard-in-guj]
+Description="Keyboard - Indian - Gujarati"
+Language=gu
+Label=gu
+
+[keyboard-in-guru]
+Description="Keyboard - Indian - Punjabi (Gurmukhi)"
+Language=pa
+Label=pa
+
+[keyboard-in-jhelum]
+Description="Keyboard - Indian - Punjabi (Gurmukhi Jhelum)"
+Language=pa
+Label=pa
+
+[keyboard-in-kan]
+Description="Keyboard - Indian - Kannada"
+Language=kn
+Label=kn
+
+[keyboard-in-kan-kagapa]
+Description="Keyboard - Indian - Kannada (KaGaPa phonetic)"
+Language=kn
+Label=kn
+
+[keyboard-in-mal]
+Description="Keyboard - Indian - Malayalam"
+Language=ml
+Label=ml
+
+[keyboard-in-mal_lalitha]
+Description="Keyboard - Indian - Malayalam (Lalitha)"
+Language=ml
+Label=ml
+
+[keyboard-in-mal_enhanced]
+Description="Keyboard - Indian - Malayalam (enhanced Inscript, with rupee sign)"
+Language=ml
+Label=ml
+
+[keyboard-in-ori]
+Description="Keyboard - Indian - Oriya"
+Language=or
+Label=or
+
+[keyboard-in-olck]
+Description="Keyboard - Indian - Ol Chiki"
+Language=sat
+Label=sat
+
+[keyboard-in-tam_unicode]
+Description="Keyboard - Indian - Tamil (Unicode)"
+Language=ta
+Label=ta
+
+[keyboard-in-tam_keyboard_with_numerals]
+Description="Keyboard - Indian - Tamil (keyboard with numerals)"
+Language=ta
+Label=ta
+
+[keyboard-in-tam_TAB]
+Description="Keyboard - Indian - Tamil (TAB typewriter)"
+Language=ta
+Label=ta
+
+[keyboard-in-tam_TSCII]
+Description="Keyboard - Indian - Tamil (TSCII typewriter)"
+Language=ta
+Label=ta
+
+[keyboard-in-tam]
+Description="Keyboard - Indian - Tamil"
+Language=ta
+Label=ta
+
+[keyboard-in-tel]
+Description="Keyboard - Indian - Telugu"
+Language=te
+Label=te
+
+[keyboard-in-tel-kagapa]
+Description="Keyboard - Indian - Telugu (KaGaPa phonetic)"
+Language=te
+Label=te
+
+[keyboard-in-bolnagri]
+Description="Keyboard - Indian - Hindi (Bolnagri)"
+Language=hi
+Label=hi
+
+[keyboard-in-hin-wx]
+Description="Keyboard - Indian - Hindi (Wx)"
+Language=hi
+Label=hi
+
+[keyboard-in-hin-kagapa]
+Description="Keyboard - Indian - Hindi (KaGaPa phonetic)"
+Language=hi
+Label=hi
+
+[keyboard-in-san-kagapa]
+Description="Keyboard - Indian - Sanskrit (KaGaPa phonetic)"
+Language=sa
+Label=sa
+
+[keyboard-in-mar-kagapa]
+Description="Keyboard - Indian - Marathi (KaGaPa phonetic)"
+Language=mr
+Label=mr
+
+[keyboard-dk]
+Description="Keyboard - Danish"
+Language=da
+Label=da
+
+[keyboard-dk-nodeadkeys]
+Description="Keyboard - Danish - Danish (eliminate dead keys)"
+Language=da
+Label=dk
+
+[keyboard-dk-winkeys]
+Description="Keyboard - Danish - Danish (Winkeys)"
+Language=da
+Label=dk
+
+[keyboard-dk-mac]
+Description="Keyboard - Danish - Danish (Macintosh)"
+Language=da
+Label=dk
+
+[keyboard-dk-mac_nodeadkeys]
+Description="Keyboard - Danish - Danish (Macintosh, eliminate dead keys)"
+Language=da
+Label=dk
+
+[keyboard-dk-dvorak]
+Description="Keyboard - Danish - Danish (Dvorak)"
+Language=da
+Label=dk
+
+[keyboard-dk-sun_type6]
+Description="Keyboard - Danish - Danish (Sun Type 6/7)"
+Language=da
+Label=dk
+
+[keyboard-ng]
+Description="Keyboard - English (Nigeria)"
+Language=en
+Label=en
+
+[keyboard-ng-igbo]
+Description="Keyboard - English (Nigeria) - Igbo"
+Language=ig
+Label=ig
+
+[keyboard-ng-yoruba]
+Description="Keyboard - English (Nigeria) - Yoruba"
+Language=yo
+Label=yo
+
+[keyboard-ng-hausa]
+Description="Keyboard - English (Nigeria) - Hausa"
+Language=ha
+Label=ha
+
+[keyboard-ir]
+Description="Keyboard - Persian"
+Language=fa
+Label=fa
+
+[keyboard-ir-pes_keypad]
+Description="Keyboard - Persian - Persian (with Persian keypad)"
+Language=fa
+Label=ir
+
+[keyboard-ir-ku]
+Description="Keyboard - Persian - Kurdish (Iran, Latin Q)"
+Language=ku
+Label=ku
+
+[keyboard-ir-ku_f]
+Description="Keyboard - Persian - Kurdish (Iran, F)"
+Language=ku
+Label=ku
+
+[keyboard-ir-ku_alt]
+Description="Keyboard - Persian - Kurdish (Iran, Latin Alt-Q)"
+Language=ku
+Label=ku
+
+[keyboard-ir-ku_ara]
+Description="Keyboard - Persian - Kurdish (Iran, Arabic-Latin)"
+Language=ku
+Label=ku
+
+[keyboard-ir-ave]
+Description="Keyboard - Persian - Avestan"
+Language=ae
+Label=ir
+
+[keyboard-fr]
+Description="Keyboard - French"
+Language=fr
+Label=fr
+
+[keyboard-fr-nodeadkeys]
+Description="Keyboard - French - French (eliminate dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-fr-sundeadkeys]
+Description="Keyboard - French - French (Sun dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-fr-oss]
+Description="Keyboard - French - French (alternative)"
+Language=fr
+Label=fr
+
+[keyboard-fr-oss_latin9]
+Description="Keyboard - French - French (alternative, Latin-9 only)"
+Language=fr
+Label=fr
+
+[keyboard-fr-oss_nodeadkeys]
+Description="Keyboard - French - French (alternative, eliminate dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-fr-oss_sundeadkeys]
+Description="Keyboard - French - French (alternative, Sun dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-fr-latin9]
+Description="Keyboard - French - French (legacy, alternative)"
+Language=fr
+Label=fr
+
+[keyboard-fr-latin9_nodeadkeys]
+Description="Keyboard - French - French (legacy, alternative, eliminate dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-fr-latin9_sundeadkeys]
+Description="Keyboard - French - French (legacy, alternative, Sun dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-fr-bepo]
+Description="Keyboard - French - French (Bepo, ergonomic, Dvorak way)"
+Language=fr
+Label=fr
+
+[keyboard-fr-bepo_latin9]
+Description="Keyboard - French - French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
+Language=fr
+Label=fr
+
+[keyboard-fr-dvorak]
+Description="Keyboard - French - French (Dvorak)"
+Language=fr
+Label=fr
+
+[keyboard-fr-mac]
+Description="Keyboard - French - French (Macintosh)"
+Language=fr
+Label=fr
+
+[keyboard-fr-azerty]
+Description="Keyboard - French - French (Azerty)"
+Language=fr
+Label=fr
+
+[keyboard-fr-bre]
+Description="Keyboard - French - French (Breton)"
+Language=fr
+Label=fr
+
+[keyboard-fr-oci]
+Description="Keyboard - French - Occitan"
+Language=oc
+Label=fr
+
+[keyboard-fr-geo]
+Description="Keyboard - French - Georgian (France, AZERTY Tskapo)"
+Language=ka
+Label=fr
+
+[keyboard-fr-sun_type6]
+Description="Keyboard - French - French (Sun Type 6/7)"
+Language=fr
+Label=fr
+
+[keyboard-nl]
+Description="Keyboard - Dutch"
+Language=nl
+Label=nl
+
+[keyboard-nl-sundeadkeys]
+Description="Keyboard - Dutch - Dutch (Sun dead keys)"
+Language=nl
+Label=nl
+
+[keyboard-nl-mac]
+Description="Keyboard - Dutch - Dutch (Macintosh)"
+Language=nl
+Label=nl
+
+[keyboard-nl-std]
+Description="Keyboard - Dutch - Dutch (standard)"
+Language=nl
+Label=nl
+
+[keyboard-nl-sun_type6]
+Description="Keyboard - Dutch - Dutch (Sun Type 6/7)"
+Language=nl
+Label=nl
+
+[keyboard-mm]
+Description="Keyboard - Burmese"
+Language=my
+Label=my
+
+[keyboard-cm]
+Description="Keyboard - English (Cameroon)"
+Language=en
+Label=cm
+
+[keyboard-cm-french]
+Description="Keyboard - English (Cameroon) - French (Cameroon)"
+Language=fr
+Label=cm
+
+[keyboard-cm-qwerty]
+Description="Keyboard - English (Cameroon) - Cameroon Multilingual (qwerty)"
+Language=en
+Label=cm
+
+[keyboard-cm-azerty]
+Description="Keyboard - English (Cameroon) - Cameroon Multilingual (azerty)"
+Language=fr
+Label=cm
+
+[keyboard-cm-dvorak]
+Description="Keyboard - English (Cameroon) - Cameroon Multilingual (Dvorak)"
+Language=en
+Label=cm
+
+[keyboard-cm-mmuock]
+Description="Keyboard - English (Cameroon) - Mmuock"
+Language=en
+Label=cm
+
+[keyboard-id]
+Description="Keyboard - Indonesian (Jawi)"
+Language=id
+Label=id
+
+[keyboard-dz]
+Description="Keyboard - Berber (Algeria, Latin characters)"
+Language=
+Label=la
+
+[keyboard-dz-ber]
+Description="Keyboard - Berber (Algeria, Latin characters) - Berber (Algeria, Tifinagh characters)"
+Language=
+Label=ber
+
+[keyboard-dz-ar]
+Description="Keyboard - Berber (Algeria, Latin characters) - Arabic (Algeria)"
+Language=ar
+Label=ar
+
+[keyboard-br]
+Description="Keyboard - Portuguese (Brazil)"
+Language=pt
+Label=pt
+
+[keyboard-br-nodeadkeys]
+Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, eliminate dead keys)"
+Language=pt
+Label=br
+
+[keyboard-br-dvorak]
+Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Dvorak)"
+Language=pt
+Label=br
+
+[keyboard-br-nativo]
+Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Nativo)"
+Language=pt
+Label=br
+
+[keyboard-br-nativo-us]
+Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Nativo for US keyboards)"
+Language=pt
+Label=br
+
+[keyboard-br-nativo-epo]
+Description="Keyboard - Portuguese (Brazil) - Esperanto (Brazil, Nativo)"
+Language=eo
+Label=br
+
+[keyboard-br-thinkpad]
+Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, IBM/Lenovo ThinkPad)"
+Language=pt
+Label=br
+
+[keyboard-br-sun_type6]
+Description="Keyboard - Portuguese (Brazil) - Portuguese (Brazil, Sun Type 6/7)"
+Language=pt
+Label=br
+
+[keyboard-pk]
+Description="Keyboard - Urdu (Pakistan)"
+Language=ur
+Label=ur
+
+[keyboard-pk-urd-crulp]
+Description="Keyboard - Urdu (Pakistan) - Urdu (Pakistan, CRULP)"
+Language=ur
+Label=pk
+
+[keyboard-pk-urd-nla]
+Description="Keyboard - Urdu (Pakistan) - Urdu (Pakistan, NLA)"
+Language=ur
+Label=pk
+
+[keyboard-pk-ara]
+Description="Keyboard - Urdu (Pakistan) - Arabic (Pakistan)"
+Language=ar
+Label=ar
+
+[keyboard-pk-snd]
+Description="Keyboard - Urdu (Pakistan) - Sindhi"
+Language=sd
+Label=sd
+
+[keyboard-ba]
+Description="Keyboard - Bosnian"
+Language=bs
+Label=bs
+
+[keyboard-ba-alternatequotes]
+Description="Keyboard - Bosnian - Bosnian (with guillemets for quotes)"
+Language=bs
+Label=ba
+
+[keyboard-ba-unicode]
+Description="Keyboard - Bosnian - Bosnian (with Bosnian digraphs)"
+Language=bs
+Label=ba
+
+[keyboard-ba-unicodeus]
+Description="Keyboard - Bosnian - Bosnian (US keyboard with Bosnian digraphs)"
+Language=bs
+Label=ba
+
+[keyboard-ba-us]
+Description="Keyboard - Bosnian - Bosnian (US keyboard with Bosnian letters)"
+Language=bs
+Label=ba
+
+[keyboard-eu]
+Description="Keyboard - EurKEY (US based layout with european letters)"
+Language=ca
+Label=eu
+
+[keyboard-ie]
+Description="Keyboard - Irish"
+Language=en
+Label=ie
+
+[keyboard-ie-CloGaelach]
+Description="Keyboard - Irish - CloGaelach"
+Language=ga
+Label=ie
+
+[keyboard-ie-UnicodeExpert]
+Description="Keyboard - Irish - Irish (UnicodeExpert)"
+Language=en
+Label=ie
+
+[keyboard-ie-ogam]
+Description="Keyboard - Irish - Ogham"
+Language=sga
+Label=ie
+
+[keyboard-ie-ogam_is434]
+Description="Keyboard - Irish - Ogham (IS434)"
+Language=sga
+Label=ie
+
+[keyboard-bg]
+Description="Keyboard - Bulgarian"
+Language=bg
+Label=bg
+
+[keyboard-bg-phonetic]
+Description="Keyboard - Bulgarian - Bulgarian (traditional phonetic)"
+Language=bg
+Label=bg
+
+[keyboard-bg-bas_phonetic]
+Description="Keyboard - Bulgarian - Bulgarian (new phonetic)"
+Language=bg
+Label=bg
+
+[keyboard-be]
+Description="Keyboard - Belgian"
+Language=de
+Label=be
+
+[keyboard-be-oss]
+Description="Keyboard - Belgian - Belgian (alternative)"
+Language=de
+Label=be
+
+[keyboard-be-oss_latin9]
+Description="Keyboard - Belgian - Belgian (alternative, Latin-9 only)"
+Language=de
+Label=be
+
+[keyboard-be-oss_sundeadkeys]
+Description="Keyboard - Belgian - Belgian (alternative, Sun dead keys)"
+Language=de
+Label=be
+
+[keyboard-be-iso-alternate]
+Description="Keyboard - Belgian - Belgian (ISO alternate)"
+Language=de
+Label=be
+
+[keyboard-be-nodeadkeys]
+Description="Keyboard - Belgian - Belgian (eliminate dead keys)"
+Language=de
+Label=be
+
+[keyboard-be-sundeadkeys]
+Description="Keyboard - Belgian - Belgian (Sun dead keys)"
+Language=de
+Label=be
+
+[keyboard-be-wang]
+Description="Keyboard - Belgian - Belgian (Wang model 724 azerty)"
+Language=de
+Label=be
+
+[keyboard-be-sun_type6]
+Description="Keyboard - Belgian - Belgian (Sun Type 6/7)"
+Language=de
+Label=be
+
+[keyboard-hr]
+Description="Keyboard - Croatian"
+Language=hr
+Label=hr
+
+[keyboard-hr-alternatequotes]
+Description="Keyboard - Croatian - Croatian (with guillemets for quotes)"
+Language=hr
+Label=hr
+
+[keyboard-hr-unicode]
+Description="Keyboard - Croatian - Croatian (with Croatian digraphs)"
+Language=hr
+Label=hr
+
+[keyboard-hr-unicodeus]
+Description="Keyboard - Croatian - Croatian (US keyboard with Croatian digraphs)"
+Language=hr
+Label=hr
+
+[keyboard-hr-us]
+Description="Keyboard - Croatian - Croatian (US keyboard with Croatian letters)"
+Language=hr
+Label=hr
+
+[keyboard-tw]
+Description="Keyboard - Taiwanese"
+Language=
+Label=zh
+
+[keyboard-tw-indigenous]
+Description="Keyboard - Taiwanese - Taiwanese (indigenous)"
+Language=tay
+Label=tw
+
+[keyboard-tw-saisiyat]
+Description="Keyboard - Taiwanese - Saisiyat (Taiwan)"
+Language=xsy
+Label=xsy
+
+[keyboard-al]
+Description="Keyboard - Albanian"
+Language=sq
+Label=sq
+
+[keyboard-al-plisi]
+Description="Keyboard - Albanian - Albanian (Plisi)"
+Language=sq
+Label=al
+
+[keyboard-tm]
+Description="Keyboard - Turkmen"
+Language=tk
+Label=tk
+
+[keyboard-tm-alt]
+Description="Keyboard - Turkmen - Turkmen (Alt-Q)"
+Language=tk
+Label=tm
+
+[keyboard-kh]
+Description="Keyboard - Khmer (Cambodia)"
+Language=km
+Label=km
+
+[keyboard-bw]
+Description="Keyboard - Tswana"
+Language=tn
+Label=tn
+
+[keyboard-sk]
+Description="Keyboard - Slovak"
+Language=sk
+Label=sk
+
+[keyboard-sk-bksl]
+Description="Keyboard - Slovak - Slovak (extended Backslash)"
+Language=sk
+Label=sk
+
+[keyboard-sk-qwerty]
+Description="Keyboard - Slovak - Slovak (qwerty)"
+Language=sk
+Label=sk
+
+[keyboard-sk-qwerty_bksl]
+Description="Keyboard - Slovak - Slovak (qwerty, extended Backslash)"
+Language=sk
+Label=sk
+
+[keyboard-sk-sun_type6]
+Description="Keyboard - Slovak - Slovak (Sun Type 6/7)"
+Language=sk
+Label=sk
+
+[keyboard-kz]
+Description="Keyboard - Kazakh"
+Language=kk
+Label=kk
+
+[keyboard-kz-ruskaz]
+Description="Keyboard - Kazakh - Russian (Kazakhstan, with Kazakh)"
+Language=ru
+Label=ru
+
+[keyboard-kz-kazrus]
+Description="Keyboard - Kazakh - Kazakh (with Russian)"
+Language=kk
+Label=kz
+
+[keyboard-kz-ext]
+Description="Keyboard - Kazakh - Kazakh (extended)"
+Language=kk
+Label=kz
+
+[keyboard-am]
+Description="Keyboard - Armenian"
+Language=hy
+Label=hy
+
+[keyboard-am-phonetic]
+Description="Keyboard - Armenian - Armenian (phonetic)"
+Language=hy
+Label=am
+
+[keyboard-am-phonetic-alt]
+Description="Keyboard - Armenian - Armenian (alternative phonetic)"
+Language=hy
+Label=am
+
+[keyboard-am-eastern]
+Description="Keyboard - Armenian - Armenian (eastern)"
+Language=hy
+Label=am
+
+[keyboard-am-western]
+Description="Keyboard - Armenian - Armenian (western)"
+Language=hy
+Label=am
+
+[keyboard-am-eastern-alt]
+Description="Keyboard - Armenian - Armenian (alternative eastern)"
+Language=hy
+Label=am
+
+[keyboard-am-olpc-phonetic]
+Description="Keyboard - Armenian - Armenian (OLPC phonetic)"
+Language=hy
+Label=am
+
+[keyboard-ara]
+Description="Keyboard - Arabic"
+Language=ar
+Label=ar
+
+[keyboard-ara-azerty]
+Description="Keyboard - Arabic - Arabic (azerty)"
+Language=ar
+Label=ara
+
+[keyboard-ara-azerty_digits]
+Description="Keyboard - Arabic - Arabic (azerty/digits)"
+Language=ar
+Label=ara
+
+[keyboard-ara-digits]
+Description="Keyboard - Arabic - Arabic (digits)"
+Language=ar
+Label=ara
+
+[keyboard-ara-qwerty]
+Description="Keyboard - Arabic - Arabic (qwerty)"
+Language=ar
+Label=ara
+
+[keyboard-ara-qwerty_digits]
+Description="Keyboard - Arabic - Arabic (qwerty/digits)"
+Language=ar
+Label=ara
+
+[keyboard-ara-buckwalter]
+Description="Keyboard - Arabic - Arabic (Buckwalter)"
+Language=ar
+Label=ara
+
+[keyboard-ara-mac]
+Description="Keyboard - Arabic - Arabic (Macintosh)"
+Language=ar
+Label=ara
+
+[keyboard-ara-sun_type6]
+Description="Keyboard - Arabic - Arabic (Sun Type 6/7)"
+Language=ar
+Label=ara
+
+[keyboard-ch]
+Description="Keyboard - German (Switzerland)"
+Language=de
+Label=de
+
+[keyboard-ch-legacy]
+Description="Keyboard - German (Switzerland) - German (Switzerland, legacy)"
+Language=de
+Label=ch
+
+[keyboard-ch-de_nodeadkeys]
+Description="Keyboard - German (Switzerland) - German (Switzerland, eliminate dead keys)"
+Language=de
+Label=de
+
+[keyboard-ch-de_sundeadkeys]
+Description="Keyboard - German (Switzerland) - German (Switzerland, Sun dead keys)"
+Language=de
+Label=de
+
+[keyboard-ch-fr]
+Description="Keyboard - German (Switzerland) - French (Switzerland)"
+Language=fr
+Label=fr
+
+[keyboard-ch-fr_nodeadkeys]
+Description="Keyboard - German (Switzerland) - French (Switzerland, eliminate dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-ch-fr_sundeadkeys]
+Description="Keyboard - German (Switzerland) - French (Switzerland, Sun dead keys)"
+Language=fr
+Label=fr
+
+[keyboard-ch-fr_mac]
+Description="Keyboard - German (Switzerland) - French (Switzerland, Macintosh)"
+Language=fr
+Label=fr
+
+[keyboard-ch-de_mac]
+Description="Keyboard - German (Switzerland) - German (Switzerland, Macintosh)"
+Language=de
+Label=de
+
+[keyboard-ch-sun_type6_de]
+Description="Keyboard - German (Switzerland) - German (Switzerland, Sun Type 6/7)"
+Language=de
+Label=ch
+
+[keyboard-ch-sun_type6_fr]
+Description="Keyboard - German (Switzerland) - French (Switzerland, Sun Type 6/7)"
+Language=de
+Label=ch
+
+[keyboard-es]
+Description="Keyboard - Spanish"
+Language=es
+Label=es
+
+[keyboard-es-nodeadkeys]
+Description="Keyboard - Spanish - Spanish (eliminate dead keys)"
+Language=es
+Label=es
+
+[keyboard-es-winkeys]
+Description="Keyboard - Spanish - Spanish (Winkeys)"
+Language=es
+Label=es
+
+[keyboard-es-deadtilde]
+Description="Keyboard - Spanish - Spanish (include dead tilde)"
+Language=es
+Label=es
+
+[keyboard-es-sundeadkeys]
+Description="Keyboard - Spanish - Spanish (Sun dead keys)"
+Language=es
+Label=es
+
+[keyboard-es-dvorak]
+Description="Keyboard - Spanish - Spanish (Dvorak)"
+Language=es
+Label=es
+
+[keyboard-es-ast]
+Description="Keyboard - Spanish - Asturian (Spain, with bottom-dot H and bottom-dot L)"
+Language=ast
+Label=es
+
+[keyboard-es-cat]
+Description="Keyboard - Spanish - Catalan (Spain, with middle-dot L)"
+Language=ca
+Label=es
+
+[keyboard-es-mac]
+Description="Keyboard - Spanish - Spanish (Macintosh)"
+Language=es
+Label=es
+
+[keyboard-es-sun_type6]
+Description="Keyboard - Spanish - Spanish (Sun Type 6/7)"
+Language=es
+Label=es
+
+[keyboard-at]
+Description="Keyboard - German (Austria)"
+Language=de
+Label=de
+
+[keyboard-at-nodeadkeys]
+Description="Keyboard - German (Austria) - German (Austria, eliminate dead keys)"
+Language=de
+Label=at
+
+[keyboard-at-sundeadkeys]
+Description="Keyboard - German (Austria) - German (Austria, Sun dead keys)"
+Language=de
+Label=at
+
+[keyboard-at-mac]
+Description="Keyboard - German (Austria) - German (Austria, Macintosh)"
+Language=de
+Label=at
+
+[keyboard-az]
+Description="Keyboard - Azerbaijani"
+Language=az
+Label=az
+
+[keyboard-az-cyrillic]
+Description="Keyboard - Azerbaijani - Azerbaijani (Cyrillic)"
+Language=az
+Label=az
 
diff --git a/fcitx5/conf/pinyin.conf b/fcitx5/conf/pinyin.conf
index 98096e2..eaa6241 100644
--- a/fcitx5/conf/pinyin.conf
+++ b/fcitx5/conf/pinyin.conf
@@ -10,8 +10,6 @@ SpellEnabled=True
 EmojiEnabled=True
 # Enable Chaizi
 ChaiziEnabled=True
-# Enable Characters in Unicode CJK Extension B
-ExtBEnabled=True
 # Enable Cloud Pinyin
 CloudPinyinEnabled=False
 # Cloud Pinyin Index
@@ -26,16 +24,10 @@ PinyinInPreedit=False
 Prediction=False
 # Prediction Size
 PredictionSize=10
-# Action when switching input method
-SwitchInputMethodBehavior="Commit current preedit"
 # Select 2nd Candidate
 SecondCandidate=
 # Select 3rd Candidate
 ThirdCandidate=
-# Use Keypad as Selection key
-UseKeypadAsSelection=False
-# Use BackSpace to cancel the selection
-BackSpaceToUnselect=True
 # Number of Sentences
 Number of sentence=2
 # Prompt long word length when input length over (0 for disable)
@@ -88,7 +80,7 @@ FirstRun=False
 [Fuzzy]
 # ue -> ve
 VE_UE=True
-# Common Typo
+# gn -> ng
 NG_GN=True
 # Inner Segment (xian -> xi'an)
 Inner=True