src/languages.h: Update language list

1 files changed, 336 insertions, 333 deletions

diff --git a/src/languages.h b/src/languages.h
index 66af1a33..d54135a6 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -24,173 +24,93 @@ typedef struct
 
 Language LANGUAGES[] =
 {
-    {"En", "us"}, //English (US)
-    {"Ck", "us+chr"}, //Cherokee
-    {"Hw", "us+haw"}, //Hawaiian
-    {"En", "us+euro"}, //English (US, euro on 5)
-    {"En", "us+intl"}, //English (US, intl., with dead keys)
-    {"En", "us+alt-intl"}, //English (US, alt. intl.)
-    {"En", "us+colemak"}, //English (Colemak)
-    {"En", "us+colemak_dh"}, //English (Colemak-DH)
-    {"En", "us+colemak_dh_wide"}, //English (Colemak-DH Wide)
-    {"En", "us+colemak_dh_ortho"}, //English (Colemak-DH Ortholinear)
-    {"En", "us+colemak_dh_iso"}, //English (Colemak-DH ISO)
-    {"En", "us+colemak_dh_wide_iso"}, //English (Colemak-DH Wide ISO)
-    {"En", "us+dvorak"}, //English (Dvorak)
-    {"En", "us+dvorak-intl"}, //English (Dvorak, intl., with dead keys)
-    {"En", "us+dvorak-alt-intl"}, //English (Dvorak, alt. intl.)
-    {"En", "us+dvorak-l"}, //English (Dvorak, left-handed)
-    {"En", "us+dvorak-r"}, //English (Dvorak, right-handed)
-    {"En", "us+dvorak-classic"}, //English (classic Dvorak)
-    {"En", "us+dvp"}, //English (programmer Dvorak)
-    {"En", "us+dvorak-mac"}, //English (Dvorak, Macintosh)
-    {"En", "us+symbolic"}, //English (US, Symbolic)
-    {"Ru", "us+rus"}, //Russian (US, phonetic)
-    {"En", "us+mac"}, //English (Macintosh)
-    {"En", "us+altgr-intl"}, //English (intl., with AltGr dead keys)
-    {"En", "us+olpc2"}, //English (the divide/multiply toggle the layout)
-    {"Hs", "us+hbs"}, //Serbo-Croatian (US)
-    {"En", "us+norman"}, //English (Norman)
-    {"En", "us+workman"}, //English (Workman)
-    {"En", "us+workman-intl"}, //English (Workman, intl., with dead keys)
-    {"Fa", "af"}, //Dari
-    {"Ps", "af+ps"}, //Pashto
-    {"Uz", "af+uz"}, //Uzbek (Afghanistan)
-    {"Ps", "af+ps-olpc"}, //Pashto (Afghanistan, OLPC)
-    {"Fa", "af+fa-olpc"}, //Dari (Afghanistan, OLPC)
-    {"Uz", "af+uz-olpc"}, //Uzbek (Afghanistan, OLPC)
-    {"Ar", "ara"}, //Arabic
-    {"Ar", "ara+azerty"}, //Arabic (AZERTY)
-    {"Ar", "ara+azerty_digits"}, //Arabic (AZERTY, Eastern Arabic numerals)
-    {"Ar", "ara+digits"}, //Arabic (Eastern Arabic numerals)
-    {"Ar", "ara+qwerty"}, //Arabic (QWERTY)
-    {"Ar", "ara+qwerty_digits"}, //Arabic (QWERTY, Eastern Arabic numerals)
-    {"Ar", "ara+buckwalter"}, //Arabic (Buckwalter)
-    {"Ar", "ara+olpc"}, //Arabic (OLPC)
-    {"Ar", "ara+mac"}, //Arabic (Macintosh)
     {"Sq", "al"}, //Albanian
     {"Sq", "al+plisi"}, //Albanian (Plisi)
     {"Sq", "al+veqilharxhi"}, //Albanian (Veqilharxhi)
+    {"Am", "et"}, //Amharic
     {"Hy", "am"}, //Armenian
     {"Hy", "am+phonetic"}, //Armenian (phonetic)
     {"Hy", "am+phonetic-alt"}, //Armenian (alt. phonetic)
     {"Hy", "am+eastern"}, //Armenian (eastern)
-    {"Hy", "am+western"}, //Armenian (western)
     {"Hy", "am+eastern-alt"}, //Armenian (alt. eastern)
-    {"De", "at"}, //German (Austria)
-    {"De", "at+nodeadkeys"}, //German (Austria, no dead keys)
-    {"De", "at+mac"}, //German (Austria, Macintosh)
-    {"En", "au"}, //English (Australia)
+    {"Hy", "am+western"}, //Armenian (western)
+    {"Ar", "ara"}, //Arabic
+    {"Ar", "ara+digits"}, //Arabic (Eastern Arabic numerals)
+    {"Ar", "ara+azerty"}, //Arabic (AZERTY)
+    {"Ar", "ara+azerty_digits"}, //Arabic (AZERTY, Eastern Arabic numerals)
+    {"Ar", "ara+buckwalter"}, //Arabic (Buckwalter)
+    {"Ar", "ara+mac"}, //Arabic (Macintosh)
+    {"Ar", "ara+mac-phonetic"}, //Arabic (Macintosh, phonetic)
+    {"Ar", "ara+olpc"}, //Arabic (OLPC)
+    {"Ar", "eg"}, //Arabic (Egypt)
+    {"Iq", "iq"}, //Arabic (Iraq)
+    {"Ku", "iq+ku"}, //Kurdish (Iraq, Latin Q)
+    {"Ku", "iq+ku_alt"}, //Kurdish (Iraq, Latin Alt-Q)
+    {"Ku", "iq+ku_f"}, //Kurdish (Iraq, F)
+    {"Ku", "iq+ku_ara"}, //Kurdish (Iraq, Arabic-Latin)
+    {"Ar", "ma"}, //Arabic (Morocco)
+    {"Bb", "ma+tifinagh"}, //Berber (Morocco, Tifinagh)
+    {"Bb", "ma+tifinagh-alt"}, //Berber (Morocco, Tifinagh alt.)
+    {"Bb", "ma+tifinagh-alt-phonetic"}, //Berber (Morocco, Tifinagh phonetic, alt.)
+    {"Bb", "ma+tifinagh-extended"}, //Berber (Morocco, Tifinagh extended)
+    {"Bb", "ma+tifinagh-phonetic"}, //Berber (Morocco, Tifinagh phonetic)
+    {"Bb", "ma+tifinagh-extended-phonetic"}, //Berber (Morocco, Tifinagh extended phonetic)
+    {"Fr", "ma+french"}, //French (Morocco)
+    {"Bb", "ma+rif"}, //Tarifit
+    {"Ar", "sy"}, //Arabic (Syria)
+    {"Ls", "sy+syc"}, //Syriac
+    {"Ls", "sy+syc_phonetic"}, //Syriac (phonetic)
+    {"Ku", "sy+ku"}, //Kurdish (Syria, Latin Q)
+    {"Ku", "sy+ku_alt"}, //Kurdish (Syria, Latin Alt-Q)
+    {"Ku", "sy+ku_f"}, //Kurdish (Syria, F)
     {"Az", "az"}, //Azerbaijani
     {"Az", "az+cyrillic"}, //Azerbaijani (Cyrillic)
+    {"Bm", "ml"}, //Bambara
+    {"Fr", "ml+fr-oss"}, //French (Mali, alt.)
+    {"En", "ml+us-mac"}, //English (Mali, US, Macintosh)
+    {"En", "ml+us-intl"}, //English (Mali, US, intl.)
+    {"Bn", "bd"}, //Bangla
+    {"Bn", "bd+probhat"}, //Bangla (Probhat)
     {"Be", "by"}, //Belarusian
     {"Be", "by+legacy"}, //Belarusian (legacy)
     {"Be", "by+latin"}, //Belarusian (Latin)
-    {"Ru", "by+ru"}, //Russian (Belarus)
     {"Be", "by+intl"}, //Belarusian (intl.)
     {"Be", "by+phonetic"}, //Belarusian (phonetic)
+    {"Ru", "by+ru"}, //Russian (Belarus)
     {"Bl", "be"}, //Belgian
     {"Bl", "be+oss"}, //Belgian (alt.)
     {"Bl", "be+oss_latin9"}, //Belgian (Latin-9 only, alt.)
     {"Bl", "be+iso-alternate"}, //Belgian (ISO, alt.)
     {"Bl", "be+nodeadkeys"}, //Belgian (no dead keys)
     {"Bl", "be+wang"}, //Belgian (Wang 724 AZERTY)
-    {"Bn", "bd"}, //Bangla
-    {"Bn", "bd+probhat"}, //Bangla (Probhat)
-    {"Il", "in"}, //Indian
-    {"Bn", "in+ben"}, //Bangla (India)
-    {"Bn", "in+ben_probhat"}, //Bangla (India, Probhat)
-    {"Bn", "in+ben_baishakhi"}, //Bangla (India, Baishakhi)
-    {"Bn", "in+ben_bornona"}, //Bangla (India, Bornona)
-    {"Bn", "in+ben_gitanjali"}, //Bangla (India, Gitanjali)
-    {"Bn", "in+ben_inscript"}, //Bangla (India, Baishakhi InScript)
-    {"Ma", "in+eeyek"}, //Manipuri (Eeyek)
-    {"Gu", "in+guj"}, //Gujarati
-    {"Gu", "in+guj-kagapa"}, //Gujarati (KaGaPa, phonetic)
-    {"Pa", "in+guru"}, //Punjabi (Gurmukhi)
-    {"Pa", "in+jhelum"}, //Punjabi (Gurmukhi Jhelum)
-    {"Kn", "in+kan"}, //Kannada
-    {"Kn", "in+kan-kagapa"}, //Kannada (KaGaPa, phonetic)
-    {"Ml", "in+mal"}, //Malayalam
-    {"Ml", "in+mal_lalitha"}, //Malayalam (Lalitha)
-    {"Ml", "in+mal_enhanced"}, //Malayalam (enhanced InScript, with rupee)
-    {"Ml", "in+mal_poorna"}, //Malayalam (Poorna, extended InScript)
-    {"Or", "in+ori"}, //Oriya
-    {"Or", "in+ori-bolnagri"}, //Oriya (Bolnagri)
-    {"Or", "in+ori-wx"}, //Oriya (Wx)
-    {"Ol", "in+olck"}, //Ol Chiki
-    {"Ta", "in+tamilnet"}, //Tamil (TamilNet '99)
-    {"Ta", "in+tamilnet_tamilnumbers"}, //Tamil (TamilNet '99 with Tamil numerals)
-    {"Ta", "in+tamilnet_TAB"}, //Tamil (TamilNet '99, TAB encoding)
-    {"Ta", "in+tamilnet_TSCII"}, //Tamil (TamilNet '99, TSCII encoding)
-    {"Ta", "in+tam"}, //Tamil (InScript, with Arabic numerals)
-    {"Ta", "in+tam_tamilnumbers"}, //Tamil (InScript, with Tamil numerals)
-    {"Te", "in+tel"}, //Telugu
-    {"Te", "in+tel-kagapa"}, //Telugu (KaGaPa, phonetic)
-    {"Te", "in+tel-sarala"}, //Telugu (Sarala)
-    {"Ur", "in+urd-phonetic"}, //Urdu (phonetic)
-    {"Ur", "in+urd-phonetic3"}, //Urdu (alt. phonetic)
-    {"Ur", "in+urd-winkeys"}, //Urdu (Windows)
-    {"Hi", "in+bolnagri"}, //Hindi (Bolnagri)
-    {"Hi", "in+hin-wx"}, //Hindi (Wx)
-    {"Hi", "in+hin-kagapa"}, //Hindi (KaGaPa, phonetic)
-    {"Sa", "in+san-kagapa"}, //Sanskrit (KaGaPa, phonetic)
-    {"Mr", "in+mar-kagapa"}, //Marathi (KaGaPa, phonetic)
-    {"En", "in+eng"}, //English (India, with rupee)
-    {"Ip", "in+iipa"}, //Indic IPA
-    {"Mr", "in+marathi"}, //Marathi (enhanced InScript)
+    {"Bb", "dz"}, //Berber (Algeria, Latin)
+    {"Bb", "dz+ber"}, //Berber (Algeria, Tifinagh)
+    {"Kb", "dz+azerty-deadkeys"}, //Kabyle (AZERTY, with dead keys)
+    {"Kb", "dz+qwerty-gb-deadkeys"}, //Kabyle (QWERTY, UK, with dead keys)
+    {"Kb", "dz+qwerty-us-deadkeys"}, //Kabyle (QWERTY, US, with dead keys)
+    {"Ar", "dz+ar"}, //Arabic (Algeria)
     {"Bs", "ba"}, //Bosnian
     {"Bs", "ba+alternatequotes"}, //Bosnian (with guillemets)
     {"Bs", "ba+unicode"}, //Bosnian (with Bosnian digraphs)
     {"Bs", "ba+unicodeus"}, //Bosnian (US, with Bosnian digraphs)
     {"Bs", "ba+us"}, //Bosnian (US)
-    {"Pt", "br"}, //Portuguese (Brazil)
-    {"Pt", "br+nodeadkeys"}, //Portuguese (Brazil, no dead keys)
-    {"Pt", "br+dvorak"}, //Portuguese (Brazil, Dvorak)
-    {"Pt", "br+nativo"}, //Portuguese (Brazil, Nativo)
-    {"Ru", "br+rus"}, //Russian (Brazil, phonetic)
-    {"Pt", "br+nativo-us"}, //Portuguese (Brazil, Nativo for US keyboards)
-    {"Eo", "br+nativo-epo"}, //Esperanto (Brazil, Nativo)
-    {"Pt", "br+thinkpad"}, //Portuguese (Brazil, IBM/Lenovo ThinkPad)
+    {"Bi", "brai"}, //Braille
+    {"Bi", "brai+left_hand"}, //Braille (left-handed)
+    {"Bi", "brai+left_hand_invert"}, //Braille (left-handed inverted thumb)
+    {"Bi", "brai+right_hand"}, //Braille (right-handed)
+    {"Bi", "brai+right_hand_invert"}, //Braille (right-handed inverted thumb)
     {"Bg", "bg"}, //Bulgarian
     {"Bg", "bg+phonetic"}, //Bulgarian (traditional phonetic)
     {"Bg", "bg+bas_phonetic"}, //Bulgarian (new phonetic)
     {"Bg", "bg+bekl"}, //Bulgarian (enhanced)
-    {"Bb", "dz"}, //Berber (Algeria, Latin)
-    {"Kb", "dz+azerty-deadkeys"}, //Kabyle (AZERTY, with dead keys)
-    {"Kb", "dz+qwerty-gb-deadkeys"}, //Kabyle (QWERTY, UK, with dead keys)
-    {"Kb", "dz+qwerty-us-deadkeys"}, //Kabyle (QWERTY, US, with dead keys)
-    {"Bb", "dz+ber"}, //Berber (Algeria, Tifinagh)
-    {"Ar", "dz+ar"}, //Arabic (Algeria)
-    {"Ar", "ma"}, //Arabic (Morocco)
-    {"Fr", "ma+french"}, //French (Morocco)
-    {"Bb", "ma+tifinagh"}, //Berber (Morocco, Tifinagh)
-    {"Bb", "ma+tifinagh-alt"}, //Berber (Morocco, Tifinagh alt.)
-    {"Bb", "ma+tifinagh-alt-phonetic"}, //Berber (Morocco, Tifinagh phonetic, alt.)
-    {"Bb", "ma+tifinagh-extended"}, //Berber (Morocco, Tifinagh extended)
-    {"Bb", "ma+tifinagh-phonetic"}, //Berber (Morocco, Tifinagh phonetic)
-    {"Bb", "ma+tifinagh-extended-phonetic"}, //Berber (Morocco, Tifinagh extended phonetic)
-    {"Bb", "ma+rif"}, //Tarifit
-    {"En", "cm"}, //English (Cameroon)
-    {"Fr", "cm+french"}, //French (Cameroon)
-    {"Cm", "cm+qwerty"}, //Cameroon Multilingual (QWERTY, intl.)
-    {"Cm", "cm+azerty"}, //Cameroon (AZERTY, intl.)
-    {"Cm", "cm+dvorak"}, //Cameroon (Dvorak, intl.)
-    {"Mu", "cm+mmuock"}, //Mmuock
     {"My", "mm"}, //Burmese
-    {"Zg", "mm+zawgyi"}, //Burmese Zawgyi
-    {"My", "mm+shn"}, //Shan
-    {"My", "mm+zgt"}, //Shan (Zawgyi Tai)
+    {"Zg", "mm+zawgyi"}, //Burmese (Zawgyi)
     {"My", "mm+mnw"}, //Mon
     {"My", "mm+mnw-a1"}, //Mon (A1)
-    {"Fr", "ca"}, //French (Canada)
-    {"Fr", "ca+fr-dvorak"}, //French (Canada, Dvorak)
-    {"Fr", "ca+fr-legacy"}, //French (Canada, legacy)
-    {"Cn", "ca+multix"}, //Canadian (CSA)
-    {"Iu", "ca+ike"}, //Inuktitut
-    {"En", "ca+eng"}, //English (Canada)
-    {"Fr", "cd"}, //French (Democratic Republic of the Congo)
+    {"My", "mm+shn"}, //Shan
+    {"My", "mm+zgt"}, //Shan (Zawgyi)
     {"Zh", "cn"}, //Chinese
+    {"Hp", "cn+altgr-pinyin"}, //Hanyu Pinyin Letters (with AltGr dead keys)
     {"Mn", "cn+mon_trad"}, //Mongolian (Bichig)
     {"Mn", "cn+mon_trad_todo"}, //Mongolian (Todo)
     {"Mn", "cn+mon_trad_xibe"}, //Mongolian (Xibe)
@@ -201,7 +121,6 @@ Language LANGUAGES[] =
     {"Bo", "cn+tib"}, //Tibetan
     {"Bo", "cn+tib_asciinum"}, //Tibetan (with ASCII numerals)
     {"Ug", "cn+ug"}, //Uyghur
-    {"Hp", "cn+altgr-pinyin"}, //Hanyu Pinyin Letters (with AltGr dead keys)
     {"Hr", "hr"}, //Croatian
     {"Hr", "hr+alternatequotes"}, //Croatian (with guillemets)
     {"Hr", "hr+unicode"}, //Croatian (with Croatian digraphs)
@@ -211,106 +130,188 @@ Language LANGUAGES[] =
     {"Cs", "cz+bksl"}, //Czech (extra backslash)
     {"Cs", "cz+qwerty"}, //Czech (QWERTY)
     {"Cs", "cz+qwerty_bksl"}, //Czech (QWERTY, extra backslash)
+    {"Cs", "cz+winkeys"}, //Czech (QWERTZ, Windows)
+    {"Cs", "cz+winkeys-qwerty"}, //Czech (QWERTY, Windows)
     {"Cs", "cz+qwerty-mac"}, //Czech (QWERTY, Macintosh)
     {"Cs", "cz+ucw"}, //Czech (UCW, only accented letters)
     {"Cs", "cz+dvorak-ucw"}, //Czech (US, Dvorak, UCW support)
     {"Ru", "cz+rus"}, //Russian (Czechia, phonetic)
-    {"Cs", "cz+winkeys"}, //Czech (QWERTZ, Windows flavour)
-    {"Cs", "cz+winkeys-qwerty"}, //Czech (QWERTY, Windows flavour)
     {"Da", "dk"}, //Danish
     {"Da", "dk+nodeadkeys"}, //Danish (no dead keys)
     {"Da", "dk+winkeys"}, //Danish (Windows)
     {"Da", "dk+mac"}, //Danish (Macintosh)
     {"Da", "dk+mac_nodeadkeys"}, //Danish (Macintosh, no dead keys)
     {"Da", "dk+dvorak"}, //Danish (Dvorak)
+    {"Fa", "af"}, //Dari
+    {"Ps", "af+ps"}, //Pashto
+    {"Uz", "af+uz"}, //Uzbek (Afghanistan)
+    {"Fa", "af+fa-olpc"}, //Dari (Afghanistan, OLPC)
+    {"Ps", "af+ps-olpc"}, //Pashto (Afghanistan, OLPC)
+    {"Uz", "af+uz-olpc"}, //Uzbek (Afghanistan, OLPC)
+    {"Dv", "mv"}, //Dhivehi
     {"Nl", "nl"}, //Dutch
     {"Nl", "nl+us"}, //Dutch (US)
     {"Nl", "nl+mac"}, //Dutch (Macintosh)
     {"Nl", "nl+std"}, //Dutch (standard)
     {"Dz", "bt"}, //Dzongkha
+    {"En", "au"}, //English (Australia)
+    {"En", "cm"}, //English (Cameroon)
+    {"Fr", "cm+french"}, //French (Cameroon)
+    {"Cm", "cm+qwerty"}, //Cameroon Multilingual (QWERTY, intl.)
+    {"Cm", "cm+azerty"}, //Cameroon (AZERTY, intl.)
+    {"Cm", "cm+dvorak"}, //Cameroon (Dvorak, intl.)
+    {"Mu", "cm+mmuock"}, //Mmuock
+    {"En", "gh"}, //English (Ghana)
+    {"En", "gh+generic"}, //English (Ghana, multilingual)
+    {"En", "gh+gillbt"}, //English (Ghana, GILLBT)
+    {"Ak", "gh+akan"}, //Akan
+    {"Av", "gh+avn"}, //Avatime
+    {"Ee", "gh+ewe"}, //Ewe
+    {"Ff", "gh+fula"}, //Fula
+    {"Gh", "gh+ga"}, //Ga
+    {"Ha", "gh+hausa"}, //Hausa (Ghana)
+    {"En", "nz"}, //English (New Zealand)
+    {"Mi", "nz+mao"}, //Maori
+    {"En", "ng"}, //English (Nigeria)
+    {"Ha", "ng+hausa"}, //Hausa (Nigeria)
+    {"Ig", "ng+igbo"}, //Igbo
+    {"Yo", "ng+yoruba"}, //Yoruba
+    {"En", "za"}, //English (South Africa)
+    {"En", "gb"}, //English (UK)
+    {"En", "gb+extd"}, //English (UK, extended, Windows)
+    {"En", "gb+intl"}, //English (UK, intl., with dead keys)
+    {"En", "gb+dvorak"}, //English (UK, Dvorak)
+    {"En", "gb+dvorakukp"}, //English (UK, Dvorak, with UK punctuation)
+    {"En", "gb+mac"}, //English (UK, Macintosh)
+    {"En", "gb+mac_intl"}, //English (UK, Macintosh, intl.)
+    {"En", "gb+colemak"}, //English (UK, Colemak)
+    {"En", "gb+colemak_dh"}, //English (UK, Colemak-DH)
+    {"Gd", "gb+gla"}, //Scottish Gaelic
+    {"Pl", "gb+pl"}, //Polish (British keyboard)
+    {"En", "us"}, //English (US)
+    {"En", "us+euro"}, //English (US, euro on 5)
+    {"En", "us+intl"}, //English (US, intl., with dead keys)
+    {"En", "us+alt-intl"}, //English (US, alt. intl.)
+    {"En", "us+altgr-intl"}, //English (intl., with AltGr dead keys)
+    {"En", "us+mac"}, //English (Macintosh)
+    {"En", "us+colemak"}, //English (Colemak)
+    {"En", "us+colemak_dh"}, //English (Colemak-DH)
+    {"En", "us+colemak_dh_wide"}, //English (Colemak-DH Wide)
+    {"En", "us+colemak_dh_ortho"}, //English (Colemak-DH Ortholinear)
+    {"En", "us+colemak_dh_iso"}, //English (Colemak-DH ISO)
+    {"En", "us+colemak_dh_wide_iso"}, //English (Colemak-DH Wide ISO)
+    {"En", "us+dvorak"}, //English (Dvorak)
+    {"En", "us+dvorak-intl"}, //English (Dvorak, intl., with dead keys)
+    {"En", "us+dvorak-alt-intl"}, //English (Dvorak, alt. intl.)
+    {"En", "us+dvorak-l"}, //English (Dvorak, left-handed)
+    {"En", "us+dvorak-r"}, //English (Dvorak, right-handed)
+    {"En", "us+dvorak-classic"}, //English (classic Dvorak)
+    {"En", "us+dvp"}, //English (programmer Dvorak)
+    {"En", "us+dvorak-mac"}, //English (Dvorak, Macintosh)
+    {"En", "us+norman"}, //English (Norman)
+    {"En", "us+symbolic"}, //English (US, Symbolic)
+    {"En", "us+workman"}, //English (Workman)
+    {"En", "us+workman-intl"}, //English (Workman, intl., with dead keys)
+    {"En", "us+olpc2"}, //English (the divide/multiply toggle the layout)
+    {"Ck", "us+chr"}, //Cherokee
+    {"Hw", "us+haw"}, //Hawaiian
+    {"Ru", "us+rus"}, //Russian (US, phonetic)
+    {"Hs", "us+hbs"}, //Serbo-Croatian (US)
+    {"Eo", "epo"}, //Esperanto
+    {"Eo", "epo+legacy"}, //Esperanto (legacy)
     {"Et", "ee"}, //Estonian
     {"Et", "ee+nodeadkeys"}, //Estonian (no dead keys)
     {"Et", "ee+dvorak"}, //Estonian (Dvorak)
     {"Et", "ee+us"}, //Estonian (US)
-    {"Fa", "ir"}, //Persian
-    {"Fa", "ir+pes_keypad"}, //Persian (with Persian keypad)
-    {"Fa", "ir+winkeys"}, //Persian (Windows)
-    {"Az", "ir+azb"}, //Azerbaijani (Iran)
-    {"Ku", "ir+ku"}, //Kurdish (Iran, Latin Q)
-    {"Ku", "ir+ku_f"}, //Kurdish (Iran, F)
-    {"Ku", "ir+ku_alt"}, //Kurdish (Iran, Latin Alt-Q)
-    {"Ku", "ir+ku_ara"}, //Kurdish (Iran, Arabic-Latin)
-    {"Iq", "iq"}, //Iraqi
-    {"Ku", "iq+ku"}, //Kurdish (Iraq, Latin Q)
-    {"Ku", "iq+ku_f"}, //Kurdish (Iraq, F)
-    {"Ku", "iq+ku_alt"}, //Kurdish (Iraq, Latin Alt-Q)
-    {"Ku", "iq+ku_ara"}, //Kurdish (Iraq, Arabic-Latin)
     {"Fo", "fo"}, //Faroese
     {"Fo", "fo+nodeadkeys"}, //Faroese (no dead keys)
+    {"Ph", "ph"}, //Filipino
+    {"Ph", "ph+qwerty-bay"}, //Filipino (QWERTY, Baybayin)
+    {"Ph", "ph+capewell-dvorak"}, //Filipino (Capewell-Dvorak, Latin)
+    {"Ph", "ph+capewell-dvorak-bay"}, //Filipino (Capewell-Dvorak, Baybayin)
+    {"Ph", "ph+capewell-qwerf2k6"}, //Filipino (Capewell-QWERF 2006, Latin)
+    {"Ph", "ph+capewell-qwerf2k6-bay"}, //Filipino (Capewell-QWERF 2006, Baybayin)
+    {"Ph", "ph+colemak"}, //Filipino (Colemak, Latin)
+    {"Ph", "ph+colemak-bay"}, //Filipino (Colemak, Baybayin)
+    {"Ph", "ph+dvorak"}, //Filipino (Dvorak, Latin)
+    {"Ph", "ph+dvorak-bay"}, //Filipino (Dvorak, Baybayin)
     {"Fi", "fi"}, //Finnish
     {"Fi", "fi+winkeys"}, //Finnish (Windows)
     {"Fi", "fi+classic"}, //Finnish (classic)
     {"Fi", "fi+nodeadkeys"}, //Finnish (classic, no dead keys)
-    {"Ns", "fi+smi"}, //Northern Saami (Finland)
     {"Fi", "fi+mac"}, //Finnish (Macintosh)
+    {"Ns", "fi+smi"}, //Northern Saami (Finland)
     {"Fr", "fr"}, //French
     {"Fr", "fr+nodeadkeys"}, //French (no dead keys)
     {"Fr", "fr+oss"}, //French (alt.)
-    {"Fr", "fr+oss_latin9"}, //French (alt., Latin-9 only)
     {"Fr", "fr+oss_nodeadkeys"}, //French (alt., no dead keys)
+    {"Fr", "fr+oss_latin9"}, //French (alt., Latin-9 only)
     {"Fr", "fr+latin9"}, //French (legacy, alt.)
     {"Fr", "fr+latin9_nodeadkeys"}, //French (legacy, alt., no dead keys)
+    {"Fr", "fr+azerty"}, //French (AZERTY)
+    {"Fr", "fr+afnor"}, //French (AZERTY, AFNOR)
     {"Fr", "fr+bepo"}, //French (BEPO)
     {"Fr", "fr+bepo_latin9"}, //French (BEPO, Latin-9 only)
     {"Fr", "fr+bepo_afnor"}, //French (BEPO, AFNOR)
     {"Fr", "fr+dvorak"}, //French (Dvorak)
     {"Fr", "fr+mac"}, //French (Macintosh)
-    {"Fr", "fr+azerty"}, //French (AZERTY)
-    {"Fr", "fr+afnor"}, //French (AZERTY, AFNOR)
+    {"Fr", "fr+us"}, //French (US)
     {"Fr", "fr+bre"}, //Breton (France)
     {"Oc", "fr+oci"}, //Occitan
     {"Ka", "fr+geo"}, //Georgian (France, AZERTY Tskapo)
-    {"Fr", "fr+us"}, //French (US)
-    {"En", "gh"}, //English (Ghana)
-    {"En", "gh+generic"}, //English (Ghana, multilingual)
-    {"Ak", "gh+akan"}, //Akan
-    {"Ee", "gh+ewe"}, //Ewe
-    {"Ff", "gh+fula"}, //Fula
-    {"Gh", "gh+ga"}, //Ga
-    {"Ha", "gh+hausa"}, //Hausa (Ghana)
-    {"Av", "gh+avn"}, //Avatime
-    {"En", "gh+gillbt"}, //English (Ghana, GILLBT)
-    {"Nk", "gn"}, //N'Ko (AZERTY)
+    {"Fr", "ca"}, //French (Canada)
+    {"Fr", "ca+fr-dvorak"}, //French (Canada, Dvorak)
+    {"Fr", "ca+fr-legacy"}, //French (Canada, legacy)
+    {"Cn", "ca+multix"}, //Canadian (CSA)
+    {"En", "ca+eng"}, //English (Canada)
+    {"Iu", "ca+ike"}, //Inuktitut
+    {"Fr", "cd"}, //French (Democratic Republic of the Congo)
+    {"Fr", "tg"}, //French (Togo)
     {"Ka", "ge"}, //Georgian
     {"Ka", "ge+ergonomic"}, //Georgian (ergonomic)
     {"Ka", "ge+mess"}, //Georgian (MESS)
-    {"Ru", "ge+ru"}, //Russian (Georgia)
     {"Os", "ge+os"}, //Ossetian (Georgia)
+    {"Ru", "ge+ru"}, //Russian (Georgia)
     {"De", "de"}, //German
     {"De", "de+deadacute"}, //German (dead acute)
     {"De", "de+deadgraveacute"}, //German (dead grave acute)
+    {"De", "de+deadtilde"}, //German (dead tilde)
     {"De", "de+nodeadkeys"}, //German (no dead keys)
     {"De", "de+e1"}, //German (E1)
     {"De", "de+e2"}, //German (E2)
     {"De", "de+T3"}, //German (T3)
     {"De", "de+us"}, //German (US)
-    {"Ro", "de+ro"}, //Romanian (Germany)
-    {"Ro", "de+ro_nodeadkeys"}, //Romanian (Germany, no dead keys)
     {"De", "de+dvorak"}, //German (Dvorak)
-    {"De", "de+neo"}, //German (Neo 2)
     {"De", "de+mac"}, //German (Macintosh)
     {"De", "de+mac_nodeadkeys"}, //German (Macintosh, no dead keys)
+    {"De", "de+neo"}, //German (Neo 2)
+    {"De", "de+qwerty"}, //German (QWERTY)
     {"Sb", "de+dsb"}, //Lower Sorbian
     {"Sb", "de+dsb_qwertz"}, //Lower Sorbian (QWERTZ)
-    {"De", "de+qwerty"}, //German (QWERTY)
-    {"Tr", "de+tr"}, //Turkish (Germany)
+    {"Ro", "de+ro"}, //Romanian (Germany)
+    {"Ro", "de+ro_nodeadkeys"}, //Romanian (Germany, no dead keys)
     {"Ru", "de+ru"}, //Russian (Germany, phonetic)
-    {"De", "de+deadtilde"}, //German (dead tilde)
+    {"Tr", "de+tr"}, //Turkish (Germany)
+    {"De", "at"}, //German (Austria)
+    {"De", "at+nodeadkeys"}, //German (Austria, no dead keys)
+    {"De", "at+mac"}, //German (Austria, Macintosh)
+    {"De", "ch"}, //German (Switzerland)
+    {"De", "ch+de_nodeadkeys"}, //German (Switzerland, no dead keys)
+    {"De", "ch+de_mac"}, //German (Switzerland, Macintosh)
+    {"De", "ch+legacy"}, //German (Switzerland, legacy)
+    {"Fr", "ch+fr"}, //French (Switzerland)
+    {"Fr", "ch+fr_nodeadkeys"}, //French (Switzerland, no dead keys)
+    {"Fr", "ch+fr_mac"}, //French (Switzerland, Macintosh)
     {"Gr", "gr"}, //Greek
     {"Gr", "gr+simple"}, //Greek (simple)
     {"Gr", "gr+extended"}, //Greek (extended)
     {"Gr", "gr+nodeadkeys"}, //Greek (no dead keys)
     {"Gr", "gr+polytonic"}, //Greek (polytonic)
+    {"He", "il"}, //Hebrew
+    {"He", "il+si2"}, //Hebrew (SI-1452-2)
+    {"He", "il+lyx"}, //Hebrew (lyx)
+    {"He", "il+phonetic"}, //Hebrew (phonetic)
+    {"He", "il+biblical"}, //Hebrew (Biblical, Tiro)
     {"Hu", "hu"}, //Hungarian
     {"Hu", "hu+standard"}, //Hungarian (standard)
     {"Hu", "hu+nodeadkeys"}, //Hungarian (no dead keys)
@@ -335,49 +336,88 @@ Language LANGUAGES[] =
     {"Is", "is+mac_legacy"}, //Icelandic (Macintosh, legacy)
     {"Is", "is+mac"}, //Icelandic (Macintosh)
     {"Is", "is+dvorak"}, //Icelandic (Dvorak)
-    {"He", "il"}, //Hebrew
-    {"He", "il+lyx"}, //Hebrew (lyx)
-    {"He", "il+phonetic"}, //Hebrew (phonetic)
-    {"He", "il+biblical"}, //Hebrew (Biblical, Tiro)
+    {"Il", "in"}, //Indian
+    {"As", "in+asm-kagapa"}, //Assamese (KaGaPa, phonetic)
+    {"Bn", "in+ben"}, //Bangla (India)
+    {"Bn", "in+ben_probhat"}, //Bangla (India, Probhat)
+    {"Bn", "in+ben_baishakhi"}, //Bangla (India, Baishakhi)
+    {"Bn", "in+ben_bornona"}, //Bangla (India, Bornona)
+    {"Bn", "in+ben-kagapa"}, //Bangla (India, KaGaPa, phonetic)
+    {"Bn", "in+ben_gitanjali"}, //Bangla (India, Gitanjali)
+    {"Bn", "in+ben_inscript"}, //Bangla (India, Baishakhi InScript)
+    {"En", "in+eng"}, //English (India, with rupee)
+    {"Gu", "in+guj"}, //Gujarati
+    {"Gu", "in+guj-kagapa"}, //Gujarati (KaGaPa, phonetic)
+    {"Hi", "in+bolnagri"}, //Hindi (Bolnagri)
+    {"Hi", "in+hin-wx"}, //Hindi (Wx)
+    {"Hi", "in+hin-kagapa"}, //Hindi (KaGaPa, phonetic)
+    {"Kn", "in+kan"}, //Kannada
+    {"Kn", "in+kan-kagapa"}, //Kannada (KaGaPa, phonetic)
+    {"Ml", "in+mal"}, //Malayalam
+    {"Ml", "in+mal_lalitha"}, //Malayalam (Lalitha)
+    {"Ml", "in+mal_enhanced"}, //Malayalam (enhanced InScript, with rupee)
+    {"Ml", "in+mal_poorna"}, //Malayalam (Poorna, extended InScript)
+    {"Ma", "in+mni"}, //Manipuri (Meitei)
+    {"Mr", "in+mar-kagapa"}, //Marathi (KaGaPa, phonetic)
+    {"Mr", "in+marathi"}, //Marathi (enhanced InScript)
+    {"Or", "in+ori"}, //Oriya
+    {"Or", "in+ori-bolnagri"}, //Oriya (Bolnagri)
+    {"Or", "in+ori-wx"}, //Oriya (Wx)
+    {"Pa", "in+guru"}, //Punjabi (Gurmukhi)
+    {"Pa", "in+jhelum"}, //Punjabi (Gurmukhi Jhelum)
+    {"Sa", "in+san-kagapa"}, //Sanskrit (KaGaPa, phonetic)
+    {"Sz", "in+sat"}, //Santali (Ol Chiki)
+    {"Ta", "in+tamilnet"}, //Tamil (TamilNet '99)
+    {"Ta", "in+tamilnet_tamilnumbers"}, //Tamil (TamilNet '99 with Tamil numerals)
+    {"Ta", "in+tamilnet_TAB"}, //Tamil (TamilNet '99, TAB encoding)
+    {"Ta", "in+tamilnet_TSCII"}, //Tamil (TamilNet '99, TSCII encoding)
+    {"Ta", "in+tam"}, //Tamil (InScript, with Arabic numerals)
+    {"Ta", "in+tam_tamilnumbers"}, //Tamil (InScript, with Tamil numerals)
+    {"Te", "in+tel"}, //Telugu
+    {"Te", "in+tel-kagapa"}, //Telugu (KaGaPa, phonetic)
+    {"Te", "in+tel-sarala"}, //Telugu (Sarala)
+    {"Ur", "in+urd-phonetic"}, //Urdu (phonetic)
+    {"Ur", "in+urd-phonetic3"}, //Urdu (alt. phonetic)
+    {"Ur", "in+urd-winkeys"}, //Urdu (Windows)
+    {"Ip", "in+iipa"}, //Indic IPA
+    {"Id", "id"}, //Indonesian (Latin)
+    {"Id", "id+melayu-phonetic"}, //Indonesian (Arab Melayu, phonetic)
+    {"Id", "id+melayu-phoneticx"}, //Indonesian (Arab Melayu, extended phonetic)
+    {"Id", "id+pegon-phonetic"}, //Indonesian (Arab Pegon, phonetic)
+    {"Jv", "id+javanese"}, //Javanese
+    {"Ga", "ie"}, //Irish
+    {"Ga", "ie+UnicodeExpert"}, //Irish (UnicodeExpert)
+    {"Cl", "ie+CloGaelach"}, //CloGaelach
+    {"Og", "ie+ogam"}, //Ogham
+    {"Og", "ie+ogam_is434"}, //Ogham (IS434)
     {"It", "it"}, //Italian
     {"It", "it+nodeadkeys"}, //Italian (no dead keys)
     {"It", "it+winkeys"}, //Italian (Windows)
     {"It", "it+mac"}, //Italian (Macintosh)
     {"It", "it+us"}, //Italian (US)
-    {"Ka", "it+geo"}, //Georgian (Italy)
     {"It", "it+ibm"}, //Italian (IBM 142)
     {"It", "it+intl"}, //Italian (intl., with dead keys)
-    {"Sj", "it+scn"}, //Sicilian
     {"Fu", "it+fur"}, //Friulian (Italy)
+    {"Sj", "it+scn"}, //Sicilian
+    {"Ka", "it+geo"}, //Georgian (Italy)
     {"Ja", "jp"}, //Japanese
     {"Ja", "jp+kana"}, //Japanese (Kana)
     {"Ja", "jp+kana86"}, //Japanese (Kana 86)
     {"Ja", "jp+OADG109A"}, //Japanese (OADG 109A)
     {"Ja", "jp+mac"}, //Japanese (Macintosh)
     {"Ja", "jp+dvorak"}, //Japanese (Dvorak)
-    {"Ky", "kg"}, //Kyrgyz
-    {"Ky", "kg+phonetic"}, //Kyrgyz (phonetic)
-    {"Km", "kh"}, //Khmer (Cambodia)
     {"Kk", "kz"}, //Kazakh
-    {"Ru", "kz+ruskaz"}, //Russian (Kazakhstan, with Kazakh)
     {"Kk", "kz+kazrus"}, //Kazakh (with Russian)
     {"Kk", "kz+ext"}, //Kazakh (extended)
     {"Kk", "kz+latin"}, //Kazakh (Latin)
+    {"Ru", "kz+ruskaz"}, //Russian (Kazakhstan, with Kazakh)
+    {"Km", "kh"}, //Khmer (Cambodia)
+    {"Ko", "kr"}, //Korean
+    {"Ko", "kr+kr104"}, //Korean (101/104-key compatible)
+    {"Ky", "kg"}, //Kyrgyz
+    {"Ky", "kg+phonetic"}, //Kyrgyz (phonetic)
     {"Lo", "la"}, //Lao
     {"Lo", "la+stea"}, //Lao (STEA)
-    {"Es", "latam"}, //Spanish (Latin American)
-    {"Es", "latam+nodeadkeys"}, //Spanish (Latin American, no dead keys)
-    {"Es", "latam+deadtilde"}, //Spanish (Latin American, dead tilde)
-    {"Es", "latam+dvorak"}, //Spanish (Latin American, Dvorak)
-    {"Es", "latam+colemak"}, //Spanish (Latin American, Colemak)
-    {"Lt", "lt"}, //Lithuanian
-    {"Lt", "lt+std"}, //Lithuanian (standard)
-    {"Lt", "lt+us"}, //Lithuanian (US)
-    {"Lt", "lt+ibm"}, //Lithuanian (IBM LST 1205-92)
-    {"Lt", "lt+lekp"}, //Lithuanian (LEKP)
-    {"Lt", "lt+lekpa"}, //Lithuanian (LEKPa)
-    {"Sf", "lt+sgs"}, //Samogitian
-    {"Lt", "lt+ratise"}, //Lithuanian (Ratise)
     {"Lv", "lv"}, //Latvian
     {"Lv", "lv+apostrophe"}, //Latvian (apostrophe)
     {"Lv", "lv+tilde"}, //Latvian (tilde)
@@ -386,43 +426,64 @@ Language LANGUAGES[] =
     {"Lv", "lv+modern-cyr"}, //Latvian (Modern Cyrillic)
     {"Lv", "lv+ergonomic"}, //Latvian (ergonomic, ŪGJRMV)
     {"Lv", "lv+adapted"}, //Latvian (adapted)
-    {"Mi", "mao"}, //Maori
-    {"Me", "me"}, //Montenegrin
-    {"Me", "me+cyrillic"}, //Montenegrin (Cyrillic)
-    {"Me", "me+cyrillicyz"}, //Montenegrin (Cyrillic, ZE and ZHE swapped)
-    {"Me", "me+latinunicode"}, //Montenegrin (Latin, Unicode)
-    {"Me", "me+latinyz"}, //Montenegrin (Latin, QWERTY)
-    {"Me", "me+latinunicodeyz"}, //Montenegrin (Latin, Unicode, QWERTY)
-    {"Me", "me+cyrillicalternatequotes"}, //Montenegrin (Cyrillic, with guillemets)
-    {"Me", "me+latinalternatequotes"}, //Montenegrin (Latin, with guillemets)
+    {"Lt", "lt"}, //Lithuanian
+    {"Lt", "lt+std"}, //Lithuanian (standard)
+    {"Lt", "lt+us"}, //Lithuanian (US)
+    {"Lt", "lt+ibm"}, //Lithuanian (IBM)
+    {"Lt", "lt+lekp"}, //Lithuanian (LEKP)
+    {"Lt", "lt+lekpa"}, //Lithuanian (LEKPa)
+    {"Lt", "lt+ratise"}, //Lithuanian (Ratise)
+    {"Sf", "lt+sgs"}, //Samogitian
     {"Mk", "mk"}, //Macedonian
     {"Mk", "mk+nodeadkeys"}, //Macedonian (no dead keys)
+    {"Ms", "my"}, //Malay (Jawi, Arabic Keyboard)
+    {"Ms", "my+phonetic"}, //Malay (Jawi, phonetic)
     {"Mt", "mt"}, //Maltese
     {"Mt", "mt+us"}, //Maltese (US)
     {"Mt", "mt+alt-us"}, //Maltese (US, with AltGr overrides)
     {"Mt", "mt+alt-gb"}, //Maltese (UK, with AltGr overrides)
+    {"Ro", "md"}, //Moldavian
+    {"Ro", "md+gag"}, //Gagauz (Moldova)
     {"Mn", "mn"}, //Mongolian
+    {"Me", "me"}, //Montenegrin
+    {"Me", "me+cyrillic"}, //Montenegrin (Cyrillic)
+    {"Me", "me+cyrillicyz"}, //Montenegrin (Cyrillic, ZE and ZHE swapped)
+    {"Me", "me+cyrillicalternatequotes"}, //Montenegrin (Cyrillic, with guillemets)
+    {"Me", "me+latinunicode"}, //Montenegrin (Latin, Unicode)
+    {"Me", "me+latinyz"}, //Montenegrin (Latin, QWERTY)
+    {"Me", "me+latinunicodeyz"}, //Montenegrin (Latin, Unicode, QWERTY)
+    {"Me", "me+latinalternatequotes"}, //Montenegrin (Latin, with guillemets)
+    {"Ne", "np"}, //Nepali
+    {"Nk", "gn"}, //N'Ko (AZERTY)
     {"No", "no"}, //Norwegian
     {"No", "no+nodeadkeys"}, //Norwegian (no dead keys)
     {"No", "no+winkeys"}, //Norwegian (Windows)
-    {"No", "no+dvorak"}, //Norwegian (Dvorak)
-    {"Ns", "no+smi"}, //Northern Saami (Norway)
-    {"Ns", "no+smi_nodeadkeys"}, //Northern Saami (Norway, no dead keys)
     {"No", "no+mac"}, //Norwegian (Macintosh)
     {"No", "no+mac_nodeadkeys"}, //Norwegian (Macintosh, no dead keys)
     {"No", "no+colemak"}, //Norwegian (Colemak)
     {"No", "no+colemak_dh"}, //Norwegian (Colemak-DH)
     {"No", "no+colemak_dh_wide"}, //Norwegian (Colemak-DH Wide)
+    {"No", "no+dvorak"}, //Norwegian (Dvorak)
+    {"Ns", "no+smi"}, //Northern Saami (Norway)
+    {"Ns", "no+smi_nodeadkeys"}, //Northern Saami (Norway, no dead keys)
+    {"Fa", "ir"}, //Persian
+    {"Fa", "ir+pes_keypad"}, //Persian (with Persian keypad)
+    {"Fa", "ir+winkeys"}, //Persian (Windows)
+    {"Az", "ir+azb"}, //Azerbaijani (Iran)
+    {"Ku", "ir+ku"}, //Kurdish (Iran, Latin Q)
+    {"Ku", "ir+ku_alt"}, //Kurdish (Iran, Latin Alt-Q)
+    {"Ku", "ir+ku_f"}, //Kurdish (Iran, F)
+    {"Ku", "ir+ku_ara"}, //Kurdish (Iran, Arabic-Latin)
     {"Pl", "pl"}, //Polish
     {"Pl", "pl+legacy"}, //Polish (legacy)
     {"Pl", "pl+qwertz"}, //Polish (QWERTZ)
     {"Pl", "pl+dvorak"}, //Polish (Dvorak)
     {"Pl", "pl+dvorak_quotes"}, //Polish (Dvorak, with Polish quotes on quotemark key)
     {"Pl", "pl+dvorak_altquotes"}, //Polish (Dvorak, with Polish quotes on key 1)
+    {"Pl", "pl+dvp"}, //Polish (programmer Dvorak)
     {"Kp", "pl+csb"}, //Kashubian
     {"Sj", "pl+szl"}, //Silesian
     {"Ru", "pl+ru_phonetic_dvorak"}, //Russian (Poland, phonetic Dvorak)
-    {"Pl", "pl+dvp"}, //Polish (programmer Dvorak)
     {"Pt", "pt"}, //Portuguese
     {"Pt", "pt+nodeadkeys"}, //Portuguese (no dead keys)
     {"Pt", "pt+mac"}, //Portuguese (Macintosh)
@@ -430,6 +491,14 @@ Language LANGUAGES[] =
     {"Pt", "pt+nativo"}, //Portuguese (Nativo)
     {"Pt", "pt+nativo-us"}, //Portuguese (Nativo for US keyboards)
     {"Eo", "pt+nativo-epo"}, //Esperanto (Portugal, Nativo)
+    {"Pt", "br"}, //Portuguese (Brazil)
+    {"Pt", "br+nodeadkeys"}, //Portuguese (Brazil, no dead keys)
+    {"Pt", "br+dvorak"}, //Portuguese (Brazil, Dvorak)
+    {"Pt", "br+nativo"}, //Portuguese (Brazil, Nativo)
+    {"Pt", "br+nativo-us"}, //Portuguese (Brazil, Nativo for US keyboards)
+    {"Pt", "br+thinkpad"}, //Portuguese (Brazil, IBM/Lenovo ThinkPad)
+    {"Eo", "br+nativo-epo"}, //Esperanto (Brazil, Nativo)
+    {"Ru", "br+rus"}, //Russian (Brazil, phonetic)
     {"Ro", "ro"}, //Romanian
     {"Ro", "ro+std"}, //Romanian (standard)
     {"Ro", "ro+winkeys"}, //Romanian (Windows)
@@ -437,100 +506,92 @@ Language LANGUAGES[] =
     {"Ru", "ru+phonetic"}, //Russian (phonetic)
     {"Ru", "ru+phonetic_winkeys"}, //Russian (phonetic, Windows)
     {"Ru", "ru+phonetic_YAZHERTY"}, //Russian (phonetic, YAZHERTY)
+    {"Ru", "ru+phonetic_azerty"}, //Russian (phonetic, AZERTY)
+    {"Ru", "ru+phonetic_dvorak"}, //Russian (phonetic, Dvorak)
     {"Ru", "ru+typewriter"}, //Russian (typewriter)
     {"Ru", "ru+ruchey_ru"}, //Russian (engineering, RU)
     {"Ru", "ru+ruchey_en"}, //Russian (engineering, EN)
     {"Ru", "ru+legacy"}, //Russian (legacy)
     {"Ru", "ru+typewriter-legacy"}, //Russian (typewriter, legacy)
-    {"Tt", "ru+tt"}, //Tatar
-    {"Os", "ru+os_legacy"}, //Ossetian (legacy)
-    {"Os", "ru+os_winkeys"}, //Ossetian (Windows)
-    {"Cv", "ru+cv"}, //Chuvash
-    {"Cv", "ru+cv_latin"}, //Chuvash (Latin)
-    {"Ud", "ru+udm"}, //Udmurt
-    {"Kv", "ru+kom"}, //Komi
-    {"Ya", "ru+sah"}, //Yakut
-    {"Kx", "ru+xal"}, //Kalmyk
     {"Ru", "ru+dos"}, //Russian (DOS)
     {"Ru", "ru+mac"}, //Russian (Macintosh)
-    {"Sr", "ru+srp"}, //Serbian (Russia)
+    {"Ab", "ru+ab"}, //Abkhazian (Russia)
     {"Ba", "ru+bak"}, //Bashkirian
+    {"Cv", "ru+cv"}, //Chuvash
+    {"Cv", "ru+cv_latin"}, //Chuvash (Latin)
+    {"Kx", "ru+xal"}, //Kalmyk
+    {"Kv", "ru+kom"}, //Komi
     {"Mx", "ru+chm"}, //Mari
-    {"Ru", "ru+phonetic_azerty"}, //Russian (phonetic, AZERTY)
-    {"Ru", "ru+phonetic_dvorak"}, //Russian (phonetic, Dvorak)
-    {"Ru", "ru+phonetic_fr"}, //Russian (phonetic, French)
-    {"Ab", "ru+ab"}, //Abkhazian (Russia)
+    {"Os", "ru+os_legacy"}, //Ossetian (legacy)
+    {"Os", "ru+os_winkeys"}, //Ossetian (Windows)
+    {"Sr", "ru+srp"}, //Serbian (Russia)
+    {"Tt", "ru+tt"}, //Tatar
+    {"Ud", "ru+udm"}, //Udmurt
+    {"Ya", "ru+sah"}, //Yakut
     {"Sr", "rs"}, //Serbian
+    {"Sr", "rs+alternatequotes"}, //Serbian (Cyrillic, with guillemets)
     {"Sr", "rs+yz"}, //Serbian (Cyrillic, ZE and ZHE swapped)
     {"Sr", "rs+latin"}, //Serbian (Latin)
+    {"Sr", "rs+latinalternatequotes"}, //Serbian (Latin, with guillemets)
     {"Sr", "rs+latinunicode"}, //Serbian (Latin, Unicode)
     {"Sr", "rs+latinyz"}, //Serbian (Latin, QWERTY)
     {"Sr", "rs+latinunicodeyz"}, //Serbian (Latin, Unicode, QWERTY)
-    {"Sr", "rs+alternatequotes"}, //Serbian (Cyrillic, with guillemets)
-    {"Sr", "rs+latinalternatequotes"}, //Serbian (Latin, with guillemets)
     {"Rs", "rs+rue"}, //Pannonian Rusyn
-    {"Sl", "si"}, //Slovenian
-    {"Sl", "si+alternatequotes"}, //Slovenian (with guillemets)
-    {"Sl", "si+us"}, //Slovenian (US)
+    {"Si", "lk"}, //Sinhala (phonetic)
+    {"Si", "lk+us"}, //Sinhala (US)
+    {"Ta", "lk+tam_unicode"}, //Tamil (Sri Lanka, TamilNet '99)
+    {"Ta", "lk+tam_TAB"}, //Tamil (Sri Lanka, TamilNet '99, TAB encoding)
     {"Sk", "sk"}, //Slovak
     {"Sk", "sk+bksl"}, //Slovak (extra backslash)
     {"Sk", "sk+qwerty"}, //Slovak (QWERTY)
     {"Sk", "sk+qwerty_bksl"}, //Slovak (QWERTY, extra backslash)
+    {"Sl", "si"}, //Slovenian
+    {"Sl", "si+alternatequotes"}, //Slovenian (with guillemets)
+    {"Sl", "si+us"}, //Slovenian (US)
     {"Es", "es"}, //Spanish
     {"Es", "es+nodeadkeys"}, //Spanish (no dead keys)
-    {"Es", "es+winkeys"}, //Spanish (Windows)
     {"Es", "es+deadtilde"}, //Spanish (dead tilde)
+    {"Es", "es+winkeys"}, //Spanish (Windows)
     {"Es", "es+dvorak"}, //Spanish (Dvorak)
     {"As", "es+ast"}, //Asturian (Spain, with bottom-dot H and L)
     {"Ca", "es+cat"}, //Catalan (Spain, with middle-dot L)
+    {"Es", "latam"}, //Spanish (Latin American)
+    {"Es", "latam+nodeadkeys"}, //Spanish (Latin American, no dead keys)
+    {"Es", "latam+deadtilde"}, //Spanish (Latin American, dead tilde)
+    {"Es", "latam+dvorak"}, //Spanish (Latin American, Dvorak)
+    {"Es", "latam+colemak"}, //Spanish (Latin American, Colemak)
+    {"Sw", "ke"}, //Swahili (Kenya)
+    {"Ki", "ke+kik"}, //Kikuyu
+    {"Sw", "tz"}, //Swahili (Tanzania)
     {"Sv", "se"}, //Swedish
     {"Sv", "se+nodeadkeys"}, //Swedish (no dead keys)
     {"Sv", "se+dvorak"}, //Swedish (Dvorak)
-    {"Ru", "se+rus"}, //Russian (Sweden, phonetic)
-    {"Ru", "se+rus_nodeadkeys"}, //Russian (Sweden, phonetic, no dead keys)
-    {"Ns", "se+smi"}, //Northern Saami (Sweden)
-    {"Sv", "se+mac"}, //Swedish (Macintosh)
-    {"Sv", "se+svdvorak"}, //Swedish (Svdvorak)
     {"Sv", "se+us_dvorak"}, //Swedish (Dvorak, intl.)
+    {"Sv", "se+svdvorak"}, //Swedish (Svdvorak)
+    {"Sv", "se+mac"}, //Swedish (Macintosh)
     {"Sv", "se+us"}, //Swedish (US)
     {"Sv", "se+swl"}, //Swedish Sign Language
-    {"De", "ch"}, //German (Switzerland)
-    {"De", "ch+legacy"}, //German (Switzerland, legacy)
-    {"De", "ch+de_nodeadkeys"}, //German (Switzerland, no dead keys)
-    {"Fr", "ch+fr"}, //French (Switzerland)
-    {"Fr", "ch+fr_nodeadkeys"}, //French (Switzerland, no dead keys)
-    {"Fr", "ch+fr_mac"}, //French (Switzerland, Macintosh)
-    {"De", "ch+de_mac"}, //German (Switzerland, Macintosh)
-    {"Ar", "sy"}, //Arabic (Syria)
-    {"Ls", "sy+syc"}, //Syriac
-    {"Ls", "sy+syc_phonetic"}, //Syriac (phonetic)
-    {"Ku", "sy+ku"}, //Kurdish (Syria, Latin Q)
-    {"Ku", "sy+ku_f"}, //Kurdish (Syria, F)
-    {"Ku", "sy+ku_alt"}, //Kurdish (Syria, Latin Alt-Q)
+    {"Ns", "se+smi"}, //Northern Saami (Sweden)
+    {"Ru", "se+rus"}, //Russian (Sweden, phonetic)
+    {"Tw", "tw"}, //Taiwanese
+    {"Tw", "tw+indigenous"}, //Taiwanese (indigenous)
+    {"Sy", "tw+saisiyat"}, //Saisiyat (Taiwan)
     {"Tg", "tj"}, //Tajik
     {"Tg", "tj+legacy"}, //Tajik (legacy)
-    {"Si", "lk"}, //Sinhala (phonetic)
-    {"Ta", "lk+tam_unicode"}, //Tamil (Sri Lanka, TamilNet '99)
-    {"Ta", "lk+tam_TAB"}, //Tamil (Sri Lanka, TamilNet '99, TAB encoding)
-    {"Si", "lk+us"}, //Sinhala (US)
     {"Th", "th"}, //Thai
     {"Th", "th+tis"}, //Thai (TIS-820.2538)
     {"Th", "th+pat"}, //Thai (Pattachote)
+    {"Tn", "bw"}, //Tswana
+    {"Tk", "tm"}, //Turkmen
+    {"Tk", "tm+alt"}, //Turkmen (Alt-Q)
     {"Tr", "tr"}, //Turkish
     {"Tr", "tr+f"}, //Turkish (F)
     {"Tr", "tr+e"}, //Turkish (E)
     {"Tr", "tr+alt"}, //Turkish (Alt-Q)
+    {"Tr", "tr+intl"}, //Turkish (intl., with dead keys)
     {"Ku", "tr+ku"}, //Kurdish (Turkey, Latin Q)
     {"Ku", "tr+ku_f"}, //Kurdish (Turkey, F)
     {"Ku", "tr+ku_alt"}, //Kurdish (Turkey, Latin Alt-Q)
-    {"Tr", "tr+intl"}, //Turkish (intl., with dead keys)
-    {"Tr", "tr+ot"}, //Ottoman (Q)
-    {"Tr", "tr+otf"}, //Ottoman (F)
-    {"Tr", "tr+otk"}, //Old Turkic
-    {"Tr", "tr+otkf"}, //Old Turkic (F)
-    {"Tw", "tw"}, //Taiwanese
-    {"Tw", "tw+indigenous"}, //Taiwanese (indigenous)
-    {"Sy", "tw+saisiyat"}, //Saisiyat (Taiwan)
     {"Uk", "ua"}, //Ukrainian
     {"Uk", "ua+phonetic"}, //Ukrainian (phonetic)
     {"Uk", "ua+typewriter"}, //Ukrainian (typewriter)
@@ -541,80 +602,17 @@ Language LANGUAGES[] =
     {"Tt", "ua+crh"}, //Crimean Tatar (Turkish Q)
     {"Tt", "ua+crh_f"}, //Crimean Tatar (Turkish F)
     {"Tt", "ua+crh_alt"}, //Crimean Tatar (Turkish Alt-Q)
-    {"En", "gb"}, //English (UK)
-    {"En", "gb+extd"}, //English (UK, extended, Windows)
-    {"En", "gb+intl"}, //English (UK, intl., with dead keys)
-    {"En", "gb+dvorak"}, //English (UK, Dvorak)
-    {"En", "gb+dvorakukp"}, //English (UK, Dvorak, with UK punctuation)
-    {"En", "gb+mac"}, //English (UK, Macintosh)
-    {"En", "gb+mac_intl"}, //English (UK, Macintosh, intl.)
-    {"En", "gb+colemak"}, //English (UK, Colemak)
-    {"En", "gb+colemak_dh"}, //English (UK, Colemak-DH)
-    {"Pl", "gb+pl"}, //Polish (British keyboard)
-    {"Gd", "gb+gla"}, //Scottish Gaelic
-    {"Uz", "uz"}, //Uzbek
-    {"Uz", "uz+latin"}, //Uzbek (Latin)
-    {"Vi", "vn"}, //Vietnamese
-    {"Vi", "vn+us"}, //Vietnamese (US)
-    {"Vi", "vn+fr"}, //Vietnamese (France)
-    {"Ko", "kr"}, //Korean
-    {"Ko", "kr+kr104"}, //Korean (101/104-key compatible)
-    {"Ga", "ie"}, //Irish
-    {"Cl", "ie+CloGaelach"}, //CloGaelach
-    {"Ga", "ie+UnicodeExpert"}, //Irish (UnicodeExpert)
-    {"Og", "ie+ogam"}, //Ogham
-    {"Og", "ie+ogam_is434"}, //Ogham (IS434)
     {"Ur", "pk"}, //Urdu (Pakistan)
     {"Ur", "pk+urd-crulp"}, //Urdu (Pakistan, CRULP)
     {"Ur", "pk+urd-nla"}, //Urdu (Pakistan, NLA)
     {"Ar", "pk+ara"}, //Arabic (Pakistan)
     {"Sd", "pk+snd"}, //Sindhi
-    {"Dv", "mv"}, //Dhivehi
-    {"En", "za"}, //English (South Africa)
-    {"Eo", "epo"}, //Esperanto
-    {"Eo", "epo+legacy"}, //Esperanto (legacy)
-    {"Ne", "np"}, //Nepali
-    {"En", "ng"}, //English (Nigeria)
-    {"Ig", "ng+igbo"}, //Igbo
-    {"Yo", "ng+yoruba"}, //Yoruba
-    {"Ha", "ng+hausa"}, //Hausa (Nigeria)
-    {"Am", "et"}, //Amharic
+    {"Uz", "uz"}, //Uzbek
+    {"Uz", "uz+latin"}, //Uzbek (Latin)
+    {"Vi", "vn"}, //Vietnamese
+    {"Vi", "vn+us"}, //Vietnamese (US)
+    {"Vi", "vn+fr"}, //Vietnamese (France)
     {"Wo", "sn"}, //Wolof
-    {"Bi", "brai"}, //Braille
-    {"Bi", "brai+left_hand"}, //Braille (left-handed)
-    {"Bi", "brai+left_hand_invert"}, //Braille (left-handed inverted thumb)
-    {"Bi", "brai+right_hand"}, //Braille (right-handed)
-    {"Bi", "brai+right_hand_invert"}, //Braille (right-handed inverted thumb)
-    {"Tk", "tm"}, //Turkmen
-    {"Tk", "tm+alt"}, //Turkmen (Alt-Q)
-    {"Bm", "ml"}, //Bambara
-    {"Fr", "ml+fr-oss"}, //French (Mali, alt.)
-    {"En", "ml+us-mac"}, //English (Mali, US, Macintosh)
-    {"En", "ml+us-intl"}, //English (Mali, US, intl.)
-    {"Sw", "tz"}, //Swahili (Tanzania)
-    {"Fr", "tg"}, //French (Togo)
-    {"Sw", "ke"}, //Swahili (Kenya)
-    {"Ki", "ke+kik"}, //Kikuyu
-    {"Tn", "bw"}, //Tswana
-    {"Ph", "ph"}, //Filipino
-    {"Ph", "ph+qwerty-bay"}, //Filipino (QWERTY, Baybayin)
-    {"Ph", "ph+capewell-dvorak"}, //Filipino (Capewell-Dvorak, Latin)
-    {"Ph", "ph+capewell-dvorak-bay"}, //Filipino (Capewell-Dvorak, Baybayin)
-    {"Ph", "ph+capewell-qwerf2k6"}, //Filipino (Capewell-QWERF 2006, Latin)
-    {"Ph", "ph+capewell-qwerf2k6-bay"}, //Filipino (Capewell-QWERF 2006, Baybayin)
-    {"Ph", "ph+colemak"}, //Filipino (Colemak, Latin)
-    {"Ph", "ph+colemak-bay"}, //Filipino (Colemak, Baybayin)
-    {"Ph", "ph+dvorak"}, //Filipino (Dvorak, Latin)
-    {"Ph", "ph+dvorak-bay"}, //Filipino (Dvorak, Baybayin)
-    {"Ro", "md"}, //Moldavian
-    {"Ro", "md+gag"}, //Gagauz (Moldova)
-    {"Id", "id"}, //Indonesian (Latin)
-    {"Jv", "id+javanese"}, //Javanese
-    {"Id", "id+melayu-phonetic"}, //Indonesian (Arab Melayu, phonetic)
-    {"Id", "id+melayu-phoneticx"}, //Indonesian (Arab Melayu, extended phonetic)
-    {"Id", "id+pegon-phonetic"}, //Indonesian (Arab Pegon, phonetic)
-    {"Ms", "my"}, //Malay (Jawi, Arabic Keyboard)
-    {"Ms", "my+phonetic"}, //Malay (Jawi, phonetic)
     {"custom", "custom"}, //A user-defined custom Layout
     {"An", "ancient"}, //Ancient
     {"Go", "ancient+got"}, //Gothic
@@ -642,10 +640,10 @@ Language LANGUAGES[] =
     {"De", "de+neo_qwerty"}, //German (Neo, QWERTY)
     {"Ru", "de+ru-recom"}, //Russian (Germany, recommended)
     {"Ru", "de+ru-translit"}, //Russian (Germany, transliteration)
-    {"De", "de+lld"}, //German (Ladin)
-    {"Cp", "eg"}, //Coptic
+    {"Cp", "eg+cop"}, //Coptic
     {"Hu", "hu+oldhun"}, //Old Hungarian
     {"Hu", "hu+oldhunlig"}, //Old Hungarian (for ligatures)
+    {"Hu", "hu+us"}, //Hungarian (US)
     {"Lt", "lt+us_dvorak"}, //Lithuanian (Dvorak)
     {"Lt", "lt+sun_type6"}, //Lithuanian (Sun Type 6/7)
     {"Lv", "lv+dvorak"}, //Latvian (Dvorak)
@@ -694,7 +692,7 @@ Language LANGUAGES[] =
     {"Cu", "ru+chu"}, //Church Slavonic
     {"Ru", "ru+ruu"}, //Russian (plus Ukrainian and Belarusian letters)
     {"Ru", "ru+rulemak"}, //Russian (Rulemak, phonetic Colemak)
-    {"Ru", "ru+phonetic_mac"}, //Russian (phonetic Macintosh)
+    {"Ru", "ru+phonetic_mac"}, //Russian (phonetic, Macintosh)
     {"Ru", "ru+sun_type6"}, //Russian (Sun Type 6/7)
     {"Ru", "ru+unipunct"}, //Russian (with US punctuation)
     {"Ru", "ru+gost-6431-75-48"}, //Russian (GOST 6431-75)
@@ -728,7 +726,8 @@ Language LANGUAGES[] =
     {"Gr", "gr+sun_type6"}, //Greek (Sun Type 6/7)
     {"Gr", "gr+colemak"}, //Greek (Colemak)
     {"It", "it+sun_type6"}, //Italian (Sun Type 6/7)
-    {"It", "it+lld"}, //Italian (Ladin)
+    {"It", "it+lld"}, //Ladin (Italian keyboard)
+    {"It", "it+lldde"}, //Ladin (German keyboard)
     {"It", "it+dvorak"}, //Italian (Dvorak)
     {"Ja", "jp+sun_type6"}, //Japanese (Sun Type 6)
     {"Ja", "jp+sun_type7"}, //Japanese (Sun Type 7, PC-compatible)
@@ -742,11 +741,15 @@ Language LANGUAGES[] =
     {"Es", "es+sun_type6"}, //Spanish (Sun Type 6/7)
     {"Sv", "se+dvorak_a5"}, //Swedish (Dvorak A5)
     {"Sv", "se+sun_type6"}, //Swedish (Sun Type 6/7)
-    {"Ed", "se+ovd"}, //Elfdalian (Swedish, with combining ogonek)
+    {"Ed", "se+ovd"}, //Elfdalian (Sweden, with combining ogonek)
     {"De", "ch+sun_type6_de"}, //German (Switzerland, Sun Type 6/7)
     {"Fr", "ch+sun_type6_fr"}, //French (Switzerland, Sun Type 6/7)
     {"Tr", "tr+sun_type6"}, //Turkish (Sun Type 6/7)
-    {"Tr", "tr+us"}, //Turkish (Turkey, Latin Q, Swap i and ı)
+    {"Tr", "tr+us"}, //Turkish (i and ı swapped)
+    {"Tr", "tr+otk"}, //Old Turkic
+    {"Tr", "tr+otkf"}, //Old Turkic (F)
+    {"Tr", "tr+ot"}, //Ottoman (Q)
+    {"Tr", "tr+otf"}, //Ottoman (F)
     {"Uk", "ua+sun_type6"}, //Ukrainian (Sun Type 6/7)
     {"En", "gb+sun_type6"}, //English (UK, Sun Type 6/7)
     {"Ko", "kr+sun_type6"}, //Korean (Sun Type 6/7)
@@ -755,7 +758,7 @@ Language LANGUAGES[] =
     {"Ek", "eu"}, //EurKEY (US)
     {"Ix", "trans"}, //International Phonetic Alphabet
     {"Ix", "trans+qwerty"}, //International Phonetic Alphabet (QWERTY)
-    {"Md", "in+modi-kagapa"}, //Modi (KaGaPa phonetic)
+    {"Md", "in+modi-kagapa"}, //Modi (KaGaPa, phonetic)
     {"Sa", "in+san-misc"}, //Sanskrit symbols
     {"Ur", "in+urd-navees"}, //Urdu (Navees)
     {"emoji", "emoji"}, //Emoji
@@ -776,7 +779,7 @@ gchar* lookupLanguage(const gchar* sId)
         nId++;
     }
 
-    g_warning("No language found for Id %s", sId);
+    g_debug ("No language found for Id %s", sId);
 
     return "00";
 }