diff --git a/import/translation_maps/language_map.properties b/import/translation_maps/language_map.properties
index ca142e6d4a4..8025803ed08 100644
--- a/import/translation_maps/language_map.properties
+++ b/import/translation_maps/language_map.properties
@@ -1,40 +1,40 @@
 aar = Afar
 aav = Austro-Asiatic
-abk = Abkhazian
+abk = Abkhaz
 ace = Achinese
 ach = Acoli
 ada = Adangme
-ady = Adyghe
-afa = Afro-Asiatic
-afh = Afrihili
+ady = Adygei
+afa = Afroasiatic (Other)
+afh = Afrihili (Artificial language)
 afr = Afrikaans
 ain = Ainu
 aka = Akan
 akk = Akkadian
 alb = Albanian
 ale = Aleut
-alg = Algonquian
-alt = Southern Altai
+alg = Algonquian (Other)
+alt = Altai
 alv = Atlantic-Congo
 amh = Amharic
-ang = Old English
+ang = English, Old (ca. 450-1100)
 anp = Angika
-apa = Apache
+apa = Apache languages
 aqa = Alacalufan
 aql = Algic
 ara = Arabic
 arc = Aramaic
 arg = Aragonese
 arm = Armenian
-arn = Mapudungun
+arn = Mapuche
 arp = Arapaho
-art = Artificial
+art = Artificial (Other)
 arw = Arawak
 asm = Assamese
-ast = Asturian
-ath = Athapascan
+ast = Bable
+ath = Athapascan (Other)
 auf = Arauan
-aus = Australian
+aus = Australian languages
 ava = Avaric
 ave = Avestan
 awa = Awadhi
@@ -42,48 +42,48 @@ awd = Arawakan
 aym = Aymara
 azc = Uto-Aztecan
 aze = Azerbaijani
-bad = Banda
-bai = Bamileke
+bad = Banda languages
+bai = Bamileke languages
 bak = Bashkir
 bal = Baluchi
 bam = Bambara
 ban = Balinese
 baq = Basque
 bas = Basa
-bat = Baltic
+bat = Baltic (Other)
 bej = Beja
 bel = Belarusian
 bem = Bemba
 ben = Bengali
-ber = Berber
+ber = Berber (Other)
 bho = Bhojpuri
-bih = Bihari
+bih = Bihari (Other)
 bik = Bikol
-bin = Bini
+bin = Edo
 bis = Bislama
 bla = Siksika
-bnt = Bantu
+bnt = Bantu (Other)
 bos = Bosnian
 bra = Braj
 bre = Breton
 btk = Batak
 bua = Buriat
-bug = Buginese
+bug = Bugis
 bul = Bulgarian
 bur = Burmese
-byn = Blin
+byn = Bilin
 cad = Caddo
-cai = Central American Indian
-car = Galibi Carib
+cai = Central American Indian (Other)
+car = Carib
 cat = Catalan
-cau = Caucasian
+cau = Caucasian (Other)
 cba = Chibchan
 ccn = North Caucasian
 ccs = South Caucasian
 cdc = Chadic
 cdd = Caddoan
 ceb = Cebuano
-cel = Celtic
+cel = Celtic (Other)
 cha = Chamorro
 chb = Chibcha
 che = Chechen
@@ -91,52 +91,53 @@ chg = Chagatai
 chi = Chinese
 chk = Chuukese
 chm = Mari
-chn = Chinook
+chn = Chinook jargon
 cho = Choctaw
 chp = Chipewyan
 chr = Cherokee
 chu = Church Slavic
 chv = Chuvash
 chy = Cheyenne
-cmc = Chamic
+cmc = Chamic languages
+cnr = Montenegrin
 cop = Coptic
 cor = Cornish
 cos = Corsican
-cpe = Creole
-cpf = Creole
-cpp = Creole
+cpe = Creoles and Pidgins, English-based (Other)
+cpf = Creoles and Pidgins, French-based (Other)
+cpp = Creoles and Pidgins, Portuguese-based (Other)
 cre = Cree
 crh = Crimean Tatar
-crp = Creoles
+crp = Creoles and Pidgins (Other)
 csb = Kashubian
 csu = Central Sudanic
-cus = Cushitic
+cus = Cushitic (Other)
 cze = Czech
 dak = Dakota
 dan = Danish
 dar = Dargwa
-day = Land Dayak
+day = Dayak
 del = Delaware
-den = Slave
+den = Slavey
 dgr = Dogrib
 din = Dinka
 div = Divehi
 dmn = Mande
 doi = Dogri
-dra = Dravidian
+dra = Dravidian (Other)
 dsb = Lower Sorbian
 dua = Duala
-dum = Dutch
+dum = Dutch, Middle (ca. 1050-1350)
 dut = Dutch
 dyu = Dyula
 dzo = Dzongkha
 efi = Efik
 egx = Egyptian
-egy = Ancient Egyptian
+egy = Egyptian
 eka = Ekajuk
 elx = Elamite
 eng = English
-enm = Middle English
+enm = English, Middle (1100-1500)
 epo = Esperanto
 est = Estonian
 esx = Eskimo-Aleut
@@ -149,53 +150,53 @@ fat = Fanti
 fij = Fijian
 fil = Filipino
 fin = Finnish
-fiu = Finno-Ugrian
+fiu = Finno-Ugrian (Other)
 fon = Fon
 fox = Formosan
 fre = French
-frm = Middle French
-fro = Old French
-frr = Northern Frisian
-frs = Eastern Frisian
-fry = Western Frisian
-ful = Fulah
+frm = French, Middle (ca. 1300-1600)
+fro = French, Old (ca. 842-1300)
+frr = North Frisian
+frs = East Frisian
+fry = Frisian
+ful = Fula
 fur = Friulian
-gaa = Ga
+gaa = Gã
 gay = Gayo
 gba = Gbaya
-gem = Germanic
+gem = Germanic (Other)
 geo = Georgian
 ger = German
-gez = Geez
+gez = Ethiopic
 gil = Gilbertese
-gla = Gaelic
+gla = Scottish Gaelic
 gle = Irish
 glg = Galician
 glv = Manx
 gme = East Germanic
-gmh = Middle High German
+gmh = German, Middle High (ca. 1050-1500)
 gmq = North Germanic
 gmw = West Germanic
-goh = Old High German
+goh = German, Old High (ca. 750-1050)
 gon = Gondi
 gor = Gorontalo
 got = Gothic
 grb = Grebo
-grc = Ancient Greek
-gre = Greek
+grc = Greek, Ancient (to 1453)
+gre = Greek, Modern (1453-)
 grk = Greek
 grn = Guarani
 gsw = Swiss German
 guj = Gujarati
-gwi = Gwich`in
+gwi = Gwich'in
 hai = Haida
-hat = Haitian
+hat = Haitian French Creole
 hau = Hausa
 haw = Hawaiian
 heb = Hebrew
 her = Herero
 hil = Hiligaynon
-him = Himachali
+him = Western Pahari languages
 hin = Hindi
 hit = Hittite
 hmn = Hmong
@@ -217,18 +218,18 @@ ijo = Ijo
 iku = Inuktitut
 ile = Interlingue
 ilo = Iloko
-ina = Interlingua
-inc = Indic
+ina = Interlingua (International Auxiliary Language Association)
+inc = Indic (Other)
 ind = Indonesian
-ine = Indo-European
+ine = Indo-European (Other)
 inh = Ingush
 ipk = Inupiaq
-ira = Iranian
-iro = Iroquoian
+ira = Iranian (Other)
+iro = Iroquoian (Other)
 ita = Italian
 itc = Italic
 jav = Javanese
-jbo = Lojban
+jbo = Lojban (Artificial language)
 jpn = Japanese
 jpr = Judeo-Persian
 jpx = Japanese
@@ -236,10 +237,10 @@ jrb = Judeo-Arabic
 kaa = Kara-Kalpak
 kab = Kabyle
 kac = Kachin
-kal = Kalaallisut
+kal = Kalâtdlisut
 kam = Kamba
 kan = Kannada
-kar = Karen
+kar = Karen languages
 kas = Kashmiri
 kau = Kanuri
 kaw = Kawi
@@ -247,12 +248,12 @@ kaz = Kazakh
 kbd = Kabardian
 kdo = Kordofanian
 kha = Khasi
-khi = Khoisan
-khm = Central Khmer
+khi = Khoisan (Other)
+khm = Khmer
 kho = Khotanese
 kik = Kikuyu
 kin = Kinyarwanda
-kir = Kirghiz
+kir = Kyrgyz
 kmb = Kimbundu
 kok = Konkani
 kom = Komi
@@ -262,31 +263,31 @@ kos = Kosraean
 kpe = Kpelle
 krc = Karachay-Balkar
 krl = Karelian
-kro = Kru languages
+kro = Kru (Other)
 kru = Kurukh
 kua = Kuanyama
 kum = Kumyk
 kur = Kurdish
-kut = Kutenai
+kut = Kootenai
 lad = Ladino
-lah = Lahnda
-lam = Lamba
+lah = Lahndā
+lam = Lamba (Zambia and Congo)
 lao = Lao
 lat = Latin
 lav = Latvian
-lez = Lezghian
-lim = Limburgan
+lez = Lezgian
+lim = Limburgish
 lin = Lingala
 lit = Lithuanian
-lol = Mongo
+lol = Mongo-Nkundu
 loz = Lozi
 ltz = Luxembourgish
 lua = Luba-Lulua
 lub = Luba-Katanga
 lug = Ganda
-lui = Luiseno
+lui = Luiseño
 lun = Lunda
-luo = Luo
+luo = Luo (Kenya and Tanzania)
 lus = Lushai
 mac = Macedonian
 mad = Madurese
@@ -297,81 +298,81 @@ mak = Makasar
 mal = Malayalam
 man = Mandingo
 mao = Maori
-map = Austronesian
+map = Austronesian (Other)
 mar = Marathi
-mas = Masai
+mas = Maasai
 may = Malay
 mdf = Moksha
 mdr = Mandar
 men = Mende
-mga = Middle Irish
-mic = Mi-kmaq
+mga = Irish, Middle (ca. 1100-1550)
+mic = Micmac
 min = Minangkabau
-mkh = Mon-Khmer
+mkh = Mon-Khmer (Other)
 mlg = Malagasy
 mlt = Maltese
 mnc = Manchu
 mni = Manipuri
-mno = Manobo
+mno = Manobo languages
 moh = Mohawk
 mol = Moldavian
 mon = Mongolian
-mos = Mossi
-mun = Munda
+mos = Mooré
+mun = Munda (Other)
 mus = Creek
 mwl = Mirandese
 mwr = Marwari
-myn = Mayan
+myn = Mayan languages
 myv = Erzya
 nah = Nahuatl
-nai = North American Indian
-nap = Neapolitan
+nai = North American Indian (Other)
+nap = Neapolitan Italian
 nau = Nauru
 nav = Navajo
-nbl = Ndebele
-nde = North Ndebele
+nbl = Ndebele (South Africa)
+nde = Ndebele (Zimbabwe)
 ndo = Ndonga
 nds = Low German
 nep = Nepali
-new = Nepal Bhasa
+new = Newari
 ngf = Trans-New Guinea
 nia = Nias
-nic = Niger-Kordofanian
+nic = Niger-Kordofanian (Other)
 niu = Niuean
-nno = Norwegian Nynorsk
-nob = Norwegian Bokmål
+nno = Norwegian (Nynorsk)
+nob = Norwegian (Bokmål)
 nog = Nogai
 non = Old Norse
 nor = Norwegian
 nqo = N'Ko
-nso = Pedi
-nub = Nubian
-nwc = Classical Newari
-nya = Chichewa
+nso = Northern Sotho
+nub = Nubian languages
+nwc = Newari, Old
+nya = Nyanja
 nym = Nyamwezi
 nyn = Nyankole
 nyo = Nyoro
 nzi = Nzima
-oci = Occitan
+oci = Occitan (post-1500)
 oji = Ojibwa
 omq = Oto-Manguean
 omv = Omotic
 ori = Oriya
 orm = Oromo
 osa = Osage
-oss = Ossetian
-ota = Ottoman Turkish
-oto = Otomian
-paa = Papuan
+oss = Ossetic
+ota = Turkish, Ottoman
+oto = Otomian languages
+paa = Papuan (Other)
 pag = Pangasinan
 pal = Pahlavi
 pam = Pampanga
 pan = Panjabi
 pap = Papiamento
 pau = Palauan
-peo = Old Persian
+peo = Old Persian (ca. 600-400 B.C.)
 per = Persian
-phi = Philippine
+phi = Philippine (Other)
 phn = Phoenician
 plf = Central Malayo-Polynesian
 pli = Pali
@@ -382,7 +383,7 @@ poz = Malayo-Polynesian
 pqe = Eastern Malayo-Polynesian
 pqw = Western Malayo-Polynesian
 pra = Prakrit languages
-pro = Old Provençal
+pro = Provençal (to 1500)
 pus = Pushto
 que = Quechua
 qwe = Quechuan
@@ -390,42 +391,42 @@ raj = Rajasthani
 rap = Rapanui
 rar = Rarotongan
 rcf = Reunionese, Reunion Creole
-roa = Romance
-roh = Romansh
-rom = Romany
+roa = Romance (Other)
+roh = Raeto-Romance
+rom = Romani
 rum = Romanian
 run = Rundi
 rup = Aromanian
 rus = Russian
 sad = Sandawe
-sag = Sango
+sag = Sango (Ubangi Creole)
 sah = Yakut
-sai = South American Indian
-sal = Salishan
+sai = South American Indian (Other)
+sal = Salishan languages
 sam = Samaritan Aramaic
 san = Sanskrit
 sas = Sasak
 sat = Santali
 scc = Serbian
-scn = Sicilian
+scn = Sicilian Italian
 sco = Scots
 scr = Croatian
 sdv = Eastern Sudanic
 sel = Selkup
-sem = Semitic
-sga = Old Irish
-sgn = Sign Language
+sem = Semitic (Other)
+sga = Irish, Old (to 1100)
+sgn = Sign languages
 shn = Shan
 sid = Sidamo
-sin = Sinhala
-sio = Siouan
-sit = Sino-Tibetan
-sla = Slavic
+sin = Sinhalese
+sio = Siouan (Other)
+sit = Sino-Tibetan (Other)
+sla = Slavic (Other)
 slo = Slovak
 slv = Slovenian
 sma = Southern Sami
 sme = Northern Sami
-smi = Sami languages
+smi = Sami
 smj = Lule Sami
 smn = Inari Sami
 smo = Samoan
@@ -436,57 +437,58 @@ snk = Soninke
 sog = Sogdian
 som = Somali
 son = Songhai
-sot = Southern Sotho
+sot = Sotho
 spa = Spanish
 sqi = Albanian
 srd = Sardinian
-srn = Sranan Tongo
+srn = Sranan
+srp = Serbian
 srr = Serer
-ssa = Nilo-Saharan
-ssw = Swati
+ssa = Nilo-Saharan (Other)
+ssw = Swazi
 suk = Sukuma
 sun = Sundanese
 sus = Susu
 sux = Sumerian
 swa = Swahili
 swe = Swedish
-syc = Classical Syriac
+syc = Syriac
 syd = Samoyedic
-syr = Syriac
+syr = Syriac, Modern
 tah = Tahitian
-tai = Tai
+tai = Tai (Other)
 tam = Tamil
 tat = Tatar
 tbq = Tibeto-Burman
 tel = Telugu
-tem = Timne
-ter = Tereno
+tem = Temne
+ter = Terena
 tet = Tetum
 tgk = Tajik
 tgl = Tagalog
 tha = Thai
 tib = Tibetan
-tig = Tigre
+tig = Tigré
 tir = Tigrinya
 tiv = Tiv
-tkl = Tokelau
-tlh = Klingon
+tkl = Tokelauan
+tlh = Klingon (Artificial language)
 tli = Tlingit
 tmh = Tamashek
-tog = Tonga
-ton = Tonga
-tpi = Tok
+tog = Tonga (Nyasa)
+ton = Tongan
+tpi = Tok Pisin
 trk = Turkic
 tsi = Tsimshian
 tsn = Tswana
 tso = Tsonga
 tuk = Turkmen
 tum = Tumbuka
-tup = Tupi
+tup = Tupi languages
 tur = Turkish
-tut = Altaic
+tut = Altaic (Other)
 tuw = Tungus
-tvl = Tuvalu
+tvl = Tuvaluan
 twi = Twi
 tyv = Tuvinian
 udm = Udmurt
@@ -503,25 +505,25 @@ ven = Venda
 vie = Vietnamese
 vol = Volapük
 vot = Votic
-wak = Wakashan
-wal = Walamo
+wak = Wakashan languages
+wal = Wolayta
 war = Waray
-was = Washo
+was = Washoe
 wel = Welsh
-wen = Sorbian
+wen = Sorbian (Other)
 wln = Walloon
 wol = Wolof
-xal = Kalmyk
+xal = Oirat
 xgn = Mongolian
 xho = Xhosa
 xnd = Na-Dene
-yao = Yao
+yao = Yao (Africa)
 yap = Yapese
 yid = Yiddish
 yor = Yoruba
-ypk = Yupik
+ypk = Yupik languages
 zap = Zapotec
-zbl = Blissymbols
+zbl = Blissymbolics
 zen = Zenaga
 zgh = Tamazight
 zha = Zhuang
@@ -529,11 +531,11 @@ zhx = Chinese
 zle = East Slavic
 zls = South Slavic
 zlw = West Slavic
-znd = Zande
+znd = Zande languages
 zul = Zulu
 zun = Zuni
 zza = Zaza
 zxx = No linguistic content
 ??? = Unknown
-mul = Multiple
-mis = Unknown
+mul = Multiple languages
+mis = Miscellaneous languages