[jsword-svn] r1928 - in trunk: common/src/main/java/org/crosswire/common/icu common/src/main/java/org/crosswire/common/util common-swing/src/main/java/org/crosswire/common/swing jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/study jsword/src/main/java/org/crosswire/jsword/book/sword

dmsmith at crosswire.org dmsmith at crosswire.org
Sun Feb 22 10:57:50 MST 2009 

Author: dmsmith
Date: 2009-02-22 10:57:49 -0700 (Sun, 22 Feb 2009)
New Revision: 1928

Modified:
   trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
   trunk/common/src/main/java/org/crosswire/common/icu/NumberShaper.java
   trunk/common/src/main/java/org/crosswire/common/util/Language.java
   trunk/common/src/main/java/org/crosswire/common/util/iso639_all.txt
   trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java
Log:
Made JSword honor the SWORD Direction attribute in the book's conf.

Modified: trunk/common/src/main/java/org/crosswire/common/icu/NumberShaper.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/icu/NumberShaper.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/common/src/main/java/org/crosswire/common/icu/NumberShaper.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -39,7 +39,7 @@
  * This shaper has special behavior for Arabic numbers that are in the form "12:34"
  * as this is taken as chapter:verse. Normally, a ':' is treated as a numeric
  * separator, this results in "12:34", but for verses it should be "34:12".
- * That is, Arabic, numbers are left-to-right (even though the rest of the language
+ * That is, Arabic, numbers are left-to-right (even though the rest of the script
  * is right-to-left) and the ':' as a numeric separator does not change that.
  * So to get around this we mark the ':' as a right-to-left character.
  * </p>
@@ -301,9 +301,9 @@
     }
 
     /**
-     * Establish nine for the language. There are languages that don't have zeroes.
+     * Establish nine for the script. There are scripts that don't have zeroes.
      * 
-     * @return the representation for 9 in the language
+     * @return the representation for 9 in the script
      */
     private char getNine()
     {

Modified: trunk/common/src/main/java/org/crosswire/common/util/Language.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Language.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/common/src/main/java/org/crosswire/common/util/Language.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -80,12 +80,16 @@
 
     /**
      * Determine whether this language is a Left-to-Right or a Right-to-Left language.
+     * Note: This is problematic. Languages do not have direction. Scripts do. Further,
+     * there are over 7000 living languages, many of which are written in Right-to-Left
+     * scripts and are not listed here.
      * @return true if the language is Left-to-Right.
      */
     public boolean isLeftToRight()
     {
         if (!knowsDirection)
         {
+            // TODO(DMS): Improve this.
             ltor = !("he".equals(code)  || //$NON-NLS-1$ Hebrew
                      "ar".equals(code)  || //$NON-NLS-1$ Arabic
                      "fa".equals(code)  || //$NON-NLS-1$ Farsi/Persian

Modified: trunk/common/src/main/java/org/crosswire/common/util/iso639_all.txt
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/iso639_all.txt	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/common/src/main/java/org/crosswire/common/util/iso639_all.txt	2009-02-22 17:57:49 UTC (rev 1928)
@@ -1,23 +1,20 @@
-#This is generated from http://www.sil.org/iso639-3/iso-dis-639-3_20060421.tab
-# Using
-#  #!/usr/bin/perl
-#  while (<>)
-#  {
-#          chomp();
-#          next if (/^$/o);
-#          my @line = split(/\t/o, $_);
-#          print "$line[2]=$line[5]\n" if ($line[2]);
-#          print "$line[0]=$line[5]\n";
-#  }
-# then sorting it with:
-#  sort -t = -k 2
-# and then finally running it through
-#  native2ascii
-# The catalog iso639 changes frequently. Rebuild this file as the need arises.
+# This file is generated see README.txt for details.
 
-aiz=Aari
-aay=Aariya
-aas=Aas\u00e1x
+oun=!O!ung
+nmn=!X\u221a\u2265\u221a\u00b5
+alu='Are'are
+kud='Auhelawa
+hnh=//Ani
+gnk=//Gana
+xeg=//Xegwi
+gwj=/Gwi
+xam=/Xam
+huc==/Hua
+aue==/Kx'au//'ein
+aot=A'tong
+apq=A-Pucikwar
+aiw=Aari
+aas=Aas\u221a\u00b0x
 kbt=Abadi
 abg=Abaga
 abf=Abai Sungai
@@ -25,62 +22,65 @@
 mij=Abar
 aau=Abau
 abq=Abaza
-aba=Ab\u00e9
+abp=Abenlen Ayta
 abi=Abidji
 bsa=Abinomn
 axb=Abipon
 ash=Abishira
 ab=Abkhazian
 abk=Abkhazian
-aaq=Abnaki, Eastern
-abe=Abnaki, Western
 aob=Abom
 abo=Abon
 abr=Abron
 ado=Abu
+aah=Abu' Arapesh
 abn=Abua
 abz=Abui
 kgr=Abun
-abl=Abung
 abu=Abure
 mgj=Abureni
+aba=Ab\u221a\u00a9
+tpx=Acatepec Me'phaa
 aca=Achagua
 acn=Achang
-guq=Ach\u00e9
+yif=Ache
 acz=Acheron
-acc=Ach\u00ed, Cubulco
+acr=Achi
 ace=Achinese
-acr=Ach\u00ed, Rabinal
 act=Achterhoeks
 acu=Achuar-Shiwiar
 acv=Achumawi
-acp=Acipa, Eastern
-awc=Acipa, Western
+guq=Ach\u221a\u00a9
 ach=Acoli
-acs=Acro\u00e1
+acs=Acro\u221a\u00b0
 adb=Adabe
 xad=Adai
+fub=Adamawa Fulfulde
 ads=Adamorobe Sign Language
 adn=Adang
 adq=Adangbe
 ada=Adangme
 adp=Adap
+tiu=Adasen
 ade=Adele
 adh=Adhola
 adi=Adi
-adl=Adi, Galo
 adj=Adioukrou
+ort=Adivasi Oriya
+gas=Adiwasi Garasia
+adt=Adnyamathanha
 adr=Adonara
 adu=Aduge
-ady=Adyghe; Adygei
-adt=Adynyamathanha
-azr=Adzera
+ady=Adyghe
+adz=Adzera
+aez=Aeka
 awi=Aekyom
 xae=Aequian
 aeq=Aer
 aal=Afade
 aa=Afar
 aar=Afar
+afg=Afghan Sign Language
 aft=Afitti
 afh=Afrihili
 af=Afrikaans
@@ -92,41 +92,29 @@
 avo=Agavotaguerra
 agq=Aghem
 ahh=Aghu
+ggr=Aghu Tharnggalu
 agx=Aghul
-ggr=Aghu Tharnggalu
 xag=Aghwan
 aif=Agi
 kit=Agob
 ibm=Agoi
-dul=Agta, Alabat Island
-abd=Agta, Camarines Norte
-dgc=Agta, Casiguran Dumagat
-agt=Agta, Central Cagayan
-duy=Agta, Dicamay
-duo=Agta, Dupaninan
-agk=Agta, Isarog
-atl=Agta, Mt. Iraya
-agz=Agta, Mt. Iriga
-agv=Agta, Remontado
-due=Agta, Umiray Dumaget
-dyg=Agta, Villa Viciosa
 agu=Aguacateco
 aga=Aguano
 agr=Aguaruna
 aug=Aguna
+msm=Agusan Manobo
 agn=Agutaynen
 yay=Agwagwune
-ahn=\u00c0h\u00e0n
 aha=Ahanta
-ahe=Ahe
 thm=Aheu
 ahr=Ahirani
 aho=Ahom
 aht=Ahtena
+nfd=Ahwai
 aih=Ai-Cham
-aix=Aigon
+aix=Aighon
+tba=Aikan\u221a\u00a3
 mwg=Aiklep
-mzf=Aiku
 aiq=Aimaq
 ail=Aimele
 aim=Aimol
@@ -136,14 +124,11 @@
 aki=Aiome
 air=Airoran
 aio=Aiton
-ahp=Aizi, Aproumu
-ahm=Aizi, Mobumrin
-ahi=Aizi, Tiagbamrin
 ajg=Aja (Benin)
 aja=Aja (Sudan)
 ajw=Ajawa
-aji=Aji\u00eb
-cpc=Ajy\u00edninka Apurucayali
+aji=Aji\u221a\u00b4
+cpc=Ajy\u221a\u2260ninka Apurucayali
 akq=Ak
 soh=Aka
 abj=Aka-Bea
@@ -153,17 +138,19 @@
 akx=Aka-Kede
 aky=Aka-Kol
 ack=Aka-Kora
+ak=Akan
 aka=Akan
-ak=Akan
 acl=Akar-Bale
 aks=Akaselem
 ake=Akawaio
 aik=Ake
 keu=Akebu
 tsr=Akei
+aeu=Akeu
 ahk=Akha
 akv=Akhvakh
 akk=Akkadian
+sia=Akkala Sami
 akl=Aklanon
 akt=Akolet
 bss=Akoose
@@ -175,98 +162,104 @@
 aku=Akum
 ako=Akurio
 akw=Akwa
-alw=Alaba
+syy=Al-Sayyid Bedouin Sign Language
+alw=Alaba-K\u201a\u00c4\u00f4abeena
 akz=Alabama
+dul=Alabat Island Agta
+mim=Alacatlatzala Mixtec
 ala=Alago
 wbj=Alagwa
 alk=Alak
 amp=Alamblak
 alj=Alangan
 xln=Alanic
-alx=Alatil
+apv=Alapmunte
 alh=Alawa
 sq=Albanian
 sqi=Albanian
-aae=Albanian, Arb\u00ebresh\u00eb
-aat=Albanian, Arvanitika
-aln=Albanian, Gheg
-als=Albanian, Tosk
+bhk=Albay Bicolano
+xta=Alcozauca Mixtec
 alf=Alege
 gah=Alekano
 ale=Aleut
-mud=Aleut, Mednyj
+arq=Algerian Arabic
+aao=Algerian Saharan Arabic
 asp=Algerian Sign Language
 alq=Algonquin
 aiy=Ali
 ald=Alladian
 all=Allar
 aid=Alngith
+ypo=Alo Phola
 aol=Alor
+zaq=Alo\u221a\u00b0pam Zapotec
 aes=Alsea
-atv=Altai, Northern
-alt=Altai, Southern
-aqn=Alta, Northern
-agy=Alta, Southern
+xua=Alu Kurumba
+aub=Alugu
 aab=Alumu-Tesu
 alp=Alune
+yna=Aluo
 alz=Alur
 alr=Alutor
 avd=Alviri-Vidari
 aly=Alyawarr
+amm=Ama (Papua New Guinea)
+nyi=Ama (Sudan)
 amq=Amahai
 amc=Amahuaca
 ali=Amaimon
 aad=Amal
-ryn=Amami-Oshima, Northern
-ams=Amami-Oshima, Southern
 amn=Amanab
-ama=Amanay\u00e9
-amd=Amap\u00e1 Creole
-amm=Ama (Papua New Guinea)
+ama=Amanay\u221a\u00a9
 aie=Amara
 amg=Amarag
 amr=Amarakaeri
 aaz=Amarasi
-nyi=Ama (Sudan)
-omb=Ambae, East
-nnd=Ambae, West
+zpo=Amatl\u221a\u00b0n Zapotec
+utp=Amba (Solomon Islands)
+rwm=Amba (Uganda)
 amk=Ambai
 aew=Ambakich
-utp=Amba (Solomon Islands)
-rwm=Amba (Uganda)
+abc=Ambala Ayta
 amv=Ambelau
 ael=Ambele
 alm=Amblong
 amb=Ambo
-mmg=Ambrym, North
-tvk=Ambrym, Southeast
+qva=Ambo-Pasco Quechua
+abs=Ambonese Malay
+aag=Ambrak
 abt=Ambulas
 amj=Amdang
+adx=Amdo Tibetan
 aey=Amele
-aex=Amerax
 ase=American Sign Language
+ifa=Amganad Ifugao
 am=Amharic
 amh=Amharic
 amy=Ami
-akn=Amikoana
 ami=Amis
-ais=Amis, Nataoran
 amo=Amo
+alx=Amol
+mbz=Amoltepec Mixtec
 apg=Ampanang
-ajz=Amri
+ajz=Amri Karbi
 amt=Amto
 adw=Amundava
-amu=Amuzgo, Guerrero
-azm=Amuzgo, Ipalapa
-azg=Amuzgo, San Pedro Amuzgos
+dti=Ana Tinga Dogon
 anw=Anaang
 akg=Anakalangu
 anm=Anal
 pda=Anam
-aan=Anamb\u00e9
+aan=Anamb\u221a\u00a9
 imi=Anamgura
 bpo=Anasi
-acb=\u00c1nc\u00e1
+grc=Ancient Greek (to 1453)
+hbo=Ancient Hebrew
+xmk=Ancient Macedonian
+xna=Ancient North Arabian
+xzp=Ancient Zapotec
+afd=Andai
+xaa=Andalusian Arabic
 hca=Andaman Creole Hindi
 ana=Andaqui
 aod=Andarum
@@ -281,17 +274,20 @@
 anz=Anem
 aby=Aneme Wake
 myo=Anfillo
-agm=Angaatiha
+agm=Angaataha
 age=Angal
 aoe=Angal Enen
 akh=Angal Heneng
+njm=Angami Naga
+yli=Angguruk Yali
 anp=Angika
 xno=Anglo-Norman
 rme=Angloromani
 aoa=Angolar
 agg=Angor
 aog=Angoram
-hnh=//Ani
+tnd=Angosturas Tunebo
+ypn=Ani Phowa
 blo=Anii
 anf=Animere
 aoi=Anindilyakwa
@@ -302,6 +298,7 @@
 ans=Anserma
 and=Ansus
 ant=Antakarinya
+xmv=Antankarana Malagasy
 aig=Antigua and Barbuda Creole English
 anl=Anu
 anu=Anuak
@@ -311,75 +308,31 @@
 aud=Anuta
 any=Anyin
 mtb=Anyin Morofo
+njo=Ao Naga
 pni=Aoheng
 aor=Aore
-apj=Apache, Jicarilla
-apk=Apache, Kiowa
-apl=Apache, Lipan
-apm=Apache, Mescalero-Chiricahua
-apw=Apache, Western
+kbx=Ap Ma
 xap=Apalachee
-apy=Apala\u00ed
+apy=Apala\u221a\u2260
 ena=Apali
 apo=Apalik
+mip=Apasco-Apoala Mixtec
 apt=Apatani
-api=Apiac\u00e1
-apn=Apinay\u00e9
+api=Apiak\u221a\u00b0
+apn=Apinay\u221a\u00a9
 app=Apma
-kbx=Ap Ma
-apq=A-Pucikwar
-apu=Apurin\u00e3
+ahp=Aproumu Aizi
+apu=Apurin\u221a\u00a3
 apx=Aputai
 xaq=Aquitanian
 ard=Arabana
 arl=Arabela
+ar=Arabic
 ara=Arabic
-ar=Arabic
-aao=Arabic, Algerian Saharan Spoken
-arq=Arabic, Algerian Spoken
-bbz=Arabic, Babalia Creole
-abv=Arabic, Baharna Spoken
-shu=Arabic, Chadian Spoken
-acy=Arabic, Cypriot Spoken
-adf=Arabic, Dhofari Spoken
-avl=Arabic, Eastern Egyptian Bedawi Spoken
-arz=Arabic, Egyptian Spoken
-afb=Arabic, Gulf Spoken
-ayh=Arabic, Hadrami Spoken
-acw=Arabic, Hijazi Spoken
-yhd=Arabic, Judeo-Iraqi
-aju=Arabic, Judeo-Moroccan
-yud=Arabic, Judeo-Tripolitanian
-ajt=Arabic, Judeo-Tunisian
-jye=Arabic, Judeo-Yemeni
-ayl=Arabic, Libyan Spoken
-acm=Arabic, Mesopotamian Spoken
-ary=Arabic, Moroccan Spoken
-ars=Arabic, Najdi Spoken
-apc=Arabic, North Levantine Spoken
-ayp=Arabic, North Mesopotamian Spoken
-acx=Arabic, Omani Spoken
-aec=Arabic, Saidi Spoken
-ayn=Arabic, Sanaani Spoken
-ssh=Arabic, Shihhi Spoken
-ajp=Arabic, South Levantine Spoken
-arb=Arabic, Standard
-pga=Arabic, Sudanese Creole
-apd=Arabic, Sudanese Spoken
-acq=Arabic, Ta'izzi-Adeni Spoken
-abh=Arabic, Tajiki Spoken
-aeb=Arabic, Tunisian Spoken
-auz=Arabic, Uzbeki Spoken
-arf=Arafundi
 an=Aragonese
 arg=Aragonese
-mhv=Arakanese
 akr=Araki
 atq=Aralle-Tabulahan
-arc=Aramaic
-oar=Aramaic, Old
-sam=Aramaic, Samaritan
-tmr=Aramaic, Talmudic
 aam=Aramanik
 stk=Arammba
 aaf=Aranadan
@@ -388,31 +341,29 @@
 aro=Araona
 arp=Arapaho
 arj=Arapaso
-aon=Arapesh, Bumbita
-axg=Ar\u00e1ra, Mato Grosso
-aap=Ar\u00e1ra, Par\u00e1
-arn=Araucanian
 arw=Arawak
-awt=Arawet\u00e9
+awt=Arawet\u221a\u00a9
 awm=Arawum
 arv=Arbore
+aae=Arb\u221a\u00b4resh\u221a\u00b4 Albanian
 aqc=Archi
+pka=Ardham\u0192\u00c5gadh\u0192\u00b4 Pr\u0192\u00c5krit
 mwc=Are
-alu='Are'are
 aea=Areba
 aem=Arem
+qxu=Arequipa-La Uni\u221a\u2265n Quechua
 aed=Argentine Sign Language
 agj=Argobba
 agf=Arguni
-aqr=Arh\u00e2
-aok=Arh\u00f6
 arh=Arhuaco
+aqr=Arh\u221a\u00a2
+aok=Arh\u221a\u2202
 aac=Ari
 laz=Aribwatsa
 ylu=Aribwaung
 aai=Arifama-Miniafia
 aqg=Arigidi
-ark=Arikap\u00fa
+ark=Arikap\u221a\u222b
 ari=Arikara
 ait=Arikem
 xrn=Arin
@@ -421,39 +372,30 @@
 xrm=Armazic
 hy=Armenian
 hye=Armenian
-xcl=Armenian, Classical
-axm=Armenian, Middle
 aen=Armenian Sign Language
-apr=Arop-Lukep
+apr=Arop-Lokep
 aps=Arop-Sissano
 aia=Arosi
-are=Arrarnta, Western
-aer=Arrernte, Eastern
 atz=Arta
-aru=Arua
-arx=Aru\u00e1
 msy=Aruamu
 aur=Aruek
 lsr=Aruop
 atx=Arutani
+aru=Aru\u221a\u00b0 (Amazonas State)
+arx=Aru\u221a\u00b0 (Rodonia State)
+aat=Arvanitika Albanian
 asz=As
 mtv=Asaro'o
 asd=Asas
-cni=Ash\u00e1ninka
 ahs=Ashe
-cjo=Ash\u00e9ninka Pajonal
-prq=Ash\u00e9ninka Peren\u00e9
-cpu=Ash\u00e9ninka, Pichis
-cpy=Ash\u00e9ninka, South Ucayali
-cpb=Ash\u00e9ninka, Ucayali-Yur\u00faa
 ask=Ashkun
+csh=Asho Chin
 atn=Ashtiani
+cni=Ash\u221a\u00b0ninka
+cjo=Ash\u221a\u00a9ninka Pajonal
+prq=Ash\u221a\u00a9ninka Peren\u221a\u00a9
 asl=Asilulu
 eiv=Askopan
-asc=Asmat, Casuarina Coast
-cns=Asmat, Central
-nks=Asmat, North
-asy=Asmat, Yaosakor
 asv=Asoa
 as=Assamese
 asm=Assamese
@@ -461,16 +403,18 @@
 sjg=Assangori
 asb=Assiniboine
 aii=Assyrian Neo-Aramaic
-ast=Asturian; Bable
+ast=Asturian
+aum=Asu (Nigeria)
+asa=Asu (Tanzania)
+psa=Asue Awyu
 aua=Asumboa
-aum=Asu (Nigeria)
+zoo=Asunci\u221a\u2265n Mixtepec Zapotec
 asr=Asuri
-asu=Asurin\u00ed
-asn=Asurin\u00ed, Xing\u00fa
-asa=Asu (Tanzania)
 atm=Ata
+atd=Ata Manobo
 aqp=Atakapa
 amz=Atampaya
+mib=Atatl\u221a\u00b0huca Mixtec
 tay=Atayal
 ate=Atemble
 aph=Athpariya
@@ -478,106 +422,96 @@
 atj=Atikamekw
 aqm=Atohwaim
 ato=Atong
-aot=A'tong
 aox=Atorada
-atr=Atruah\u00ed
 atc=Atsahuaca
 cch=Atsam
 atw=Atsugewi
-azt=Atta, Faire
-att=Atta, Pamplona
-atp=Atta, Pudtol
-ati=Atti\u00e9
-atf=Atuence
+pkr=Attapady Kurumba
+ati=Atti\u221a\u00a9
+ocu=Atzingo Matlatzinca
 avt=Au
-kud='Auhelawa
 djk=Aukan
 aul=Aulua
-aux=Aur\u00e1
+aux=Aur\u221a\u00b0
 auh=Aushi
 avs=Aushiri
 aut=Austral
 asw=Australian Aborigines Sign Language
 asf=Australian Sign Language
 asq=Austrian Sign Language
-auv=Auvergnat
 smf=Auwe
 auu=Auye
 auo=Auyokawa
-avv=Av\u00e1-Canoeiro
+av=Avaric
 ava=Avaric
-av=Avaric
-oav=Avar, Old
 avn=Avatime
 avb=Avau
 ae=Avestan
 ave=Avestan
 avi=Avikam
 avu=Avokaya
-awb=Awa
+avv=Av\u221a\u00b0-Canoeiro
+vwa=Awa (China)
+awb=Awa (Papua New Guinea)
+kwi=Awa-Cuaiquer
 awk=Awabakal
-kwi=Awa-Cuaiquer
 bcu=Awad Bing
 awa=Awadhi
 awo=Awak
 aya=Awar
 awx=Awara
 awh=Awbono
+bob=Aweer
 awr=Awera
-awe=Awet\u00ed
+awe=Awet\u221a\u2260
 azo=Awing
 auy=Awiyaana
 auj=Awjilah
 awn=Awngi
 kmn=Awtuw
+yiu=Awu
 aww=Awun
 afu=Awutu
 auw=Awyi
-psa=Awyu, Asue
-awu=Awyu, Central
-awy=Awyu, Edera
-awv=Awyu, Jair
-yir=Awyu, North
-aws=Awyu, South
 ahb=Axamb
+yix=Axi Yi
 ayd=Ayabadhu
+quy=Ayacucho Quechua
+vmy=Ayautla Mazatec
 aye=Ayere
 ayx=Ayi (China)
 ayq=Ayi (Papua New Guinea)
 nfl=Ayiwo
+yyz=Ayizi
+ayb=Ayizo Gbe
 ay=Aymara
 aym=Aymara
-ayr=Aymara, Central
-ayc=Aymara, Southern
+zaf=Ayoquesco Zapotec
 ayo=Ayoreo
-abp=Ayta, Abenlen
-abc=Ayta, Ambala
-ayt=Ayta, Bataan
-sgb=Ayta, Mag-Anchi
-blx=Ayta, Mag-Indi
-ays=Ayta, Sorsogon
-ayy=Ayta, Tayabas
 ayu=Ayu
+miy=Ayutla Mixtec
 az=Azerbaijani
 aze=Azerbaijani
-azj=Azerbaijani, North
-azb=Azerbaijani, South
+aza=Azha
+yiz=Azhe
+tpc=Azoy\u221a\u222b Me'phaa
 bvj=Baan
 bqx=Baangi
 bba=Baatonum
 bbw=Baba
+mbf=Baba Malay
+bbz=Babalia Creole Arabic
 bbm=Babango
 bbk=Babanki
-bcd=Babar, North
-vbb=Babar, Southeast
 baa=Babatana
 bcr=Babine
 bzg=Babuza
 bcy=Bacama
+btj=Bacanese Malay
 xbc=Bactrian
-bfq=Badaga
 bhz=Bada (Indonesia)
 bau=Bada (Nigeria)
+bfq=Badaga
 bde=Bade
 bdz=Badeshi
 bia=Badimaya
@@ -596,16 +530,19 @@
 bmd=Baga Manduri
 bgm=Baga Mboteni
 bsp=Baga Sitemu
-bsv=Baga Soban\u00e9
+bsv=Baga Soban\u221a\u00a9
 bfy=Bagheli
 bmi=Bagirmi
+fui=Bagirmi Fulfulde
 bqg=Bago-Kusuntu
 bgq=Bagri
 bpi=Bagupi
 bqb=Bagusa
 kva=Bagvalal
+yha=Baha Buyang
 bdw=Baham
 bah=Bahamas Creole English
+abv=Baharna Arabic
 bhv=Bahau
 bjh=Bahinemo
 bhj=Bahing
@@ -613,50 +550,45 @@
 bsu=Bahonsuai
 bdj=Bai
 bbf=Baibai
-bca=Bai, Central
 bkx=Baikeno
 bqh=Baima
 bmx=Baimak
-bfc=Bai, Northern
 bcz=Bainouk-Gunyaamolo
-bab=Bainouk-Gunyu\u00f1o
+bab=Bainouk-Gunyu\u221a\u00b1o
 bcb=Bainouk-Samik
 bsw=Baiso
-bfs=Bai, Southern
+fah=Baissa Fali
 bjs=Bajan
-bdl=Bajau, Indonesian
-bdr=Bajau, West Coast
 bjm=Bajelani
 bkc=Baka (Cameroon)
-bkq=Bakair\u00ed
+bdh=Baka (Sudan)
+bkq=Bakair\u221a\u2260
 bqz=Bakaka
-bdh=Baka (Sudan)
 bqi=Bakhtiari
 bki=Baki
 bkh=Bakoko
 kme=Bakole
 bbs=Bakpinka
 bkr=Bakumpai
-bjw=Bakw\u00e9
+bjw=Bakw\u221a\u00a9
 bls=Balaesang
 blw=Balangao
 sse=Balangingi
 bjt=Balanta-Ganja
+ble=Balanta-Kentohe
 blz=Balantak
-ble=Balanta-Kentohe
 blg=Balau
 bdn=Baldemu
 bcp=Bali (Democratic Republic of Congo)
+bcn=Bali (Nigeria)
 ban=Balinese
-bcn=Bali (Nigeria)
-bqy=Bali Sign Language
+mhp=Balinese Malay
 bgx=Balkan Gagauz Turkish
+rmn=Balkan Romani
 bqo=Balo
-bgp=Balochi, Eastern
-bcc=Balochi, Southern
-bgn=Balochi, Western
 biz=Baloi
 bft=Balti
+rml=Baltic Romani
 blq=Baluan-Pam
 bal=Baluchi
 bog=Bamako Sign Language
@@ -673,18 +605,16 @@
 bax=Bamun
 bvm=Bamunka
 bmg=Bamwe
+bfk=Ban Khor Sign Language
 bcw=Bana
+bjx=Banao Itneg
 byz=Banaro
-bnh=Banaw\u00e1
+bnd=Banda (Indonesia)
+bpq=Banda Malay
 liy=Banda-Bambari
 bpd=Banda-Banda
-bnd=Banda (Indonesia)
-bqk=Banda-Mbr\u00e8s
-bjo=Banda, Mid-Southern
-bfl=Banda-Nd\u00e9l\u00e9
-lnl=Banda, South Central
-tor=Banda, Togbo-Vara
-bbp=Banda, West Central
+bqk=Banda-Mbr\u221a\u00aes
+bfl=Banda-Nd\u221a\u00a9l\u221a\u00a9
 yaj=Banda-Yangere
 bza=Bandi
 bqj=Bandial
@@ -696,6 +626,8 @@
 bgz=Banggai
 bjb=Banggarla
 bni=Bangi
+dba=Bangi Me
+mfb=Bangka
 bgj=Bangolan
 bnx=Bangubangu
 bsj=Bangwinji
@@ -703,47 +635,47 @@
 bwi=Baniwa
 bjn=Banjar
 bxw=Bankagooma
-bfk=Ban Khor Sign Language
 abb=Bankon
 bcm=Bannoni
 bap=Bantawa
 bnq=Bantik
 bno=Bantoanon
-bci=Baoul\u00e9
+bci=Baoul\u221a\u00a9
+bhr=Bara Malagasy
 brd=Baraamu
 bbb=Barai
 baj=Barakai
+kys=Baram Kayan
 bbg=Barama
 brm=Barambu
 bmz=Baramu
 brp=Barapasi
 brs=Baras
-bsn=Barasana
+bsn=Barasana-Eduria
 bpb=Barbacoas
-boi=Barbare\u00f1o
+boi=Barbare\u221a\u00b1o
+gry=Barclayville Grebo
 bcj=Bardi
-bae=Bar\u00e9
 bva=Barein
-bpx=Bareli, Palya
-bfb=Bareli, Pauri
-bgd=Bareli, Rathwi
 mlp=Bargam
 bfa=Bari
-mot=Bar\u00ed
 bch=Bariai
 bjc=Bariji
 bxo=Barikanchi
 bjk=Barok
 bbi=Barombi
+tbn=Barro Negro Tunebo
 bpt=Barrow Point
 bjz=Baruga
 byr=Baruya
 bwg=Barwe
 bjf=Barzani Jewish Neo-Aramaic
+bae=Bar\u221a\u00a9
+mot=Bar\u221a\u2260
 bas=Basa (Cameroon)
+bzw=Basa (Nigeria)
 bsl=Basa-Gumna
 buj=Basa-Gurmana
-bzw=Basa (Nigeria)
 bdb=Basap
 byq=Basay
 bsg=Bashkardi
@@ -752,13 +684,13 @@
 bst=Basketo
 eu=Basque
 eus=Basque
-bqe=Basque, Navarro-Labourdin
-bsz=Basque, Souletin
 bsq=Bassa
 bsr=Bassa-Kontagora
 bsc=Bassari
 bsi=Bassossi
 bta=Bata
+ayt=Bataan Ayta
+ifb=Batad Ifugao
 bya=Batak
 btz=Batak Alas-Kluet
 akb=Batak Angkola
@@ -775,8 +707,10 @@
 bvt=Bati (Indonesia)
 bbl=Bats
 btu=Batu
+zbt=Batui
 bay=Batuley
 bbd=Bau
+sne=Bau Bidayuh
 bsf=Bauchi
 brg=Baure
 bge=Bauria
@@ -784,6 +718,8 @@
 bwk=Bauwaki
 bvz=Bauzi
 bar=Bavarian
+bgr=Bawm Chin
+mkq=Bay Miwok
 bjy=Bayali
 byg=Baygo
 byl=Bayono
@@ -797,6 +733,7 @@
 beb=Bebele
 bek=Bebeli
 bxp=Bebil
+tnr=Bedik
 bjv=Bedjond
 bed=Bedoanas
 bkf=Beeke
@@ -814,7 +751,6 @@
 bvi=Belanda Viri
 be=Belarusian
 bel=Belarusian
-bvs=Belgian Sign Language
 byw=Belhariya
 bey=Beli (Papua New Guinea)
 blm=Beli (Sudan)
@@ -824,9 +760,9 @@
 bmy=Bemba (Democratic Republic of Congo)
 bem=Bemba (Zambia)
 bmb=Bembe
-bef=Benabena
 yun=Bena (Nigeria)
 bez=Bena (Tanzania)
+bef=Benabena
 bcq=Bench
 bdp=Bende
 bct=Bendi
@@ -835,18 +771,17 @@
 ben=Bengali
 bn=Bengali
 bgy=Benggoi
-bke=Bengkulu
+bqy=Bengkala Sign Language
 bnu=Bentong
 byd=Benyadu'
 bue=Beothuk
 bie=Bepour
 brf=Bera
 bxv=Berakou
-lod=Berawan
+bve=Berau Malay
 brc=Berbice Creole Dutch
 bkl=Berik
 bit=Berinomo
-bdo=Bernde
 bom=Berom
 wti=Berta
 byt=Berti
@@ -857,11 +792,9 @@
 bew=Betawi
 byf=Bete
 btt=Bete-Bendi
-bev=B\u00e9t\u00e9, Daloa
-btg=B\u00e9t\u00e9, Gagnoa
-bet=B\u00e9te, Guiberoua
 btb=Beti (Cameroon)
-eot=Beti (C\u00f4te d'Ivoire)
+eot=Beti (C\u221a\u00a5te d'Ivoire)
+xub=Betta Kurumba
 kap=Bezhta
 bhd=Bhadrawahi
 bhx=Bhalay
@@ -874,20 +807,17 @@
 bhi=Bhilali
 bhb=Bhili
 bho=Bhojpuri
+nes=Bhoti Kinnauri
 bhu=Bhunjia
 bif=Biafada
 bhw=Biak
 beh=Biali
+bpv=Bian Marind
 big=Biangai
 byk=Biao
+bmt=Biao Mon
 bje=Biao-Jiao Mien
-bmt=Biao Mon
-bth=Biatah
-bhk=Bicolano, Albay
-bcl=Bicolano, Central
-bto=Bicolano, Iriga
-cts=Bicolano, Northern Catanduanes
-bln=Bicolano, Southern Catanduanes
+bth=Biatah Bidayuh
 bid=Bidiyo
 bym=Bidyara
 bjg=Bidyogo
@@ -895,6 +825,7 @@
 bnk=Bierebo
 brj=Bieria
 biu=Biete
+nmb=Big Nambas
 bhc=Biga
 bix=Bijori
 bic=Bikaru
@@ -906,19 +837,22 @@
 bpz=Bilba
 brz=Bilbil
 bil=Bile
+byn=Bilin
+bms=Bilma Kanuri
 bll=Biloxi
 blb=Bilua
 bxf=Bilur
 bhp=Bima
 bhl=Bimin
 bim=Bimoba
+byj=Bina (Nigeria)
+bmn=Bina (Papua New Guinea)
 bxz=Binahari
 bhg=Binandere
-byj=Bina (Nigeria)
-bmn=Bina (Papua New Guinea)
 bon=Bine
 bin=Bini
 bpj=Binji
+itb=Binongan Itneg
 bne=Bintauna
 bny=Bintulu
 bkd=Binukid
@@ -929,15 +863,10 @@
 btf=Birgit
 biy=Birhor
 bzr=Biri
-bfo=Birifor, Malba
-biv=Birifor, Southern
 bqq=Biritai
 brk=Birked
 bvq=Birri
 brl=Birwa
-bsb=Bisaya, Brunei
-bsy=Bisaya, Sabah
-bsd=Bisaya, Sarawak
 ije=Biseni
 bpy=Bishnupriya
 bwh=Bishuo
@@ -946,45 +875,45 @@
 bis=Bislama
 bir=Bisorio
 bib=Bissa
-bii=Bisu
+bzi=Bisu
 bgk=Bit
 brt=Bitare
 mcc=Bitur
 bwm=Biwat
 byo=Biyo
 bpm=Biyom
-bpr=Blaan, Koronadal
-bps=Blaan, Sarangani
 blp=Blablanga
 bfh=Blafe
 beu=Blagar
 blr=Blang
-byn=Blin; Bilin
+zbl=Blissymbols
+bgl=Bo (Laos)
+bpw=Bo (Papua New Guinea)
+mae=Bo-Rukul
+mux=Bo-Ung
 bzn=Boano (Maluku)
 bzl=Boano (Sulawesi)
-bbo=Bobo Madar\u00e9, Northern
-bwq=Bobo Madar\u00e9, Southern
 bgb=Bobongko
 bty=Bobot
 boy=Bodo (Central African Republic)
 brx=Bodo (India)
+gbj=Bodo Gadaba
 bdv=Bodo Parja
 bff=Bofi
 bvw=Boga
-bgh=Bogan
 boq=Bogaya
 bux=Boghom
 bqu=Boguru
 bhn=Bohtan Neo-Aramaic
 bzf=Boikin
-bus=Bokobaru
+ybk=Bokha
 bqc=Boko (Benin)
 bkp=Boko (Democratic Republic of Congo)
+bus=Bokobaru
 bdt=Bokoto
 bky=Bokyi
 bnp=Bola
 bld=Bolango
-bgl=Bo (Laos)
 bol=Bole
 xbo=Bolgarian
 bvo=Bolgo
@@ -1004,9 +933,12 @@
 zmx=Bomitaba
 bmq=Bomu
 bmw=Bomwali
+glc=Bon Gula
 peh=Bonan
 bou=Bondei
 bfw=Bondo
+kzc=Bondoukou Kulango
+dbu=Bondum Dom Dogon
 bna=Bonerate
 bnv=Bonerif
 bdg=Bonggi
@@ -1014,66 +946,62 @@
 bui=Bongili
 bot=Bongo
 bpu=Bongu
-glc=Bon Gula
-bob=Boni
 bok=Bonjo
 bvg=Bonkeng
 bop=Bonkiman
-bnc=Bontoc, Central
 bnb=Bookan
 bnl=Boon
 bvf=Boor
-bpw=Bo (Papua New Guinea)
 boa=Bora
+gax=Borana-Arsi-Guji Oromo
+kvn=Border Kuna
 gai=Borei
-bxx=Borna
-bwo=Boro
+fue=Borgu Fulfulde
+bxx=Borna (Democratic Republic of Congo)
+bwo=Boro (Ethiopia)
+xxb=Boro (Ghana)
 ksr=Borong
-bor=Bor\u00f4ro
 brn=Boruca
-mae=Bo-Rukul
+bor=Bor\u221a\u00a5ro
 bwf=Boselewa
 bqs=Bosngun
 bos=Bosnian
 bs=Bosnian
 bmj=Bote-Majhi
 bph=Botlikh
+sbl=Botolan Sambal
+nku=Bouna Kulango
 pcc=Bouyei
 bzo=Bozaba
-bzx=Bozo, Hainyaxo
-bze=Bozo, Jenaama
-boo=Bozo, Ti\u00e8ma Ci\u00e8w\u00e8
-boz=Bozo, Ti\u00e9yaxo
 aof=Bragat
 brh=Brahui
 bra=Braj
 bzs=Brazilian Sign Language
+kvl=Brek Karen
 buq=Brem
 brq=Breri
 br=Breton
 bre=Breton
-xbm=Breton, Middle
-obt=Breton, Old
 bzd=Bribri
 bzt=Brithenig
 bfi=British Sign Language
 bro=Brokkat
 sgt=Brokpake
 bkk=Brokskat
+plw=Brooke's Point Palawano
 bpl=Broome Pearling Lugger Pidgin
-bru=Bru, Eastern
 kxd=Brunei
-brv=Bru, Western
+bsb=Brunei Bisaya
 jid=Bu
+bwx=Bu-Nao Bunu
 bub=Bua
+cbl=Bualkhaw Chin
 box=Buamu
-mmo=Buang, Mangga
-bzh=Buang, Mapos
 bvb=Bube
 buw=Bubi
 bbx=Bubia
+stt=Budeh Stieng
 btp=Budibud
-tnr=Budik
 bdx=Budong-Budong
 buu=Budu
 bdk=Budukh
@@ -1088,9 +1016,10 @@
 bku=Buhid
 bxh=Buhutu
 byh=Bujhyal
-sdo=Bukar Sadong
+sdo=Bukar-Sadung Bidayuh
 bvk=Bukat
 bhh=Bukharic
+bvu=Bukit Malay
 bkn=Bukitan
 ape=Bukiyip
 tkb=Buksa
@@ -1103,10 +1032,12 @@
 bwu=Buli (Ghana)
 bzq=Buli (Indonesia)
 buy=Bullom So
+sti=Bulo Stieng
 bum=Bulu (Cameroon)
 bjl=Bulu (Papua New Guinea)
 bmv=Bum
 byp=Bumaji
+aon=Bumbita Arapesh
 kjz=Bumthangkha
 buv=Bun
 bvn=Buna
@@ -1118,95 +1049,92 @@
 but=Bungain
 bkz=Bungku
 wun=Bungu
-bwx=Bunu, Bu-Nao
-pnu=Bunu, Jiongnai
+dgb=Bunoge Dogon
 bnn=Bunun
-bwn=Bunu, Wunai
-buh=Bunu, Younuo
 blf=Buol
+bwr=Bura-Pabir
 bys=Burak
 bkg=Buraka
-bwr=Bura-Pabir
 bvr=Burarra
 bti=Burate
 bxn=Burduna
 bvh=Bure
 bua=Buriat
-bxu=Buriat, China
-bxm=Buriat, Mongolia
-bxr=Buriat, Russia
 bji=Burji
 vrt=Burmbar
+my=Burmese
 mya=Burmese
-my=Burmese
-obr=Burmese, Old
 bzu=Burmeso
+mhs=Buru (Indonesia)
+bqw=Buru (Nigeria)
 bry=Burui
-mhs=Buru (Indonesia)
+bmu=Burum-Mindik
 aip=Burumakok
-bmu=Burum-Mindik
 bdi=Burun
 bds=Burunge
-bqw=Buru (Nigeria)
 bsk=Burushaski
 bqr=Burusu
 asi=Buruwai
 bqp=Busa
 bxs=Busam
 bsm=Busami
+bfg=Busang Kayan
 buc=Bushi
 buf=Bushoong
 bso=Buso
 bup=Busoa
 dox=Bussa
 bju=Busuu
+kyb=Butbut Kalinga
 bnr=Butmas-Tur
 btw=Butuanon
 bhs=Buwal
-bxt=Buxinhua
 byy=Buya
-byu=Buyang
 byi=Buyu
+jiy=Buyuan Jinuo
 bww=Bwa
 bwd=Bwaidoka
-bwy=Bwamu, Cwi
-bwj=Bwamu, L\u00e1\u00e1 L\u00e1\u00e1
 tte=Bwanabwana
 bwa=Bwatoo
+bwe=Bwe Karen
 bwl=Bwela
 bwc=Bwile
 bwz=Bwisi
 bee=Byangsi
 mkk=Byep
+khd=B\u221a\u00a7di Kanum
+dri=C'lela
 msq=Caac
-cjp=Cab\u00e9car
-cbb=Cabiyar\u00ed
+cbb=Cabiyar\u221a\u2260
+cjp=Cab\u221a\u00a9car
+miu=Cacaloxtepec Mixtec
 ccr=Cacaopera
+roc=Cacgia Roglai
 cbv=Cacua
 cad=Caddo
 ccd=Cafundo Creole
 cbh=Cagua
 cah=Cahuarano
 chl=Cahuilla
+qvc=Cajamarca Quechua
+qvl=Cajatambo North Lima Quechua
+zad=Cajonos Zapotec
+frc=Cajun French
 ckx=Caka
-ckk=Cakchiquel, Acatenango Southwestern
-cak=Cakchiquel, Central
-cke=Cakchiquel, Eastern
-ckc=Cakchiquel, Northern
-ckz=Cakchiquel-Quich\u00e9 Mixed Language
-cki=Cakchiquel, Santa Mar\u00eda De Jes\u00fas
-ckj=Cakchiquel, Santo Domingo Xenacoj
-ckd=Cakchiquel, South Central
-ckf=Cakchiquel, Southern
-ckw=Cakchiquel, Western
-cbm=Cakchiquel, Yepocapa Southwestern
+ckz=Cakchiquel-Quich\u221a\u00a9 Mixed Language
 cky=Cakfem-Mushere
+tbk=Calamian Tagbanwa
+qud=Calder\u221a\u2265n Highland Quichua
 caw=Callawalla
-rmr=Cal\u00f3
 clu=Caluyanun
+rmr=Cal\u221a\u2265
+abd=Camarines Norte Agta
+mcu=Cameroon Mambila
+wes=Cameroon Pidgin
 rab=Camling
 cml=Campalagian
-kbh=Cams\u00e1
+sro=Campidanese Sardinian
+kbh=Cams\u221a\u00b0
 cmt=Camtho
 xcc=Camunic
 cbu=Candoshi-Shapra
@@ -1216,40 +1144,91 @@
 cov=Cao Miao
 kaq=Capanahua
 cps=Capiznon
+cpg=Cappadocian Greek
 cot=Caquinte
+caq=Car Nicobarese
 cfd=Cara
 cby=Carabayo
 crf=Caramanta
 cbc=Carapana
 xcr=Carian
-car=Carib
-crb=Carib, Island
+hns=Caribbean Hindustani
+jvn=Caribbean Javanese
 cbd=Carijona
 crr=Carolina Algonquian
 cal=Carolinian
+rmc=Carpathian Romani
 crx=Carrier
-caf=Carrier, Southern
-cru=Car\u00fatana
 cbr=Cashibo-Cacataibo
 cbs=Cashinahua
+dgc=Casiguran Dumagat Agta
+asc=Casuarina Coast Asmat
+mst=Cataelano Mandaya
 ca=Catalan
 cat=Catalan
-csc=Catalonian Sign Language
+csc=Catalan Sign Language
 chc=Catawba
 cca=Cauca
-cav=Cavine\u00f1a
+cav=Cavine\u221a\u00b1a
 cyb=Cayubaba
 cay=Cayuga
 xcy=Cayuse
+qxr=Ca\u221a\u00b1ar Highland Quichua
+sef=Cebaara Senoufo
 ceb=Cebuano
 xce=Celtiberian
-cam=Cemuh\u00ee
-cet=Cent\u00fa\u00fam
-cql=Ceqli
+cam=Cemuh\u221a\u00c6
+cen=Cen
+cns=Central Asmat
+tzm=Central Atlas Tamazight
+awu=Central Awyu
+ayr=Central Aymara
+bca=Central Bai
+zbc=Central Berawan
+bcl=Central Bicolano
+bnc=Central Bontoc
+agt=Central Cagayan Agta
+dtp=Central Dusun
+grv=Central Grebo
+zch=Central Hongshuihe Zhuang
+nch=Central Huasteca Nahuatl
+hmc=Central Huishui Hmong
+knc=Central Kanuri
+khm=Central Khmer
+km=Central Khmer
+ckb=Central Kurdish
+mwo=Central Maewo
+pse=Central Malay
+mxz=Central Masela
+hmm=Central Mashan Hmong
+maz=Central Mazahua
+mel=Central Melanau
+cmo=Central Mnong
+nhn=Central Nahuatl
+ncb=Central Nicobarese
+ojc=Central Ojibwa
+ryu=Central Okinawan
+plc=Central Palawano
+pbs=Central Pame
+pst=Central Pashto
+poo=Central Pomo
+ncx=Central Puebla Nahuatl
+sml=Central Sama
+ess=Central Siberian Yupik
+csm=Central Sierra Miwok
+syb=Central Subanen
+tgt=Central Tagbanwa
+tar=Central Tarahumara
+tuf=Central Tunebo
+esu=Central Yupik
+fuq=Central-Eastern Niger Fulfulde
+cet=Cent\u221a\u222b\u221a\u222bm
 cme=Cerma
+quk=Chachapoyas Quechua
 cbi=Chachi
-cao=Ch\u00e1cobo
+shu=Chadian Arabic
 cds=Chadian Sign Language
+cdy=Chadong
 chg=Chagatai
 ciy=Chaima
 ckh=Chak
@@ -1263,40 +1242,35 @@
 cdg=Chamari
 cdh=Chambeali
 can=Chambri
-cjm=Cham, Eastern
 ccc=Chamicuro
+ch=Chamorro
 cha=Chamorro
-ch=Chamorro
-cja=Cham, Western
-caj=Chan\u00e9
+nbc=Chang Naga
 cga=Changriwa
 cna=Changthang
 chx=Chantyal
+caj=Chan\u221a\u00a9
 cra=Chara
-cly=Chatino, Eastern Highland
-cya=Chatino, Nopala
-cta=Chatino, Tataltepec
-ctp=Chatino, Western Highland
-ctz=Chatino, Zacatepec
-czn=Chatino, Zenzontepec
 cdn=Chaudangsi
 ccq=Chaungtha
 crv=Chaura
 cbk=Chavacano
 cbt=Chayahuita
+mih=Chayuco Mixtec
+xtb=Chazumba Mixtec
 ruk=Che
 ce=Chechen
 che=Chechen
-cea=Chehalis, Lower
-cjh=Chehalis, Upper
 mrn=Cheke Holo
 xch=Chemakum
 cjn=Chenapian
 cde=Chenchu
 cnu=Chenoua
 cdm=Chepang
+ycp=Chepya
 cpn=Cherepon
 chr=Cherokee
+ych=Chesu
 ctc=Chetco
 cwg=Chewong
 chy=Cheyenne
@@ -1306,205 +1280,191 @@
 csd=Chiangmai Sign Language
 cip=Chiapanec
 chb=Chibcha
-nya=Chichewa; Nyanja
-ny=Chichewa; Nyanja
+trs=Chicahuaxtla Triqui
+zpv=Chichicapan Zapotec
 pei=Chichimeca-Jonaz
 cic=Chickasaw
 cob=Chicomuceltec
 cgg=Chiga
+mii=Chigmecatitl\u221a\u00b0n Mixtec
 clc=Chilcotin
+cqu=Chilean Quechua
 csg=Chilean Sign Language
 clh=Chilisso
+csa=Chiltepec Chinantec
 cmk=Chimakum
+zoh=Chimalapa Zoque
 cid=Chimariko
+qug=Chimborazo Highland Quichua
 cbg=Chimila
+bxu=China Buriat
 cih=Chinali
-csa=Chinantec, Chiltepec
-cco=Chinantec, Comaltepec
-cnl=Chinantec, Lalana
-cle=Chinantec, Lealao
-chj=Chinantec, Ojitl\u00e1n
-chz=Chinantec, Ozumac\u00edn
-cpa=Chinantec, Palantla
-chq=Chinantec, Quiotepec
-cso=Chinantec, Sochiapan
-cnt=Chinantec, Tepetotutla
-cte=Chinantec, Tepinapa
-ctl=Chinantec, Tlacoatzintepec
-cuc=Chinantec, Usila
-cvn=Chinantec, Valle Nacional
-csh=Chin, Asho
-bgr=Chin, Bawm
-cbl=Chin, Bualkhaw
-cnb=Chin, Chinbon
-dao=Chin, Daai
+cnb=Chinbon Chin
+qxc=Chincha Quechua
 zh=Chinese
 zho=Chinese
-gan=Chinese, Gan
-hak=Chinese, Hakka
-czh=Chinese, Huizhou
-cjy=Chinese, Jinyu
-ltc=Chinese, Late Middle
-cmn=Chinese, Mandarin
-mnp=Chinese, Min Bei
-cdo=Chinese, Min Dong
-nan=Chinese, Min Nan
-czo=Chinese, Min Zhong
-och=Chinese, Old
 cpi=Chinese Pidgin English
-cpx=Chinese, Pu-Xian
 csl=Chinese Sign Language
-wuu=Chinese, Wu
-hsn=Chinese, Xiang
-yue=Chinese, Yue
-flm=Chin, Falam
-cnh=Chin, Haka
-cnk=Chin, Khumi
-cka=Chin, Khumi Awa
-mrh=Chin, Mara
-cmr=Chin, Mro
-mwq=Chin, M\u00fcn
-cnw=Chin, Ngawn
 chh=Chinook
 chn=Chinook jargon
-pck=Chin, Paite
-sez=Chin, Senthang
-csy=Chin, Siyin
-tcp=Chin, Tawr
-ctd=Chin, Tedim
-tcz=Chin, Thado
-czt=Chin, Zotung
 cap=Chipaya
 chp=Chipewyan
 cbe=Chipiajes
 ciw=Chippewa
+maq=Chiquihuitl\u221a\u00b0n Mazatec
 cax=Chiquitano
-nhd=Chirip\u00e1
+qxa=Chiqui\u221a\u00b0n Ancash Quechua
+nhd=Chirip\u221a\u00b0
 cdf=Chiru
 ctm=Chitimacha
-cit=Chittagonian
+cik=Chitkuli Kinnauri
+ctg=Chittagonian
+the=Chitwania Tharu
+zpc=Choapan Zapotec
 cgk=Chocangacakha
 coz=Chochotec
 cho=Choctaw
 cdi=Chodri
+nri=Chokri Naga
 cjk=Chokwe
-cht=Chol\u00f3n
-cti=Chol, Tila
-ctu=Chol, Tumbal\u00e1
+ctu=Chol
+cht=Chol\u221a\u2265n
 cog=Chong
 cda=Choni
-chd=Chontal, Highland Oaxaca
-clo=Chontal, Lowland Oaxaca
-chf=Chontal, Tabasco
-coh=Chonyi
+coh=Chonyi-Dzihana-Kauma
 cce=Chopi
 xco=Chorasmian
 cjr=Chorotega
-crt=Chorote, Iyojwa'ja
-crq=Chorote, Iyo'wujwa
-caa=Chort\u00ed
+caa=Chort\u221a\u2260
+nct=Chothe Naga
 crw=Chrau
 cje=Chru
+cqd=Chuanqiandian Cluster Miao
 cjv=Chuave
-cnm=Chuj, Ixtat\u00e1n
-cac=Chuj, San Sebasti\u00e1n Coat\u00e1n
+cvg=Chug
+cac=Chuj
 cuh=Chuka
 ckt=Chukot
 cuw=Chukwa
 clw=Chulym
-chs=Chumash
 ncu=Chumburung
 cdj=Churahi
+chu=Church Slavic
+cu=Church Slavic
 scb=Chut
 chk=Chuukese
 xcv=Chuvantsy
 chv=Chuvash
 cv=Chuvash
 chw=Chuwabu
+cao=Ch\u221a\u00b0cobo
+cib=Ci Gbe
 cia=Cia-Cia
 ckl=Cibak
+awc=Cicipu
 cim=Cimbrian
+mkx=Cinamiguin Manobo
 cdr=Cinda-Regi-Tiyal
 cie=Cineni
 cin=Cinta Larga
+xcg=Cisalpine Gaulish
 asg=Cishingini
 txt=Citak
-tml=Citak, Tamnim
 tgd=Ciwogai
 clm=Clallam
-dri=C'lela
+xcl=Classical Armenian
+myz=Classical Mandaic
+cmg=Classical Mongolian
+nci=Classical Nahuatl
+nwc=Classical Newari
+qwc=Classical Quechua
+syc=Classical Syriac
+xct=Classical Tibetan
 xcw=Coahuilteco
+csi=Coast Miwok
+kzj=Coastal Kadazan
+kjc=Coastal Konjo
+zca=Coatecas Altas Zapotec
+naz=Coatepec Nahuatl
+mco=Coatl\u221a\u00b0n Mixe
+zps=Coatl\u221a\u00b0n Zapotec
+miz=Coatzospan Mixtec
 cod=Cocama-Cocamilla
 coj=Cochimi
 coc=Cocopa
+coa=Cocos Islands Malay
 crd=Coeur d'Alene
-con=Cof\u00e1n
+con=Cof\u221a\u00b0n
 kog=Cogui
+liw=Col
 csn=Colombian Sign Language
+gct=Colonia Tovar German
 cof=Colorado
 col=Columbia-Wenatchi
+cco=Comaltepec Chinantec
 com=Comanche
 xcm=Comecrudo
 cfg=Como Karim
-swb=Comorian
-wlc=Comorian, Mwali
-wni=Comorian, Ndzwani
-zdj=Comorian, Ngazidja
 coo=Comox
 cno=Con
-cnc=C\u00f4\u00f4ng
+swc=Congo Swahili
 csz=Coos
+zoc=Copainal\u221a\u00b0 Zoque
+trc=Copala Triqui
 cop=Coptic
 coq=Coquille
-crn=Cora, El Nayar
-cok=Cora, Santa Teresa
 cry=Cori
 cor=Cornish
 kw=Cornish
-cnx=Cornish, Middle
-oco=Cornish, Old
+qwa=Corongo Ancash Quechua
 co=Corsican
 cos=Corsican
 csr=Costa Rican Sign Language
+mta=Cotabato Manobo
 xcn=Cotoname
 cow=Cowlitz
 kox=Coxima
 coy=Coyaima
+pbf=Coyotepec Popoloca
+toc=Coyutla Totonac
 cr=Cree
 cre=Cree
 mus=Creek
-crm=Cree, Moose
-crk=Cree, Plains
-csw=Cree, Swampy
-cwd=Cree, Woods
-crh=Crimean Turkish; Crimean Tatar
-pov=Crioulo, Upper Guinea
+crh=Crimean Tatar
+csq=Croatia Sign Language
 hr=Croatian
 hrv=Croatian
-csq=Croatia Sign Language
+mfn=Cross River Mbembe
 cro=Crow
-crz=Cruze\u00f1o
+crz=Cruze\u221a\u00b1o
 cua=Cua
 csf=Cuba Sign Language
 cub=Cubeo
 cui=Cuiba
-cux=Cuicatec, Tepeuxila
-cut=Cuicatec, Teutila
 cul=Culina
 cuo=Cumanagoto
 xcb=Cumbric
 cum=Cumeral
 cuq=Cun
+xlu=Cuneiform Luwian
 cug=Cung
-cup=Cupe\u00f1o
+cup=Cupe\u221a\u00b1o
 xcu=Curonian
 kpc=Curripaco
+quz=Cusco Quechua
 ccl=Cutchi-Swahili
 cuv=Cuvok
+xtu=Cuyamecalco Mixtec
 cyo=Cuyonon
+bwy=Cwi Bwamu
+acy=Cypriot Arabic
 ces=Czech
 cs=Czech
 cse=Czech Sign Language
+cnc=C\u221a\u00a5\u221a\u00a5ng
+kzf=Da'a Kaili
+dao=Daai Chin
+lni=Daantanai'
 dsh=Daasanach
 dbq=Daba
 dbr=Dabarre
@@ -1513,9 +1473,7 @@
 mps=Dadibi
 dbd=Dadiya
 dgz=Daga
-dga=Dagaare, Southern
 dgd=Dagaari Dioula
-dgi=Dagara, Northern
 dgk=Dagba
 dag=Dagbani
 dec=Dagik
@@ -1523,61 +1481,59 @@
 dal=Dahalo
 das=Daho-Doo
 dij=Dai
+zhd=Dai Zhuang
 drb=Dair
-djc=Daju, Dar Daju
-daj=Daju, Dar Fur
-dau=Daju, Dar Sila
 bpa=Dakaka
 dkk=Dakka
 dak=Dakota
 dka=Dakpakha
 dlm=Dalmatian
+bev=Daloa B\u221a\u00a9t\u221a\u00a9
 dmm=Dama
+dam=Damakawa
 uhn=Damal
-dmr=Damar, East
-drn=Damar, West
 dac=Dambi
 dml=Dameli
 dms=Dampelas
 daf=Dan
 dnr=Danaru
 dnu=Danau
-daa=Dangal\u00e9at
-dni=Dani, Lower Grand Valley
-dnt=Dani, Mid Grand Valley
+daq=Dandami Maria
+daa=Dangal\u221a\u00a9at
+thl=Dangaura Tharu
 da=Danish
 dan=Danish
 dsl=Danish Sign Language
-dna=Dani, Upper Grand Valley
-dnw=Dani, Western
 aso=Dano
 daz=Dao
 dnd=Daonda
+djc=Dar Daju Daju
+daj=Dar Fur Daju
+dau=Dar Sila Daju
 dry=Darai
-dat=Darang Deng
 dar=Dargwa
-gbz=Dari, Zoroastrian
+prs=Dari
 drh=Darkhat
 drl=Darling
 dln=Darlong
 drd=Darmiya
-dro=Daro-Matu
+dro=Daro-Matu Melanau
 drw=Darwazi
 dot=Dass
 tcc=Datooga
 dta=Daur
 daw=Davawenyo
-kwa=D\u00e2w
 dww=Dawawa
 ddw=Dawera-Daweloor
+dwr=Dawro
 dai=Day
-dyk=Dayak, Land
 dax=Dayi
 dzd=Daza
 dzg=Dazaga
 dcc=Deccan
 ded=Dedua
 afn=Defaka
+gbh=Defi Gbe
 mzw=Deg
 dgu=Degaru
 deg=Degema
@@ -1587,9 +1543,7 @@
 deh=Dehwari
 dek=Dek
 row=Dela-Oenale
-dea=Delason
 del=Delaware
-dep=Delaware, Pidgin
 ntr=Delo
 dem=Dem
 dmx=Dema
@@ -1599,13 +1553,14 @@
 deq=Dendi (Central African Republic)
 dez=Dengese
 dnk=Dengka
-dny=Den\u00ed
 dbb=Deno
 anv=Denya
+dny=Den\u221a\u2260
 der=Deori
 kbv=Dera (Indonesia)
 kna=Dera (Nigeria)
 des=Desano
+dso=Desiya
 dee=Dewoin
 def=Dezfuli
 dgh=Dghwede
@@ -1619,16 +1574,19 @@
 dhr=Dhargari
 mki=Dhatki
 dhi=Dhimal
+div=Dhivehi
+dv=Dhivehi
 dho=Dhodia
+adf=Dhofari Arabic
 dhd=Dhundari
 dhu=Dhurga
 duj=Dhuwal
 dia=Dia
+mbd=Dibabawon Manobo
 dby=Dibiyaso
 dio=Dibo
 bvx=Dibole
-dic=Dida, Lakota
-gud=Dida, Yocobou\u00e9
+duy=Dicamay Agta
 did=Didinga
 ddo=Dido
 dif=Dieri
@@ -1642,14 +1600,9 @@
 dii=Dimbong
 dim=Dime
 dmc=Dimir
-diq=Dimli
+diq=Dimli (individual language)
 diz=Ding
 din=Dinka
-dip=Dinka, Northeastern
-diw=Dinka, Northwestern
-dib=Dinka, South Central
-dks=Dinka, Southeastern
-dik=Dinka, Southwestern
 ddi=Diodio
 dit=Dirari
 gdl=Dirasha
@@ -1659,42 +1612,31 @@
 dsi=Disa
 tbz=Ditammari
 diy=Diuwe
-div=Divehi
-dv=Divehi
+xtd=Diuxi-Tilantongo Mixtec
 dix=Dixon Reef
-mdx=Dizi
+mdx=Dizin
 djr=Djambarrpuyngu
 djd=Djamindjung
 djf=Djangun
 djn=Djauan
 djw=Djawi
 djj=Djeebbana
+dyi=Djimini Senoufo
 dji=Djinang
 djb=Djinba
 jig=Djingili
 djl=Djiwarli
-djo=Djongkang
 kvo=Dobel
 dob=Dobu
 doe=Doe
 dgg=Doga
 dgx=Doghoro
-dba=Dogon, Bangeri Me
-dbu=Dogon, Bondum Dom
-dbg=Dogon, Dogul Dom
-dds=Dogon, Donno So
-djm=Dogon, Jamsay
-dkl=Dogon, Kolum So
-dtk=Dogon, Tene Kan
-dtm=Dogon, Tomo Kan
-dts=Dogon, Toro So
-dtt=Dogon, Toro Tegu
-dos=Dogos\u00e9
 dgs=Dogoso
+dos=Dogos\u221a\u00a9
+dgo=Dogri (individual language)
+doi=Dogri (macrolanguage)
 dgr=Dogrib
-doi=Dogri (generic)
-dgo=Dogri (specific)
-otd=Dohoi
+dbg=Dogul Dom Dogon
 dbi=Doka
 uya=Doko-Uyanga
 dlg=Dolgan
@@ -1709,14 +1651,14 @@
 dev=Domung
 dok=Dondo
 doh=Dong
-doc=Dong, Northern
 doo=Dongo
 ddd=Dongotono
-kmc=Dong, Southern
+yik=Dongshanba Lalo
 sce=Dongxiang
+dds=Donno So Dogon
 dde=Doondo
 dor=Dori'o
-kqc=Doromu
+kqc=Doromu-Koki
 drr=Dororo
 doz=Dorze
 dol=Doso
@@ -1725,14 +1667,13 @@
 drt=Drents
 duu=Drung
 dua=Duala
-dup=Duano'
+dup=Duano
 dva=Duau
 dub=Dubli
 dmu=Dubu
 duk=Duduela
 ndu=Dugun
 dbm=Duguri
-dza=Duguza
 dme=Dugwor
 kbz=Duhwa
 nke=Duke
@@ -1749,23 +1690,19 @@
 raa=Dungmali
 duh=Dungra Bhil
 dbv=Dungu
+duo=Dupaninan Agta
 drq=Dura
+nln=Durango Nahuatl
 mvp=Duri
 dbn=Duriankere
 dug=Duruma
 pci=Duruwa
 dsn=Dusner
-dtp=Dusun, Central
 dun=Dusun Deyah
 duq=Dusun Malang
-kzs=Dusun, Sugut
-kzt=Dusun, Tambunan
-tdu=Dusun, Tempasuk
 duw=Dusun Witu
+nl=Dutch
 nld=Dutch
-nl=Dutch
-dum=Dutch, Middle (ca.1050-1350)
-odt=Dutch, Old
 dse=Dutch Sign Language
 dws=Dutton World Speedwords
 dux=Duungooma
@@ -1788,13 +1725,70 @@
 add=Dzodinka
 dz=Dzongkha
 dzo=Dzongkha
-dnn=Dz\u00f9\u00f9ngoo
+dnn=Dz\u221a\u03c0\u221a\u03c0ngoo
+kwa=D\u221a\u00a2w
 eee=E
-crl=East Cree, Northern
-crj=East Cree, Southern
+yzg=E'ma Buyang
+pbh=E'\u221a\u00b1apa Woromaipu
+xtr=Early Tripuri
+omb=East Ambae
+zbe=East Berawan
+dmr=East Damar
+fud=East Futuna
+kjs=East Kewa
+lma=East Limba
+mky=East Makian
+vme=East Masela
+nle=East Nyala
+tre=East Tarangan
+yuy=East Yugur
+aaq=Eastern Abnaki
+acp=Eastern Acipa
+qve=Eastern Apur\u221a\u2260mac Quechua
+aer=Eastern Arrernte
+bgp=Eastern Balochi
+gui=Eastern Bolivian Guaran\u221a\u2260
+bru=Eastern Bru
+ike=Eastern Canadian Inuktitut
+cjm=Eastern Cham
+avl=Eastern Egyptian Bedawi Arabic
+frs=Eastern Frisian
+tge=Eastern Gorkha Tamang
+ggn=Eastern Gurung
+cly=Eastern Highland Chatino
+otm=Eastern Highland Otomi
+zeh=Eastern Hongshuihe Zhuang
+nhe=Eastern Huasteca Nahuatl
+hme=Eastern Huishui Hmong
+xrb=Eastern Karaboro
+ktv=Eastern Katu
+eky=Eastern Kayah
+kee=Eastern Keres
+kqo=Eastern Krahn
+yit=Eastern Lalu
+lwl=Eastern Lawa
+mgp=Eastern Magar
+emk=Eastern Maninkakan
+mhr=Eastern Mari
+emg=Eastern Meohang
+mng=Eastern Mnong
+emu=Eastern Muria
+nea=Eastern Ngad'a
+nos=Eastern Nisu
+ojg=Eastern Ojibwa
+hae=Eastern Oromo
+kif=Eastern Parbate Kham
+pez=Eastern Penan
+peb=Eastern Pomo
+hmq=Eastern Qiandong Miao
+taj=Eastern Tamang
+bnj=Eastern Tawbuid
+muq=Eastern Xiangxi Miao
+gbx=Eastern Xwla Gbe
+ydd=Eastern Yiddish
 igb=Ebira
 xeb=Eblan
-ebr=Ebri\u00e9
+ebr=Ebri\u221a\u00a9
 ebg=Ebughu
 ecs=Ecuadorian Sign Language
 cbj=Ede Cabe
@@ -1802,21 +1796,19 @@
 idd=Ede Idaca
 ijj=Ede Ije
 nqg=Ede Nago
-nqk=Ede Nago, Kura
-xkb=Ede Nago, Manigri-Kambol\u00e9
+awy=Edera Awyu
 etr=Edolo
 xdm=Edomite
 dbf=Edopi
 efa=Efai
-llp=Efate, North
-erk=Efate, South
 efe=Efe
 efi=Efik
 ofu=Efutop
 ega=Ega
 ego=Eggon
+esl=Egypt Sign Language
 egy=Egyptian (Ancient)
-esl=Egypt Sign Language
+arz=Egyptian Arabic
 ehu=Ehueun
 eip=Eipomek
 eit=Eitiep
@@ -1827,13 +1819,16 @@
 eki=Eki
 eke=Ekit
 ekp=Ekpeye
+zpp=El Alto Zapotec
+elh=El Hugeirat
+elo=El Molo
+crn=El Nayar Cora
 elx=Elamite
 elm=Eleme
 ele=Elepi
-elh=El Hugeirat
 ekm=Elip
 elk=Elkei
-elo=El Molo
+zte=Elotepec Zapotec
 afo=Eloyi
 elp=Elpaputih
 mrf=Elseng
@@ -1843,39 +1838,34 @@
 ema=Emai-Iuleha-Ora
 emn=Eman
 emb=Embaloh
-bdc=Ember\u00e1-Baud\u00f3
-cto=Ember\u00e1-Cat\u00edo
-cmi=Ember\u00e1-Cham\u00ed
-emp=Ember\u00e1, Northern
-tdc=Ember\u00e1-Tad\u00f3
+bdc=Ember\u221a\u00b0-Baud\u221a\u2265
+cto=Ember\u221a\u00b0-Cat\u221a\u2260o
+cmi=Ember\u221a\u00b0-Cham\u221a\u2260
+tdc=Ember\u221a\u00b0-Tad\u221a\u2265
 ebu=Embu
 eme=Emerillon
-eml=Emiliano-Romagnolo
+egl=Emilian
 emo=Emok
 emw=Emplawas
 enr=Emumu
 enc=En
-unk=Enawen\u00e9-Naw\u00e9
+unk=Enawen\u221a\u00a9-Naw\u221a\u00a9
 end=Ende
-enb=Endo
-pbh=E\u00f1epa
-enf=Enets, Forest
-enh=Enets, Tundra
 enq=Enga
 enn=Engenni
 eno=Enggano
 en=English
 eng=English
-enm=English, Middle (1100-1500)
-ang=English, Old (ca.450-1100)
-eni=Enim
 ptt=Enrekang
+enu=Enu
 enw=Enwan (Akwa Ibom State)
 env=Enwan (Edu State)
 gey=Enya
 sja=Epena
+xep=Epi-Olmec
 epi=Epie
-xep=Epi-Olmec
+emy=Epigraphic Mayan
+era=Eravallan
 kjy=Erave
 twp=Ere
 ert=Eritai
@@ -1892,6 +1882,7 @@
 eo=Esperanto
 epo=Esperanto
 esq=Esselen
+ots=Estado de M\u221a\u00a9xico Otomi
 est=Estonian
 et=Estonian
 eso=Estonian Sign Language
@@ -1907,7 +1898,6 @@
 etn=Eton (Vanuatu)
 ett=Etruscan
 utr=Etulo
-eur=Europanto
 bzz=Evant
 eve=Even
 evn=Evenki
@@ -1919,27 +1909,23 @@
 eya=Eyak
 fab=Fa D'ambu
 faf=Fagani
+azt=Faire Atta
 faj=Faita
 fai=Faiwol
 fax=Fala
+cfm=Falam Chin
 fli=Fali
-fll=Fali, North
-fah=Fali Of Baissa
 xfa=Faliscan
-fal=Fali, South
 fam=Fam
 fng=Fanagalo
 fak=Fang (Cameroon)
 fan=Fang (Equatorial Guinea)
 fni=Fania
 fat=Fanti
+fmu=Far Western Muria
 gur=Farefare
 fao=Faroese
 fo=Faroese
-prs=Farsi, Eastern
-pes=Farsi, Western
-faz=Fars, Northwestern
-fay=Fars, Southwestern
 fqs=Fas
 faa=Fasu
 far=Fataleka
@@ -1949,17 +1935,16 @@
 agl=Fembe
 fpe=Fernando Po Creole English
 fer=Feroge
+hif=Fiji Hindi
 fij=Fijian
 fj=Fijian
-wyy=Fijian, Western
-fil=Filipino; Pilipino
+fil=Filipino
+tlp=Filomena Mata-Coahuitl\u221a\u00b0n Totonac
 bkb=Finallig
+fss=Finland-Swedish Sign Language
 fi=Finnish
 fin=Finnish
-fkv=Finnish, Kven
 fse=Finnish Sign Language
-fss=Finnish-Swedish Sign Language
-fit=Finnish, Tornedalen
 fag=Finongan
 fip=Fipa
 fir=Firan
@@ -1967,6 +1952,7 @@
 fln=Flinders Island
 flh=Foau
 foi=Foi
+ffi=Foia Foia
 ppo=Folopa
 fom=Foma
 fon=Fon
@@ -1975,67 +1961,49 @@
 frq=Forak
 frd=Fordata
 for=Fore
+enf=Forest Enets
+myq=Forest Maninka
 frt=Fortsenal
-frp=Franco-Proven\u00e7al
+zos=Francisco Le\u221a\u2265n Zoque
+frp=Franco-Proven\u221a\u00dfal
 frk=Frankish
+fr=French
 fra=French
-fr=French
-frc=French, Cajun
-frm=French, Middle (ca.1400-1600)
-fro=French, Old (842-Ca.1400)
 fsl=French Sign Language
-fry=Frisian
-fy=Frisian
-frs=Frisian, Eastern
-frr=Frisian, Northern
-ofs=Frisian, Old
-fri=Frisian, Western
 fur=Friulian
 ff=Fulah
 ful=Fulah
-fub=Fulfulde, Adamawa
-fui=Fulfulde, Bagirmi
-fue=Fulfulde, Borgu
-fuq=Fulfulde, Central-Eastern Niger
-ffm=Fulfulde, Maasina
-fuv=Fulfulde, Nigerian
-fuh=Fulfulde, Western Niger
 flr=Fuliiru
-fun=Fulni\u00f4
+fun=Fulni\u221a\u00a5
 fum=Fum
 ula=Fungwa
 fvr=Fur
 fuu=Furu
 fut=Futuna-Aniwa
-fud=Futuna, East
 fuy=Fuyug
-fwa=Fw\u00e2i
 fwe=Fwe
+fwa=Fw\u221a\u00a2i
 pym=Fyam
 fie=Fyer
 gaa=Ga
+gqa=Ga'anda
+gdg=Ga'dang
 ttb=Gaa
 tbi=Gaam
-gqa=Ga'anda
 gab=Gabri
-xgf=Gabrielino-Fernande\u00f1o
+xgf=Gabrielino-Fernande\u221a\u00b1o
 gav=Gabutamon
-gbj=Gadaba, Bodo
-gau=Gadaba, Mudhili
-gdb=Gadaba, Pottangi Ollar
 gdk=Gadang
-gdg=Ga'dang
 gad=Gaddang
 gbk=Gaddi
 ged=Gade
+gda=Gade Lohar
 gdh=Gadjerawang
 gaj=Gadsup
-ghc=Gaelic, Hiberno-Scottish
-gd=Gaelic (Scots)
-gla=Gaelic (Scots)
 gft=Gafat
 gbu=Gagadu
 gag=Gagauz
+btg=Gagnoa B\u221a\u00a9t\u221a\u00a9
 ggu=Gagu
 bfu=Gahri
 gbf=Gaikundi
@@ -2046,19 +2014,25 @@
 xga=Galatian
 gbi=Galela
 gar=Galeya
+car=Galibi Carib
 gce=Galice
+gl=Galician
+glg=Galician
 xgl=Galindan
-gl=Gallegan
-glg=Gallegan
+sdn=Gallurese Sardinian
+adl=Galo
 gal=Galoli
+kgj=Gamale Kham
 gma=Gambera
+wof=Gambian Wolof
 kld=Gamilaraay
 gbl=Gamit
 gak=Gamkonora
-gmo=Gamo-Gofa-Dawro
+gmv=Gamo
 bte=Gamo-Ningi
+gan=Gan Chinese
 gnq=Gana
-gnk=//Gana
+gne=Ganang
 lg=Ganda
 lug=Ganda
 gzn=Gane
@@ -2071,26 +2045,20 @@
 gnz=Ganzi
 gga=Gao
 pwg=Gapapaiwa
-gas=Garasia, Adiwasi
-gra=Garasia, Rajput
 gbc=Garawa
 gbm=Garhwali
 cab=Garifuna
 ilg=Garig-Ilgar
 grt=Garo
 gex=Garre
-ggh=Garreh-Ajuran
 gyb=Garus
 xgr=Garza
-gsc=Gascon
 gaq=Gata'
-xcg=Gaulish, Cisalpine
-xtg=Gaulish, Transalpine
 gou=Gavar
-gvo=Gavi\u00e3o Do Jiparan\u00e1
-gvp=Gavi\u00e3o, Par\u00e1
+gvo=Gavi\u221a\u00a3o Do Jiparan\u221a\u00b0
 gwt=Gawar-Bati
 gwd=Gawwada
+gyl=Gayil
 gay=Gayo
 gzi=Gazi
 gbr=Gbagyi
@@ -2098,70 +2066,50 @@
 gbg=Gbanziri
 gby=Gbari
 gti=Gbati-ri
+gba=Gbaya (Central African Republic)
+krs=Gbaya (Sudan)
 gbp=Gbaya-Bossangoa
 gbq=Gbaya-Bozoum
-gba=Gbaya (Central African Republic)
-gya=Gbaya, Northwest
-mdo=Gbaya, Southwest
-krs=Gbaya (Sudan)
+gmm=Gbaya-Mbodomo
 gyg=Gbayi
-ayb=Gbe, Ayizo
-cib=Gbe, Ci
-gbh=Gbe, Defi
-gbx=Gbe, Eastern Xwla
-gbs=Gbe, Gbesi
-kqk=Gbe, Kotafon
-mxl=Gbe, Maxi
-sxw=Gbe, Saxwe
-tfi=Gbe, Tofin
-wci=Gbe, Waci
-wem=Gbe, Weme
-xwl=Gbe, Western Xwla
-xwe=Gbe, Xwela
+gbs=Gbesi Gbe
 ggb=Gbii
 grh=Gbiri-Niragu
+gec=Gboloo Grebo
+hmj=Ge
+kvq=Geba Karen
 gei=Gebe
 gdd=Gedaged
 drs=Gedeo
 gez=Geez
 gji=Geji
+ghk=Geko Karen
 nlg=Gela
 gio=Gelao
-giq=Gelao, Green
-gir=Gelao, Red
-giw=Gelao, White
-gen=Geman Deng
 geq=Geme
 gej=Gen
 gaf=Gende
 geg=Gengle
 ka=Georgian
 kat=Georgian
-oge=Georgian, Old
+ygp=Gepo
 gew=Gera
 de=German
 deu=German
-gct=German, Colonia Tovar
-geh=German, Hutterite
-gmh=German, Middle High (ca.1050-1500)
-goh=German, Old High (ca.750-1050)
-pdc=German, Pennsylvania
 gsg=German Sign Language
 gea=Geruma
 ges=Geser-Gorom
 guv=Gey
-gha=Ghadam\u00e8s
-ght=Ghale, Kutang
-ghh=Ghale, Northern
-ghe=Ghale, Southern
+gha=Ghadam\u221a\u00aes
 gse=Ghanaian Sign Language
 ghn=Ghanongga
 gri=Ghari
 bmk=Ghayavi
+aln=Gheg Albanian
 ghr=Ghera
 gdo=Ghodoberi
-bbj=Ghom\u00e1l\u00e1'
 gho=Ghomara
+bbj=Ghom\u221a\u00b0l\u221a\u00b0'
 aaa=Ghotuo
 ghl=Ghulfan
 bgi=Giangan
@@ -2185,28 +2133,25 @@
 ggt=Gitua
 git=Gitxsan
 giy=Giyug
-gis=Giziga, North
-giz=Giziga, South
 tof=Gizrra
 glr=Glaro-Twabo
 glw=Glavda
 oub=Glio-Oubi
-gls=Glosa
 gnu=Gnau
+gom=Goan Konkani
 gig=Goaria
 goi=Gobasi
 gox=Gobu
-god=Godi\u00e9
+god=Godi\u221a\u00a9
 gdx=Godwari
 ank=Goemai
+gof=Gofa
 gog=Gogo
 ggw=Gogodala
 gkn=Gokana
 gol=Gola
 gvf=Golin
 gon=Gondi
-gno=Gondi, Northern
-ggo=Gondi, Southern
 goo=Gone Dau
 goe=Gongduk
 gjn=Gonja
@@ -2219,24 +2164,16 @@
 gow=Gorowa
 got=Gothic
 goy=Goundo
-gux=Gourmanch\u00e9ma
+gux=Gourmanch\u221a\u00a9ma
 goj=Gowlan
 gok=Gowli
 gwf=Gowro
 goz=Gozarkhani
 nli=Grangali
+kbk=Grass Koiari
 grb=Grebo
-gry=Grebo, Barclayville
-grv=Grebo, Central
-gec=Grebo, Gboloo
-gbo=Grebo, Northern
-grj=Grebo, Southern
-grc=Greek, Ancient (to 1453)
-cpg=Greek, Cappadocian
-el=Greek, Modern (1453-)
-ell=Greek, Modern (1453-)
-gmy=Greek, Mycenaean
 gss=Greek Sign Language
+giq=Green Gelao
 gcl=Grenadian Creole English
 grs=Gresi
 gro=Groma
@@ -2245,47 +2182,51 @@
 gwx=Gua
 gcf=Guadeloupean Creole French
 guh=Guahibo
-gvj=Guaj\u00e1
-gub=Guajaj\u00e1ra
+gub=Guajaj\u221a\u00b0ra
+gvj=Guaj\u221a\u00b0
 gum=Guambiano
 gqn=Guana (Brazil)
+gva=Guana (Paraguay)
 gvc=Guanano
-gva=Guana (Paraguay)
 gnc=Guanche
 jiq=Guanyinqiao
 gn=Guarani
 grn=Guarani
-gui=Guaran\u00ed, Eastern Bolivian
-gun=Guaran\u00ed, Mby\u00e1
-gug=Guaran\u00ed, Paraguayan
-gnw=Guaran\u00ed, Western Bolivian
 gyr=Guarayu
 gae=Guarequena
 gsm=Guatemalan Sign Language
-gta=Guat\u00f3
+gta=Guat\u221a\u2265
 guo=Guayabero
 nji=Gudanji
 gde=Gude
 gdu=Gudu
 gdf=Guduf-Gava
+amu=Guerrero Amuzgo
+ngu=Guerrero Nahuatl
+zpg=Guevea De Humboldt Zapotec
 ggd=Gugadj
 gdc=Gugu Badhun
+wrw=Gugu Warra
 kkp=Gugubera
-wrw=Gugu Warra
 kky=Guguyimidjir
 ghs=Guhu-Samane
 gcr=Guianese Creole French
+zgb=Guibei Zhuang
+bet=Guiberoua B\u221a\u00a9te
+zgn=Guibian Zhuang
+gkp=Guinea Kpelle
 gus=Guinean Sign Language
 gqi=Guiqiong
 gu=Gujarati
 guj=Gujarati
 gju=Gujari
-gmb=Gula'alaa
 kcm=Gula (Central African Republic)
 glu=Gula (Chad)
 glj=Gula Iro
+gmb=Gula'alaa
 gvl=Gulay
 gly=Gule
+afb=Gulf Arabic
 gli=Guliguli
 gmu=Gumalu
 gnn=Gumatj
@@ -2310,8 +2251,6 @@
 gue=Gurinji
 gvm=Gurmana
 goa=Guro
-ggn=Gurung, Eastern
-gvr=Gurung, Western
 grd=Guruntum-Mbaaru
 gsn=Gusan
 guz=Gusii
@@ -2328,32 +2267,37 @@
 grw=Gweda
 gwe=Gweno
 gwr=Gwere
-gwj=/Gwi
-gwi=Gwich\u00b4in
+gwi=Gwich\u00a0\u00bain
 gyi=Gyele
 gye=Gyem
+ztu=G\u221a\u00bail\u221a\u00b0 Zapotec
 haq=Ha
 hbu=Habu
 hdy=Hadiyya
+hoj=Hadothi
 xhd=Hadrami
+ayh=Hadrami Arabic
 hts=Hadza
 aek=Haeke
 hah=Hahon
+hgm=Hai//om
 hai=Haida
-hdn=Haida, Northern
-hax=Haida, Southern
 hgw=Haigwai
-hgm=Hai//om
+bzx=Hainyaxo Bozo
 haf=Haiphong Sign Language
 has=Haisla
-hat=Haitian; Haitian Creole
-ht=Haitian; Haitian Creole
+hat=Haitian
+ht=Haitian
 hvc=Haitian Vodoun Culture Language
+hji=Haji
 haj=Hajong
-hao=Hak\u00f6
+cnh=Haka Chin
+hak=Hakka Chinese
+hao=Hak\u221a\u2202
 hal=Halang
 hld=Halang Doan
 hlb=Halbi
+khk=Halh Mongolian
 hla=Halia
 hur=Halkomelem
 hmu=Hamap
@@ -2370,7 +2314,7 @@
 hnn=Hanunoo
 xha=Harami
 har=Harari
-hoj=Harauti
+kjo=Harijan Kinnauri
 hro=Haroi
 hss=Harsusi
 tmd=Haruai
@@ -2387,15 +2331,14 @@
 yuf=Havasupai-Walapai-Yavapai
 hvk=Haveke
 hav=Havu
-haw=Hawaiian
 hwc=Hawai'i Creole English
 hps=Hawai'i Pidgin Sign Language
+haw=Hawaiian
 hay=Haya
 haz=Hazaragi
 xed=Hdi
+he=Hebrew
 heb=Hebrew
-he=Hebrew
-hbo=Hebrew, Ancient
 heh=Hehe
 hbn=Heiban
 hei=Heiltsuk
@@ -2403,70 +2346,54 @@
 heg=Helong
 nix=Hema
 hem=Hemba
-hed=Herd\u00e9
+hed=Herd\u221a\u00a9
 her=Herero
 hz=Herero
 llf=Hermit
 xhr=Hernican
-hrt=H\u00e9rtevin
 ham=Hewa
 auk=Heyo
+ghc=Hiberno-Scottish Gaelic
 hib=Hibito
 hid=Hidatsa
+hlu=Hieroglyphic Luwian
 mba=Higaonon
+kjk=Highland Konjo
+chd=Highland Oaxaca Chontal
+poi=Highland Popoluca
+azz=Highland Puebla Nahuatl
+tos=Highland Totonac
+acw=Hijazi Arabic
 hij=Hijuk
 hil=Hiligaynon
-hir=Himarim\u00e3
+hir=Himarim\u221a\u00a3
 hi=Hindi
 hin=Hindi
-hno=Hindko, Northern
-hnd=Hindko, Southern
 hii=Hinduri
-hns=Hindustani, Caribbean
-hif=Hindustani, Fijian
 gin=Hinukh
 hmo=Hiri Motu
 ho=Hiri Motu
 hit=Hittite
-htx=Hittite, Middle
-nei=Hittite, Neo-
-oht=Hittite, Old
 htu=Hitu
 hiw=Hiw
-hix=Hixkary\u00e1na
+hix=Hixkary\u221a\u00b0na
 lic=Hlai
+yhl=Hlepho Phowa
+hle=Hlersu
 hmr=Hmar
 hmn=Hmong
-hmc=Hmong, Central Huishui
-hmm=Hmong, Central Mashan
-hmj=Hmong, Chonganjiang
 mww=Hmong Daw
-hmv=Hmong D\u00f4
 hmf=Hmong Don
-hme=Hmong, Eastern Huishui
-hmq=Hmong, Eastern Qiandong
-muq=Hmong, Eastern Xiangxi
-hml=Hmong, Luopohe
-blu=Hmong Njua
-hmd=Hmong, Northeastern Dian
-huj=Hmong, Northern Guiyang
-hmi=Hmong, Northern Huishui
-hmp=Hmong, Northern Mashan
-hea=Hmong, Northern Qiandong
+hmv=Hmong D\u221a\u00a5
+hnj=Hmong Njua
 hmz=Hmong Shua
-hmy=Hmong, Southern Guiyang
-hma=Hmong, Southern Mashan
-hms=Hmong, Southern Qiandong
-hmg=Hmong, Southwestern Guiyang
-hmh=Hmong, Southwestern Huishui
-hmw=Hmong, Western Mashan
-mmr=Hmong, Western Xiangxi
 mrk=Hmwaveke
 hoc=Ho
-hoa=Hoava
-hoh=Hoby\u00f3t
 hos=Ho Chi Minh City Sign Language
 win=Ho-Chunk
+hoa=Hoava
+hoh=Hoby\u221a\u2265t
+hhi=Hoia Hoia
 hoi=Holikachuk
 hoy=Holiya
 hod=Holma
@@ -2474,9 +2401,10 @@
 hol=Holu
 hom=Homa
 hds=Honduras Sign Language
-juh=H\u00f5ne
+hks=Hong Kong Sign Language
 how=Honi
 hop=Hopi
+hrm=Horned Miao
 hor=Horo
 hoe=Horom
 ero=Horpa
@@ -2484,60 +2412,67 @@
 hot=Hote
 hti=Hoti
 hov=Hovongan
+hhy=Hoyahoya
 hoz=Hozo
 hpo=Hpon
 hra=Hrangkhol
 hre=Hre
 hru=Hruso
 huo=Hu
-huc==/Hua
 hug=Huachipaeri
+qub=Huallaga Hu\u221a\u00b0nuco Quechua
+qvh=Huamal\u221a\u2260es-Dos de Mayo Hu\u221a\u00b0nuco Quechua
 hub=Huambisa
 var=Huarijio
-hva=Huastec, San Lu\u00eds Potos\u00ed
-hsf=Huastec, Southeastern
-hus=Huastec, Veracruz
+hus=Huastec
 hud=Huaulu
-hve=Huave, San Dionisio Del Mar
-hue=Huave, San Francisco Del Mar
-huv=Huave, San Mateo Del Mar
-hvv=Huave, Santa Mar\u00eda Del Mar
+mau=Huautla Mazatec
+nhq=Huaxcaleca Nahuatl
+qwh=Huaylas Ancash Quechua
+qvw=Huaylla Wanca Quechua
 hbb=Huba
+tee=Huehuetla Tepehua
 hch=Huichol
 huh=Huilliche
-hto=Huitoto, Minica
-huu=Huitoto, Murui
-hux=Huitoto, N\u00fcpode
+mxs=Huitepec Mixtec
+czh=Huizhou Chinese
 huw=Hukumina
 hul=Hula
-huy=Hulaul\u00e1
+huy=Hulaul\u221a\u00b0
 hui=Huli
 huk=Hulung
+hmb=Humburi Senni Songhay
 huf=Humene
 hut=Humla
+dud=Hun-Saare
 hke=Hunde
 hnu=Hung
 hum=Hungana
 hu=Hungarian
 hun=Hungarian
-ohu=Hungarian, Old
 hsh=Hungarian Sign Language
 nat=Hungworo
+hkk=Hunjara-Kaina Ke
 xhc=Hunnic
-dud=Hun-Saare
+hrx=Hunsrik
 huz=Hunzib
 hup=Hupa
-jup=Hupd\u00eb
+jup=Hupd\u221a\u00b4
 hap=Hupla
 xhu=Hurrian
+geh=Hutterite German
 hwo=Hwana
 hya=Hya
 jab=Hyam
+hrt=H\u221a\u00a9rtevin
+juh=H\u221a\u00b5ne
+iwk=I-Wak
 iai=Iaai
 yml=Iamalele
 iap=Iapama
 ian=Iatmul
 tmu=Iau
+tek=Ibali Teke
 ibl=Ibaloi
 iba=Iban
 ibg=Ibanag
@@ -2555,7 +2490,7 @@
 bec=Iceve-Maci
 dbj=Ida'an
 ida=Idakho-Isukha-Tiriki
-idt=Idat\u00e9
+idt=Idat\u221a\u00a9
 ide=Idere
 ids=Idesa
 idi=Idi
@@ -2566,12 +2501,8 @@
 clk=Idu-Mishmi
 ldb=Idun
 viv=Iduna
-ife=If\u00e8
 iff=Ifo
-ifa=Ifugao, Amganad
-ifb=Ifugao, Batad
-ifu=Ifugao, Mayoyao
-ifk=Ifugao, Tuwali
+ife=If\u221a\u00ae
 igl=Igala
 igg=Igana
 ibo=Igbo
@@ -2585,13 +2516,12 @@
 ihb=Iha Based Pidgin
 ihi=Ihievbe
 vki=Ija-Zuba
-ijs=Ijo, Southeast
 ikx=Ik
 ikk=Ika
 ikz=Ikizu
 iki=Iko
 meb=Ikobi-Mena
-ntk=Ikoma
+ntk=Ikoma-Nata-Isenye
 txi=Ikpeng
 ikp=Ikpeshi
 kpo=Ikposo
@@ -2602,225 +2532,244 @@
 ila=Ile Ape
 ili=Ili Turki
 ilu=Ili'uun
+mbi=Ilianen Manobo
 xil=Illyrian
 ilo=Iloko
 ilk=Ilongot
 ilv=Ilue
+mlk=Ilwana
+qvi=Imbabura Highland Quichua
 imo=Imbongu
 ime=Imeraguen
 imn=Imonda
 imr=Imroing
 abx=Inabaknon
 mzu=Inapang
-inp=I\u00f1apari
 smn=Inari Sami
 ins=Indian Sign Language
+idb=Indo-Portuguese
 id=Indonesian
 ind=Indonesian
-pea=Indonesian, Peranakan
+bdl=Indonesian Bajau
 inl=Indonesian Sign Language
-idb=Indo-Portuguese
 idr=Indri
+mvy=Indus Kohistani
 xiv=Indus Valley Language
-inz=Inese\u00f1o
+oin=Inebu One
+inz=Inese\u221a\u00b1o
 inb=Inga
-inj=Inga, Jungle
 izh=Ingrian
 inh=Ingush
+iti=Inlaod Itneg
 ino=Inoke-Yate
 loc=Inonhan
 ior=Inor
+nkf=Inpui Naga
 igs=Interglossa
 ia=Interlingua (International Auxiliary Language Association)
 ina=Interlingua (International Auxiliary Language Association)
 ie=Interlingue
 ile=Interlingue
+ils=International Sign
 int=Intha
 iku=Inuktitut
 iu=Inuktitut
-ike=Inuktitut, Eastern Canadian
-ikt=Inuktitut, Western Canadian
 ik=Inupiaq
 ipk=Inupiaq
-esi=Inupiatun, North Alaskan
-esk=Inupiatun, Northwest Alaska
 iow=Iowa-Oto
-paj=Ipeka-Tapuia
+azm=Ipalapa Amuzgo
 ipo=Ipiko
 ipi=Ipili
 ass=Ipulo
 iqu=Iquito
 irr=Ir
-irn=Ir\u00e1ntxe
 ill=Iranun
 irk=Iraqw
 irh=Irarutu
 iry=Iraya
 ire=Iresim
+bto=Iriga Bicolano
 iri=Irigwe
 ga=Irish
 gle=Irish
-mga=Irish, Middle (900-1200)
-sga=Irish, Old (to 900)
 isg=Irish Sign Language
 iru=Irula
+irn=Ir\u221a\u00b0ntxe
 isa=Isabi
 isn=Isanzu
+agk=Isarog Agta
 isc=Isconahua
 igo=Isebe
 its=Isekiri
 inn=Isinai
 srl=Isirawa
+crb=Island Carib
 icr=Islander Creole English
 isd=Isnag
 iso=Isoko
 isr=Israeli Sign Language
+mir=Isthmus Mixe
+zai=Isthmus Zapotec
+nhk=Isthmus-Cosoleacaque Nahuatl
+nhx=Isthmus-Mecayapan Nahuatl
+nhp=Isthmus-Pajapan Nahuatl
 ist=Istriot
+ruo=Istro Romanian
 szv=Isu (Fako Division)
 isu=Isu (Menchum Division)
+it=Italian
 ita=Italian
-it=Italian
 ise=Italian Sign Language
 itv=Itawit
 itl=Itelmen
 ite=Itene
 itr=Iteri
 itx=Itik
-tiu=Itneg, Adasen
-bjx=Itneg, Banao
-itb=Itneg, Binongan
-iti=Itneg, Inlaod
-itt=Itneg, Maeng
-tis=Itneg, Masadiit
-ity=Itneg, Moyadan
 itw=Ito
 ito=Itonama
 itm=Itu Mbon Uzo
-itu=Itutang
-itz=Itz\u00e1
+mce=Itundujia Mixtec
+itz=Itz\u221a\u00b0
 ium=Iu Mien
 ivv=Ivatan
 atg=Ivbie North-Okpela-Arhe
 ibd=Iwaidja
-iwk=I-Wak
 kbm=Iwal
 iwm=Iwam
-iws=Iwam, Sepik
 iwo=Iwur
 ixc=Ixcatec
-ixj=Ixil, Chajul
-ixi=Ixil, Nebaj
-ixl=Ixil, San Juan Cotzal
+mzi=Ixcatl\u221a\u00b0n Mazatec
+ixl=Ixil
+vmj=Ixtayutla Mixtec
+otz=Ixtenco Otomi
 iya=Iyayu
 uiv=Iyive
 nca=Iyo
-fiz=Izere
+crq=Iyo'wujwa Chorote
+crt=Iyojwa'ja Chorote
+izr=Izere
 izi=Izi-Ezaa-Ikwo-Mgbo
 ijc=Izon
 cbo=Izora
-jbt=Jabut\u00ed
-jac=Jacalteco, Eastern
-jai=Jacalteco, Western
+inp=I\u221a\u00b1apari
+jbt=Jabut\u221a\u2260
 jda=Jad
 jdg=Jadgali
-sne=Jagoi
+jah=Jah Hut
 jad=Jahanka
-jah=Jah Hut
+awv=Jair Awyu
 jat=Jakati
-jkl=Jakelimotu
 jak=Jakun
+maj=Jalapa De D\u221a\u2260az Mazatec
 bxl=Jalkunan
 jcs=Jamaican Country Sign Language
 jam=Jamaican Creole English
-jaa=Jamamad\u00ed
+jaa=Jamamad\u221a\u2260
+jax=Jambi Malay
+mxt=Jamiltepec Mixtec
+djm=Jamsay Dogon
 jnd=Jandavra
+djo=Jangkang
 jna=Jangshung
 jni=Janji
 ja=Japanese
 jpn=Japanese
-ojp=Japanese, Old
 jsl=Japanese Sign Language
-jru=Japrer\u00eda
+jru=Japrer\u221a\u2260a
 jqr=Jaqaru
 jaf=Jara
 jra=Jarai
 anq=Jarawa (India)
 jar=Jarawa (Nigeria)
-jay=Jarnango
 ddj=Jaru
-jap=Jaru\u00e1ra
+qxw=Jauja Wanca Quechua
 jns=Jaunsari
 jav=Javanese
 jv=Javanese
-jvn=Javanese, Caribbean
-jas=Javanese, New Caledonian
+jvd=Javindo
 jaz=Jawe
 jyy=Jaya
 jeb=Jebero
 jeh=Jeh
 jhi=Jehai
 tow=Jemez
+bze=Jenaama Bozo
 jeg=Jeng
+xuj=Jennu Kurumba
 jer=Jere
 jek=Jeri Kuo
 jee=Jerung
+tmr=Jewish Babylonian Aramaic (ca. 200-1200 CE)
+jpa=Jewish Palestinian Aramaic
+jhs=Jhankot Sign Language
 jio=Jiamao
 jya=Jiarong
 juo=Jiba
 jib=Jibu
+apj=Jicarilla Apache
 jii=Jiiddu
 jie=Jilbe
 jil=Jilim
 jim=Jimi (Cameroon)
 jmi=Jimi (Nigeria)
 jia=Jina
-jiy=Jinuo, Buyuan
-jiu=Jinuo, Youle
+cjy=Jinyu Chinese
+pnu=Jiongnai Bunu
 jul=Jirel
 jrr=Jiru
 jit=Jita
 kaj=Jju
 job=Joba
+jbr=Jofotek-Bromnya
 dyo=Jola-Fonyi
 csk=Jola-Kasa
 jeu=Jonkor Bourmataguil
-jor=Jor\u00e1
 jos=Jordanian Sign Language
 jrt=Jorto
+jor=Jor\u221a\u00b0
 jow=Jowulu
 juu=Ju
+ktz=Ju/'hoan
 jun=Juang
 jrb=Judeo-Arabic
 jbe=Judeo-Berber
-jct=Judeo-Crimean Tatar
 jge=Judeo-Georgian
+yhd=Judeo-Iraqi Arabic
 itk=Judeo-Italian
+aju=Judeo-Moroccan Arabic
 jpr=Judeo-Persian
 jdt=Judeo-Tat
-ktz=Ju/'hoan
+yud=Judeo-Tripolitanian Arabic
+ajt=Judeo-Tunisian Arabic
+jye=Judeo-Yemeni Arabic
 jbu=Jukun Takum
-jua=J\u00fama
 jum=Jumjum
+jus=Jumla Sign Language
 jml=Jumli
+inj=Jungle Inga
+mxq=Juquila Mixe
+bex=Jur Modo
 juy=Juray
 juc=Jurchen
-bex=Jur Modo
-jur=Jur\u00fana
+jur=Jur\u221a\u222bna
 jut=Jutish
 mwb=Juwal
+vmc=Juxtlahuaca Mixtec
 jwi=Jwira-Pepesa
+jua=J\u221a\u222bma
+quc=K'iche'
 xku=Kaamba
 ldl=Kaan
 gna=Kaansa
 ksp=Kaba
-kwg=Kaba Deme
 kvf=Kabalai
-kwv=Kaba Na
 kbd=Kabardian
 xkp=Kabatei
-xbx=Kabix\u00ed
-kbp=Kabiy\u00e9
+xbx=Kabix\u221a\u2260
+kbp=Kabiy\u221a\u00a9
 klz=Kabola
+onk=Kabore One
+lkb=Kabras
 uka=Kaburi
 kbu=Kabutra
 kea=Kabuverdianu
@@ -2830,6 +2779,7 @@
 kcx=Kachama-Ganjule
 xac=Kachari
 kfr=Kachchi
+gjk=Kachi Koli
 kac=Kachin
 koe=Kacipo-Balesi
 xkk=Kaco'
@@ -2837,21 +2787,18 @@
 kej=Kadar
 kad=Kadara
 kdu=Kadaru
-kzj=Kadazan, Coastal
-kqt=Kadazan, Klias River
-dtb=Kadazan, Labuk-Kinabatangan
-kbc=Kadiw\u00e9u
+kbc=Kadiw\u221a\u00a9u
 kdv=Kado
 ktp=Kaduo
 kbr=Kafa
 kpu=Kafoa
+gel=Kag-Fer-Jiir-Koor-Ror-Us-Zuksun
+kll=Kagan Kalagan
 syw=Kagate
 cgc=Kagayanen
-gel=Kag-Fer-Jiir-Koor-Ror-Us-Zuksun
 kdm=Kagoma
 xkg=Kagoro
 kki=Kagulu
-xah=Kahayan
 hka=Kahe
 agw=Kahua
 kct=Kaian
@@ -2861,19 +2808,15 @@
 kep=Kaikadi
 kzq=Kaike
 kkq=Kaiku
-kzf=Kaili, Da'a
-lew=Kaili, Ledo
-unz=Kaili, Unde
-xai=Kaimb\u00e9
 zka=Kaimbulawa
-kgp=Kaing\u00e1ng
-zkp=Kaing\u00e1ng, S\u00e3o Paulo
+xai=Kaimb\u221a\u00a9
+kgp=Kaingang
 ckr=Kairak
 kxa=Kairiru
 krd=Kairui-Midiki
 kzm=Kais
 kce=Kaivi
-kgk=Kaiw\u00e1
+kgk=Kaiw\u221a\u00b0
 tcq=Kaiy
 ckq=Kajakse
 xkj=Kajali
@@ -2886,40 +2829,29 @@
 kxe=Kakihum
 kkj=Kako
 keo=Kakwa
+mwp=Kala Lagaw Ya
 kal=Kalaallisut
 kl=Kalaallisut
 kve=Kalabakan
 ijn=Kalabari
 kzz=Kalabra
 kqe=Kalagan
-kll=Kalagan, Kagan
-klg=Kalagan, Tagakaulu
-mwp=Kala Lagaw Ya
+kkf=Kalaktang Monpa
 kmh=Kalam
 gwc=Kalami
-knz=Kalams\u00e9
+knz=Kalams\u221a\u00a9
+wkl=Kalanadi
 kck=Kalanga
 kly=Kalao
 kyl=Kalapuya
-sxk=Kalapuya, Southern
 kba=Kalarko
 kls=Kalasha
 kln=Kalenjin
-kyb=Kalinga, Butbut
-kmk=Kalinga, Limos
-kml=Kalinga, Lower Tanudan
-knb=Kalinga, Lubuagan
-kkg=Kalinga, Mabaka Valley
-kmd=Kalinga, Madukayang
-ksc=Kalinga, Southern
-kgh=Kalinga, Upper Tanudan
 fla=Kalispel-Pend d'Oreille
 xka=Kalkoti
 ktg=Kalkutung
-kak=Kallahan, Kayapa
-ify=Kallahan, Keley-I
-tne=Kallahan, Tinoc
-xal=Kalmyk; Oirat
+xal=Kalmyk
+rmf=Kalo Finnish Romani
 ywa=Kalou
 bco=Kaluli
 kli=Kalumpang
@@ -2936,14 +2868,14 @@
 klp=Kamasa
 kms=Kamasau
 kyk=Kamayo
-kay=Kamayur\u00e1
+kay=Kamayur\u221a\u00b0
+xba=Kamba (Brazil)
+kam=Kamba (Kenya)
 ktb=Kambaata
-xba=Kamba (Brazil)
 kyy=Kambaira
-kam=Kamba (Kenya)
 xbr=Kambera
 irx=Kamberau
-xbw=Kambiw\u00e1
+xbw=Kambiw\u221a\u00b0
 kmi=Kami (Nigeria)
 kcu=Kami (Tanzania)
 kcq=Kamo
@@ -2953,7 +2885,7 @@
 xvi=Kamviri
 hig=Kamwe
 xnb=Kanakanabu
-knm=Kanamar\u00ed
+knm=Kanamar\u221a\u2260
 xns=Kanashi
 soq=Kanasi
 bjj=Kanauji
@@ -2966,7 +2898,7 @@
 kkv=Kangean
 igm=Kanggape
 kxs=Kangjia
-kty=Kango (Bas-U\u00e9l\u00e9 District)
+kty=Kango (Bas-U\u221a\u00a9l\u221a\u00a9 District)
 kzy=Kango (Tshopo District)
 xnr=Kangri
 ktk=Kaniet
@@ -2977,89 +2909,66 @@
 wat=Kaninuwa
 kmu=Kanite
 kft=Kanjari
-kjb=Kanjobal, Eastern
-knj=Kanjobal, Western
 kbe=Kanju
 kne=Kankanaey
-xnn=Kankanay, Northern
 kan=Kannada
 kn=Kannada
-kxo=Kano\u00e9
-kxn=Kanowit
+kfi=Kannada Kurumba
+kxn=Kanowit-Tanjong Melanau
+kxo=Kano\u221a\u00a9
 ksk=Kansa
 xkt=Kantosi
 khx=Kanu
 kni=Kanufi
-khd=Kanum, B\u00e4di
-kcd=Kanum, Ngk\u00e2lmpw
-kxq=Kanum, Sm\u00e4rky
-krz=Kanum, Sota
 kau=Kanuri
 kr=Kanuri
-bms=Kanuri, Bilma
-knc=Kanuri, Central
-kby=Kanuri, Manga
-krt=Kanuri, Tumari
 kny=Kanyok
 kax=Kao
 kqn=Kaonde
+ykm=Kap
 tbx=Kapin
-xpn=Kapinaw\u00e1
+xpn=Kapinaw\u221a\u00b0
 kpg=Kapingamarangi
 khp=Kapori
 dju=Kapriman
+kbi=Kaptiau
 klo=Kapya
-xrb=Karaboro, Eastern
-kza=Karaboro, Western
+cak=Kaqchikel
 kah=Kara (Central African Republic)
+zra=Kara (Korea)
+leu=Kara (Papua New Guinea)
+reg=Kara (Tanzania)
+kaa=Kara-Kalpak
 krc=Karachay-Balkar
 gbd=Karadjeri
+mry=Karaga Mandaya
 kim=Karagas
 xkh=Karahawyana
 kdr=Karaim
-kpj=Karaj\u00e1
-kaa=Kara-Kalpak
-zra=Kara (Korea)
+kpj=Karaj\u221a\u00b0
+xqa=Karakhanid
 xar=Karami
 kdj=Karamojong
 kzr=Karang
 kth=Karanga
 zkk=Karankawa
 kyj=Karao
-leu=Kara (Papua New Guinea)
 kgv=Karas
 kpt=Karata
-reg=Kara (Tanzania)
 xrw=Karawa
 mjw=Karbi
 kbn=Kare (Central African Republic)
+kmf=Kare (Papua New Guinea)
 kai=Karekare
 krl=Karelian
-kvl=Karen, Brek
-bwe=Karen, Bwe
-kvq=Karen, Geba
-ghk=Karen, Geko
-kvt=Karen, Lahta
-kxf=Karen, Manumanaw
-kpp=Karen, Paku
-blk=Karen, Pa'o
-kjt=Karen, Phrae Pwo
-kjp=Karen, Pwo Eastern
-pww=Karen, Pwo Northern
-pwo=Karen, Pwo Western
-ksw=Karen, S'gaw
-kvu=Karen, Yinbaw
-kvy=Karen, Yintale
-kxk=Karen, Zayein
-kmf=Kare (Papua New Guinea)
 kyd=Karey
 kbj=Kari
 kgn=Karingani
-kuq=Karipun\u00e1
-kgm=Karip\u00fana
-kmv=Karip\u00fana Creole French
-kzw=Karir\u00ed-Xoc\u00f3
-ktn=Kariti\u00e2na
+kuq=Karipuna
+kgm=Karip\u221a\u222bna
+kmv=Karip\u221a\u222bna Creole French
+kzw=Karir\u221a\u2260-Xoc\u221a\u2265
+ktn=Kariti\u221a\u00a2na
 kil=Kariya
 vka=Kariyarra
 yuj=Karkar-Yuri
@@ -3089,67 +2998,62 @@
 xat=Katawixi
 tmb=Katbol
 xtc=Katcha-Kadugli-Miri
-kmg=K\u00e2te
+tkt=Kathoriya Tharu
+ykt=Kathu
 bsh=Kati
-kxg=Katingan
 kfu=Katkari
 kcr=Katla
 ktw=Kato
+kaf=Katso
 kta=Katua
-ktv=Katu, Eastern
-kav=Katuk\u00edna
-knt=Katuk\u00edna, Panoan
-kuf=Katu, Western
+kav=Katuk\u221a\u2260na
 pss=Kaulong
 vkk=Kaur
 bpp=Kaure
 zku=Kaurna
 xau=Kauwera
 ckv=Kavalan
+krv=Kavet
 kcb=Kawacha
 xaw=Kawaiisu
 kgb=Kawe
 kaw=Kawi
-ktx=Kaxarar\u00ed
-kbb=Kaxui\u00e2na
-kyz=Kayab\u00ed
+ktx=Kaxarar\u221a\u2260
+kbb=Kaxui\u221a\u00a2na
+kyz=Kayab\u221a\u2260
 kyt=Kayagar
-eky=Kayah, Eastern
-kyu=Kayah, Western
 pdu=Kayan
-kys=Kayan, Baram
-bfg=Kayan, Busang
-xkn=Kayan, Kayan River
 xay=Kayan Mahakam
-xkd=Kayan, Mendalam
-mxr=Kayan, Murik
-ree=Kayan, Rejang
-whu=Kayan, Wahau
-txu=Kayap\u00f3
+xkn=Kayan River Kayan
+kak=Kayapa Kallahan
+txu=Kayap\u221a\u2265
 gyd=Kayardild
 kzl=Kayeli
 kxy=Kayong
 kyv=Kayort
 gbb=Kaytetye
-vky=Kayu Agung
 kzu=Kayupulau
 kaz=Kazakh
 kk=Kazakh
 kzk=Kazukuru
+xxk=Ke'o
+keh=Keak
 khz=Keapara
+meo=Kedah Malay
 ksx=Kedang
 kdy=Keder
 khh=Kehu
 kei=Kei
 kec=Keiga
 bmh=Kein
-kek=Kekch\u00ed
-kzi=Kelabit
+eyo=Keiyo
+kek=Kekch\u221a\u2260
 kel=Kela (Democratic Republic of Congo)
 kcl=Kela (Papua New Guinea)
-keb=K\u00e9l\u00e9
+kzi=Kelabit
 khy=Kele (Democratic Republic of Congo)
 sbc=Kele (Papua New Guinea)
+ify=Keley-I Kallahan
 kbo=Keliko
 xel=Kelo
 kyo=Kelon
@@ -3158,6 +3062,7 @@
 bzp=Kemberano
 xkw=Kembra
 dmo=Kemezung
+sjk=Kemi Sami
 kfj=Kemiehua
 kmt=Kemtuik
 gat=Kenati
@@ -3170,28 +3075,16 @@
 kns=Kensiu
 ndb=Kenswei Nsei
 kzh=Kenuzi-Dongola
-bwv=Kenyah, Bahau River
-boc=Kenyah, Bakung
-knh=Kenyah, Kayan River
-xkl=Kenyah, Kelinyau
-xkm=Kenyah, Mahakam
-sib=Kenyah, Sebob
-ttw=Kenyah, Tutoh
-ubm=Kenyah, Upper Baram
-whk=Kenyah, Wahau
-xky=Kenyah, Western
+xki=Kenyan Sign Language
 ken=Kenyang
-xki=Kenyan Sign Language
 lke=Kenyi
-xxk=Ke'o
-kpn=Kepkiriw\u00e1t
+xeu=Keoru-Ahia
+kpn=Kepkiriw\u221a\u00b0t
 kuk=Kepo'
 ker=Kera
 hhr=Kerak
-xke=Kereho-Uheng
+xke=Kereho
 krk=Kerek
-kee=Keres, Eastern
-kjq=Keres, Western
 ked=Kerewe
 kxz=Kerewo
 kvr=Kerinci
@@ -3201,42 +3094,39 @@
 kcv=Kete
 xte=Ketengban
 ktt=Ketum
-xeu=Keuru
-kjs=Kewa, East
-kew=Kewa, West
 kyg=Keyagana
 xkv=Kgalagadi
 kjh=Khakas
 kjf=Khalaj
-klj=Khalaj, Turkic
 klr=Khaling
 kbg=Khamba
-kgj=Kham, Gamale
-kip=Kham, Sheshi
+khg=Khams Tibetan
 kht=Khamti
 ksu=Khamyang
 ogo=Khana
 khn=Khandesi
-kjm=Kh\u00e1ng
 kca=Khanty
 xao=Khao
+kfw=Kharam Naga
 khr=Kharia
 ksy=Kharia Thar
 kha=Khasi
+lko=Khayo
 zkz=Khazar
 kqg=Khe
 tlx=Khehek
 xkf=Khengkha
 xhe=Khetrani
+nkh=Khezha Naga
+kix=Khiamniungan Naga
 kjj=Khinalugh
 kwx=Khirwar
 kqm=Khisa
 llo=Khlor
-khm=Khmer
-km=Khmer
-kxm=Khmer, Northern
+ykl=Khlula
 kjg=Khmu
 xkc=Kho'ini
+nkb=Khoibu Naga
 ktc=Kholok
 kmz=Khorasani Turkish
 zkh=Khorezmian
@@ -3244,34 +3134,34 @@
 khw=Khowar
 xhv=Khua
 khf=Khuen
-kkh=Kh\u00fcn
+cka=Khumi Awa Chin
+cnk=Khumi Chin
 kfm=Khunsari
 khv=Khvarshi
+kjm=Kh\u221a\u00b0ng
+kkh=Kh\u221a\u00ban
 kie=Kibet
 prm=Kibiri
 kic=Kickapoo
 kzg=Kikai
 ki=Kikuyu
 kik=Kikuyu
+sjd=Kildin Sami
 kij=Kilivila
 klb=Kiliwa
 kih=Kilmeri
 kia=Kim
+mji=Kim Mun
 kig=Kimaama
 kqr=Kimaragang
 kiv=Kimbu
 kmb=Kimbundu
 sbt=Kimki
-mji=Kim Mun
-kqp=Kimr\u00e9
-dmg=Kinabatangan, Upper
+kqp=Kimr\u221a\u00a9
 kco=Kinalakna
 krj=Kinaray-A
 zga=Kinga
 kfk=Kinnauri
-nes=Kinnauri, Bhoti
-cik=Kinnauri, Chitkuli
-kjo=Kinnauri, Harijan
 knq=Kintaq
 kkd=Kinuku
 kin=Kinyarwanda
@@ -3280,6 +3170,8 @@
 kkm=Kiong
 xko=Kiorr
 kio=Kiowa
+apk=Kiowa Apache
+sgc=Kipsigis
 kyi=Kiput
 kkr=Kir-Balar
 geb=Kire
@@ -3287,24 +3179,23 @@
 ky=Kirghiz
 okr=Kirike
 kiy=Kirikiri
-kiu=Kirmanjki
+kiu=Kirmanjki (individual language)
 kis=Kis
+lks=Kisa
 kqh=Kisankasa
 kje=Kisar
 kiz=Kisi
-kss=Kisi, Southern
-kqs=Kissi, Northern
 gru=Kistane
+mwk=Kita Maninkakan
 zkt=Kitan
 gia=Kitja
 kii=Kitsai
 mkw=Kituba (Congo)
 ktu=Kituba (Democratic Republic of Congo)
-kiw=Kiwai, Northeast
-kjd=Kiwai, Southern
 kla=Klamath-Modoc
 klu=Klao
-tlh=Klingon; tlhIngan-Hol
+kqt=Klias River Kadazan
+tlh=Klingon
 czk=Knaanic
 fuj=Ko
 kib=Koalib
@@ -3314,8 +3205,10 @@
 kgu=Kobol
 kpw=Kobon
 kdq=Koch
+thq=Kochila Tharu
 cdz=Koda
-kfa=Kodagu
+ksz=Kodaku
+kfa=Kodava
 vko=Kodeoha
 kod=Kodi
 kwp=Kodia
@@ -3325,117 +3218,110 @@
 kwl=Kofyar
 zkg=Koguryo
 kkx=Kohin
-mvy=Kohistani, Indus
+plk=Kohistani Shina
 kpm=Koho
-kob=Kohoroxitari
 bcs=Kohumono
 kkt=Koi
-kpx=Koiali, Mountain
-kbk=Koiari, Grass
 zkb=Koibal
 nkd=Koireng
 kqi=Koitabu
 kxt=Koiwat
+trp=Kok Borok
 ktd=Kokata
-trp=Kok Borok
 kou=Koke
 xod=Kokoda
 kzn=Kokola
 kkk=Kokota
+ekl=Kol
+biw=Kol (Cameroon)
+kol=Kol (Papua New Guinea)
 kvv=Kola
-kfb=Kolami, Northwestern
-nit=Kolami, Southeastern
 klc=Kolbila
-biw=Kol (Cameroon)
-gjk=Koli, Kachi
-kvx=Koli, Parkari
-kxp=Koli, Wadiyara
+skn=Kolibugan Subanon
 klm=Kolom
-kol=Kol (Papua New Guinea)
-ksh=K\u00f6lsch
+dkl=Kolum So Dogon
 klx=Koluwawa
+bkm=Kom (Cameroon)
+kmm=Kom (India)
 kmy=Koma
 kpf=Komba
 tyn=Kombai
 xbi=Kombio
-bkm=Kom (Cameroon)
 kge=Komering
 kom=Komi
 kv=Komi
-kmm=Kom (India)
-xoi=Kominimung
 koi=Komi-Permyak
 kpv=Komi-Zyrian
+xoi=Kominimung
 kmw=Komo (Democratic Republic of Congo)
+xom=Komo (Sudan)
 kvh=Komodo
-xom=Komo (Sudan)
 kvp=Kompane
-kxc=Komso
 kzv=Komyandaret
+kkn=Kon Keu
 kxw=Konai
 knd=Konda
 kfc=Konda-Dora
 kdw=Koneraw
 kg=Kongo
 kon=Kongo
-kwy=Kongo, San Salvador
-koo=Konjo
-kjc=Konjo, Coastal
-kjk=Konjo, Highland
-kok=Konkani (generic)
-gom=Konkani, Goanese
-knn=Konkani (specific)
-kkn=Kon Keu
+knn=Konkani (individual language)
+kok=Konkani (macrolanguage)
 xon=Konkomba
 kma=Konni
 knu=Kono (Guinea)
+klk=Kono (Nigeria)
+kno=Kono (Sierra Leone)
 koa=Konomala
 kcz=Konongo
-klk=Kono (Nigeria)
-kno=Kono (Sierra Leone)
+kxc=Konso
+nbe=Konyak Naga
+mku=Konyanka Maninka
+koo=Konzo
 kng=Koongo
 ozm=Koonzime
 kqy=Koorete
 xop=Kopar
 opk=Kopkaka
-kpr=Korafe
-kfd=Koraga, Korra
-vmd=Koraga, Mudu
+kpr=Korafe-Yegha
 koz=Korak
-ksz=Koraku
 kqz=Korana
 kcy=Korandje
 ko=Korean
 kor=Korean
-okm=Korean, Middle (10th - 16th cent.)
-oko=Korean, Old (3rd - 9th cent.)
 kvk=Korean Sign Language
 coe=Koreguaje
 okh=Koresh-e Rostam
 kfq=Korku
 vkp=Korlai Creole Portuguese
-kfo=Koro (C\u00f4te d'Ivoire)
-kfz=Koromf\u00e9
+kfo=Koro (C\u221a\u00a5te d'Ivoire)
+kxr=Koro (Papua New Guinea)
+krf=Koro (Vanuatu)
+kfz=Koromf\u221a\u00a9
 kqj=Koromira
+bpr=Koronadal Blaan
 xkq=Koroni
 krp=Korop
-kxr=Koro (Papua New Guinea)
+xxr=Korop\u221a\u2265
 ktl=Koroshi
-krf=Koro (Vanuatu)
 khe=Korowai
-krg=Korowai, North
+kfd=Korra Koraga
 xor=Korubo
 kpq=Korupun-Sela
 kfp=Korwa
 kpy=Koryak
 kiq=Kosadle
+kkl=Kosarek Yale
 kze=Kosena
 kid=Koshin
 kos=Kosraean
 koq=Kota (Gabon)
 kfe=Kota (India)
+mqg=Kota Bangun Kutai Malay
 grm=Kota Marudu Talantang
 ktr=Kota Marudu Tinagas
+kqk=Kotafon Gbe
+avk=Kotava
 eko=Koti
 zko=Kott
 kyf=Kouya
@@ -3443,10 +3329,12 @@
 kvc=Kove
 xow=Kowaki
 kwh=Kowiai
+kqd=Koy Sanjaq Surat
 kff=Koya
 kga=Koyaga
 koh=Koyo
-kqd=Koy Sanjaq Surat
+khq=Koyra Chiini Songhay
+ses=Koyraboro Senni Songhai
 koy=Koyukon
 kuw=Kpagua
 kpl=Kpala
@@ -3455,17 +3343,11 @@
 koc=Kpati
 kym=Kpatili
 kpe=Kpelle
-gkp=Kpelle, Guinea
-xpe=Kpelle, Liberia
 kef=Kpessi
 kph=Kplang
 kye=Krache
-kqo=Krahn, Eastern
-krw=Krahn, Western
-xra=Krah\u00f4
+xra=Krah\u221a\u00a5
 rka=Kraol
-krv=Kravet
-kre=Kreen-Akarore
 kqq=Krenak
 zkv=Krevinian
 xre=Kreye
@@ -3476,11 +3358,8 @@
 ksi=Krisa
 kxb=Krobu
 kgo=Krongo
-krq=Krui
-ktj=Krumen, Plapo
-pye=Krumen, Pye
-ted=Krumen, Tepo
 krr=Kru'ng 2
+jct=Krymchak
 kry=Kryts
 tyu=Kua
 uan=Kuan
@@ -3492,6 +3371,7 @@
 kof=Kubi
 jko=Kubo
 kvb=Kubu
+lkc=Kucong
 kfg=Kudiya
 kyw=Kudmali
 kov=Kudu-Camo
@@ -3500,7 +3380,7 @@
 kxu=Kui (India)
 kvd=Kui (Indonesia)
 dkr=Kuijau
-kui=Kuik\u00faro-Kalap\u00e1lo
+kui=Kuik\u221a\u222bro-Kalap\u221a\u00b0lo
 vkj=Kujarge
 kfn=Kuk
 kux=Kukatja
@@ -3513,11 +3393,11 @@
 uwa=Kuku-Uwanh
 gvn=Kuku-Yalanji
 tpg=Kula
-kzc=Kulango, Bondoukou
-nku=Kulango, Bouna
 kul=Kulere
 kxj=Kulfa
+xpk=Kulina Pano
 vkl=Kulisusu
+kfx=Kullu Pahari
 uun=Kulon-Pazeh
 kle=Kulung (Nepal)
 bbu=Kulung (Nigeria)
@@ -3526,25 +3406,24 @@
 kdi=Kumam
 kue=Kuman
 qwm=Kuman (Russia)
+kfy=Kumaoni
 kmj=Kumarbhag Paharia
-kfy=Kumauni
 ksm=Kumba
 kgs=Kumbainggar
+wkb=Kumbaran
 xks=Kumbewaha
 kra=Kumhali
 dih=Kumiai
 kuo=Kumukio
 kum=Kumyk
 zum=Kumzari
-kvn=Kuna, Border
 kun=Kunama
-cuk=Kuna, San Blas
 wlg=Kunbarlang
 kdn=Kunda
-xuf=Kunfal
+wku=Kunduvadi
 kfl=Kung
+knw=Kung-Ekoka
 ggk=Kungarakany
-knw=Kung-Ekoka
 kvs=Kunggara
 kgl=Kunggari
 kse=Kuni
@@ -3558,16 +3437,15 @@
 xuo=Kuo
 kto=Kuot
 kug=Kupa
+mkn=Kupang Malay
 key=Kupia
 kpz=Kupsabiny
 kuv=Kur
+nqk=Kura Ede Nago
 krh=Kurama
 knk=Kuranko
 ku=Kurdish
 kur=Kurdish
-ckb=Kurdish, Central
-kmr=Kurdish, Northern
-sdh=Kurdish, Southern
 nbn=Kuri
 kuj=Kuria
 kfh=Kurichiya
@@ -3575,21 +3453,15 @@
 vku=Kurrama
 ktm=Kurti
 xkz=Kurtokha
-kyr=Kuru\u00e1ya
 kjr=Kurudu
 kru=Kurukh
-kfi=Kurumba
-xua=Kurumba, Alu
-xub=Kurumba, Betta
-xuj=Kurumba, Jennu
-kpb=Kurumba, Mullu
-kxl=Kurux, Nepali
+kyr=Kuru\u221a\u00b0ya
 kus=Kusaal
 ksg=Kusaghe
 kuh=Kushi
-kuu=Kuskokwim, Upper
 ksv=Kusu
 kgg=Kusunda
+ght=Kutang Ghale
 kut=Kutenai
 kub=Kutep
 xut=Kuthant
@@ -3601,11 +3473,12 @@
 blh=Kuwaa
 cwt=Kuwaataay
 kdt=Kuy
+fkv=Kven Finnish
+wka=Kw'adza
 kwb=Kwa
 bko=Kwa'
 ksq=Kwaami
 kwz=Kwadi
-wka=Kw'adza
 kwd=Kwaio
 kdz=Kwaja
 kwq=Kwak
@@ -3616,13 +3489,16 @@
 kwm=Kwambi
 tnk=Kwamera
 ktf=Kwami
+okk=Kwamtim One
 kvi=Kwang
 kwj=Kwanga
 kwn=Kwangali
 knp=Kwanja
 kwf=Kwara'ae
+nmg=Kwasio
 kop=Kwato
 kya=Kwaya
+xwa=Kwaza
 xwg=Kwegu
 kwr=Kwer
 kwe=Kwerba
@@ -3632,28 +3508,33 @@
 kws=Kwese
 kwt=Kwesten
 gww=Kwini
+kuc=Kwinsu
 kww=Kwinti
 kmo=Kwoma
 kwo=Kwomtari
-aue==/Kx'au//'ein
 xuu=Kxoe
 bka=Kyak
 kyc=Kyaka
 kql=Kyenele
 tye=Kyenga
 kgy=Kyerung
-ldn=L\u00e1adan
+kmg=K\u221a\u00a2te
+keb=K\u221a\u00a9l\u221a\u00a9
+ksh=K\u221a\u2202lsch
+lbi=La'bi
 gdm=Laal
 ldi=Laari
 lau=Laba
 lbb=Label
-lbi=La'bi
 jku=Labir
 mwi=Labo
+ypb=Labo Phowa
 lbu=Labu
+dtb=Labuk-Kinabatangan Kadazan
 lac=Lacandon
 lbt=Lachi
-lwh=Lachi, White
+zpa=Lachiguiri Zapotec
+zpl=Lachix\u221a\u2260o Zapotec
 lbj=Ladakhi
 lld=Ladin
 lad=Ladino
@@ -3663,35 +3544,42 @@
 lgh=Laghuu
 kot=Lagwan
 lhh=Laha (Indonesia)
+lha=Laha (Viet Nam)
 lhn=Lahanan
-lha=Laha (Viet Nam)
 lah=Lahnda
+kvt=Lahta Karen
 lhu=Lahu
-kds=Lahu Shi
+lhi=Lahu Shi
+lhl=Lahul Lohar
 lmx=Laimbue
 lji=Laiyolo
 lbe=Lak
 lap=Laka (Chad)
+lak=Laka (Nigeria)
 lka=Lakalei
-lak=Laka (Nigeria)
+lmw=Lake Miwok
 lkh=Lakha
 lki=Laki
 lbc=Lakkia
-lkn=Lakona
+lkn=Lakon
+lkd=Lakond\u221a\u2122
 lkt=Lakota
+dic=Lakota Dida
 nrz=Lala
 leb=Lala-Bisa
 lla=Lala-Roba
+cnl=Lalana Chinantec
 lal=Lalia
+lay=Lama (Myanmar)
+las=Lama (Togo)
 slp=Lamaholot
 lmr=Lamalera
 lmm=Lamam
-lay=Lama (Myanmar)
 hia=Lamang
-las=Lama (Togo)
 lmq=Lamatuka
 lam=Lamba
 lmn=Lambadi
+quf=Lambayeque Quechua
 lmh=Lambichhong
 lmy=Lamboya
 lai=Lambya
@@ -3703,26 +3591,34 @@
 lev=Lamma
 lns=Lamnso'
 lmg=Lamogai
-ljp=Lampung
+ljp=Lampung Api
+abl=Lampung Nyo
+llh=Lamu
 lby=Lamu-Lamu
+ruu=Lanas Lobu
 ldm=Landoma
+yne=Lang'e
 lnm=Langam
 lna=Langbashe
 lag=Langi
-lng=Langobardic
+yln=Langnian Buyang
 lno=Lango (Sudan)
 laj=Lango (Uganda)
-lnc=Languedocien
+lng=Langobardic
+sfb=Langue des signes de Belgique Francophone
 lnh=Lanoh
-lni=Lantanai
 lao=Lao
 lo=Lao
+lwm=Laomian
 lbg=Laopang
 lso=Laos Sign Language
-lra=Lara'
+ztl=Lapagu\u221a\u2260a-Guivini Zapotec
+laa=Lapuyan Subanun
 lrg=Laragia
+lrt=Larantuka Malay
 lbz=Lardil
 lrv=Larevat
+hmd=Large Flowery Miao
 lrl=Lari
 alo=Larike-Wakasihu
 lro=Laro
@@ -3732,9 +3628,11 @@
 lsa=Lasgerdi
 lsi=Lashi
 lss=Lasi
+ltc=Late Middle Chinese
 la=Latin
 lat=Latin
 ltu=Latu
+ltn=Latund\u221a\u2122
 lav=Latvian
 lv=Latvian
 lsl=Latvian Sign Language
@@ -3748,13 +3646,13 @@
 brb=Lave
 lbo=Laven
 lvk=Lavukaleve
-lwl=Lawa, Eastern
 lbx=Lawangan
-lcp=Lawa, Western
 tgi=Lawunuia
 lya=Layakha
 lzz=Laz
+cle=Lealao Chinantec
 lec=Leco
+lew=Ledo Kaili
 ldk=Leelau
 lfa=Lefa
 lgm=Lega-Mwenga
@@ -3764,19 +3662,17 @@
 tql=Lehali
 urr=Lehalurup
 cae=Lehar
+lzn=Leinong Naga
 lek=Leipon
 llk=Lelak
 lln=Lele (Chad)
 lel=Lele (Democratic Republic of Congo)
 llc=Lele (Guinea)
+lle=Lele (Papua New Guinea)
 lef=Lelemi
 lpa=Lelepa
-lle=Lele (Papua New Guinea)
-lmt=Lematang
-liw=Lembak
-lmf=Lembata, South
-lmj=Lembata, West
 leq=Lembena
+lrz=Lemerig
 lei=Lemio
 xle=Lemnian
 ley=Lemolang
@@ -3801,8 +3697,6 @@
 nms=Letemboi
 leo=Leti (Cameroon)
 lti=Leti (Indonesia)
-lb=Letzeburgesch
-ltz=Letzeburgesch
 lvu=Levuka
 lww=Lewo
 lwe=Lewo Eleng
@@ -3811,12 +3705,17 @@
 lez=Lezghian
 lhp=Lhokpu
 lhm=Lhomi
+ljl=Li'o
 lix=Liabuku
 ste=Liana-Seti
+njn=Liangmai Naga
+zln=Lianshan Zhuang
+xpe=Liberia Kpelle
 lir=Liberian English
 liq=Libido
 liz=Libinza
 xli=Liburnian
+ayl=Libyan Arabic
 lbs=Libyan Sign Language
 lig=Ligbi
 lgz=Ligenza
@@ -3833,50 +3732,52 @@
 lll=Lilau
 lil=Lillooet
 bme=Limassa
-lma=Limba, East
-lia=Limba, West-Central
 lif=Limbu
 lmp=Limbum
-li=Limburgish, Limburger, Limburgan
-lim=Limburgish, Limburger, Limburgan
+li=Limburgan
+lim=Limburgan
+ylm=Limi
 lmc=Limilngan
-lms=Limousin
+kmk=Limos Kalinga
 klw=Lindu
-lnq=Linga
+lab=Linear A
 lin=Lingala
 ln=Lingala
 onb=Lingao
 lgk=Lingarak
 lii=Lingkhim
 pml=Lingua Franca
-lnt=Lintang
-ljl=Li'o
+lfn=Lingua Franca Nova
+apl=Lipan Apache
 lpo=Lipo
 lcs=Lisabata-Nuniali
 lcl=Lisela
+lsh=Lish
 lsd=Lishana Deni
-trg=Lish\u00e1n Did\u00e1n
 aij=Lishanid Noshan
+trg=Lish\u221a\u00b0n Did\u221a\u00b0n
 lis=Lisu
+lzh=Literary Chinese
 lit=Lithuanian
 lt=Lithuanian
 lls=Lithuanian Sign Language
 lzl=Litzlitz
+zlj=Liujiang Zhuang
+zlq=Liuqian Zhuang
 liv=Liv
 olo=Livvi
+lht=Lo-Toga
 lrk=Loarki
 loq=Lobala
 lob=Lobi
-ruu=Lobu, Lanas
-low=Lobu, Tampias
 lbm=Lodhi
 lgq=Logba
 log=Logo
 lof=Logol
 rag=Logooli
 liu=Logorik
-gda=Lohar, Gade
-lhl=Lohar, Lahul
+src=Logudorese Sardinian
+qvj=Loja Highland Quichua
 jbo=Lojban
 yaz=Lokaa
 lok=Loko
@@ -3886,17 +3787,18 @@
 llg=Lole
 llb=Lolo
 loa=Loloda
-mfb=Lom
-loi=Loma (C\u00f4te d'Ivoire)
+ycl=Lolopo
+loi=Loma (C\u221a\u00a5te d'Ivoire)
+lom=Loma (Liberia)
 lmv=Lomaiviti
-lom=Loma (Liberia)
 rmi=Lomavren
 lmo=Lombard
 lmi=Lombi
 loo=Lombo
 ngl=Lomwe
-lon=Lomwe, Malawi
 lce=Loncong
+lpn=Long Phuri Naga
+ttw=Long Wat
 lgu=Longgu
 wok=Longto
 lnu=Longuda
@@ -3909,26 +3811,36 @@
 lpx=Lopit
 lrn=Lorang
 lnn=Lorediakarkar
-lbr=Lorung, Northern
-lrr=Lorung, Southern
+spq=Loreto-Ucayali Spanish
 uvl=Lote
+njh=Lotha Naga
 dtr=Lotud
 loj=Lou
 lou=Louisiana Creole French
 lox=Loun
 xlo=Loup A
 xlb=Loup B
+nds=Low German
 loy=Lowa
-nds=Low German; Low Saxon
+cea=Lower Chehalis
+dni=Lower Grand Valley Dani
+sli=Lower Silesian
+dsb=Lower Sorbian
+tto=Lower Ta'oih
+taa=Lower Tanana
+kml=Lower Tanudan Kalinga
+clo=Lowland Oaxaca Chontal
+tac=Lowland Tarahumara
+ztp=Loxicha Zapotec
 loz=Lozi
-khb=L\u00fc
 prb=Lua'
 lex=Luang
+lu=Luba-Katanga
 lub=Luba-Katanga
-lu=Luba-Katanga
 lua=Luba-Lulua
 kcc=Lubila
 lcf=Lubu
+knb=Lubuagan Kalinga
 lch=Luchazi
 luq=Lucumi
 lud=Ludian
@@ -3950,11 +3862,10 @@
 lun=Lunda
 lnd=Lundayeh
 lga=Lungga
-luw=Luo
+luw=Luo (Cameroon)
 luo=Luo (Kenya and Tanzania)
+hml=Luopohe Hmong
 ldd=Luri
-lrc=Luri, Northern
-luz=Luri, Southern
 lse=Lusengo
 lus=Lushai
 lut=Lushootseed
@@ -3963,32 +3874,42 @@
 ndy=Lutos
 lue=Luvale
 luv=Luwati
-xlu=Luwian, Cuneiform
-hlu=Luwian, Hieroglyphic
 lwo=Luwo
+lb=Luxembourgish
+ltz=Luxembourgish
 lyn=Luyana
 luy=Luyia
 lwa=Lwalu
 xlc=Lycian
 xld=Lydian
-lee=Ly\u00e9l\u00e9
+lyg=Lyngngam
 lsg=Lyons Sign Language
+lee=Ly\u221a\u00a9l\u221a\u00a9
+ldn=L\u221a\u00b0adan
+bwj=L\u221a\u00b0\u221a\u00b0 L\u221a\u00b0\u221a\u00b0 Bwamu
+khb=L\u221a\u00ba
+msj=Ma (Democratic Republic of Congo)
+mjn=Ma (Papua New Guinea)
+mhy=Ma'anyan
+mhi=Ma'di
+slz=Ma'ya
 cma=Maa
 mew=Maaka
-mhy=Ma'anyan
+ffm=Maasina Fulfulde
 ymm=Maay
+mde=Maba (Chad)
+mqa=Maba (Indonesia)
 mmz=Mabaale
 mfz=Mabaan
-mde=Maba (Chad)
-mqa=Maba (Indonesia)
+kkg=Mabaka Valley Kalinga
 muj=Mabire
 mca=Maca
 mcl=Macaguaje
-mbn=Macagu\u00e1n
+mbn=Macagu\u221a\u00b0n
 mzs=Macanese
+rup=Macedo-Romanian
+mk=Macedonian
 mkd=Macedonian
-mk=Macedonian
-xmk=Macedonian, Ancient
 jmc=Machame
 mcb=Machiguenga
 mpd=Machinere
@@ -3997,136 +3918,109 @@
 myy=Macuna
 mbc=Macushi
 mxu=Mada (Cameroon)
+mda=Mada (Nigeria)
 mzc=Madagascar Sign Language
 mmx=Madak
-mqd=Madang
-mda=Mada (Nigeria)
-msj=Ma (Democratic Republic of Congo)
 xmx=Maden
 grg=Madi
-mhi=Ma'di
-snm=Ma'di, Southern
 zml=Madngele
+kmd=Madukayang Kalinga
 mad=Madurese
 mme=Mae
 hmk=Maek
-mwo=Maewo, Central
+itt=Maeng Itneg
 maf=Mafa
 mkv=Mafea
+sgb=Mag-Anchi Ayta
+blx=Mag-Indi Ayta
 mtw=Magahat
 mag=Magahi
-mgp=Magar, Eastern
-mrd=Magar, Western
-gmd=M\u00e1ghd\u00ec
+xtm=Magdalena Pe\u221a\u00b1asco Mixtec
 gmx=Magoma
 zgr=Magori
 mdh=Maguindanao
 mjx=Mahali
+bfz=Mahasu Pahari
 mja=Mahei
 mjy=Mahican
 mhb=Mahongwe
 mxx=Mahou
+ayz=Mai Brat
 sks=Maia
 mzz=Maiadomu
 tnh=Maiani
-ayz=Mai Brat
-nmu=Maidu, Northeast
-mjd=Maidu, Northwest
-vmv=Maidu, Valley
 mmm=Maii
 mgu=Mailu
 cwb=Maindo
-vmf=Mainfr\u00e4nkisch
+vmf=Mainfr\u221a\u00a7nkisch
+xkl=Mainstream Kenyah
 zrs=Mairasi
 mbq=Maisin
 mai=Maithili
 wmm=Maiwa (Indonesia)
+mti=Maiwa (Papua New Guinea)
 mum=Maiwala
-mti=Maiwa (Papua New Guinea)
 mpe=Majang
 xmj=Majera
 mjz=Majhi
 mmj=Majhwar
+mkg=Mak (China)
+pbl=Mak (Nigeria)
 mcp=Makaa
 myh=Makah
 mkz=Makasae
 mak=Makasar
+mfp=Makassar Malay
 aup=Makayam
-mkg=Mak (China)
 vmw=Makhuwa
 xmc=Makhuwa-Marrevone
 mgh=Makhuwa-Meetto
 mhm=Makhuwa-Moniga
 xsq=Makhuwa-Saka
 vmk=Makhuwa-Shirima
-mky=Makian, East
-mqs=Makian, West
 mgf=Maklew
-pbl=Mak (Nigeria)
 zmh=Makolkol
 kde=Makonde
 lva=Maku'a
-mpu=Makur\u00e1p
+jmn=Makuri Naga
+mpu=Makur\u221a\u00b0p
 ymk=Makwe
+umn=Makyan Naga
 mlf=Mal
+mkb=Mal Paharia
+ruy=Mala (Nigeria)
+ped=Mala (Papua New Guinea)
+ima=Mala Malasar
 ccm=Malaccan Creole Malay
 mcm=Malaccan Creole Portuguese
 mg=Malagasy
 mlg=Malagasy
-xmv=Malagasy, Antankarana
-bhr=Malagasy, Bara
-msh=Malagasy, Masikoro
-bmm=Malagasy, Northern Betsimisaraka
-plt=Malagasy, Plateau
-skg=Malagasy, Sakalava
-bjq=Malagasy, Southern Betsimisaraka
-tdx=Malagasy, Tandroy-Mahafaly
-txy=Malagasy, Tanosy
-xmw=Malagasy, Tsimihety
 mld=Malakhel
-mlk=Malakote
 mmt=Malalamai
 mln=Malango
-ruy=Mala (Nigeria)
 mjo=Malankuravan
 mjp=Malapandaram
-ped=Mala (Papua New Guinea)
 mjq=Malaryan
 mkr=Malas
 mqz=Malasanga
+ymr=Malasar
 mjr=Malavedan
+lon=Malawi Lomwe
+swk=Malawi Sena
+zlm=Malay (individual language)
+ms=Malay (macrolanguage)
+msa=Malay (macrolanguage)
 mal=Malayalam
 ml=Malayalam
-abs=Malay, Ambonese
-mbf=Malay, Baba
-btj=Malay, Bacanese
-mhp=Malay, Balinese
-bpq=Malay, Banda
-bve=Malay, Berau
-bvu=Malay, Bukit
-coa=Malay, Cocos Islands
-msa=Malay (generic)
-ms=Malay (generic)
 xdy=Malayic Dayak
-jax=Malay, Jambi
-meo=Malay, Kedah
-mqg=Malay, Kota Bangun Kutai
-mkn=Malay, Kupang
-mfp=Malay, Makassar
-xmm=Malay, Manado
 mlz=Malaynon
-max=Malay, North Moluccan
 mbp=Malayo
-mfa=Malay, Pattani
-msi=Malay, Sabah
 xml=Malaysian Sign Language
-mly=Malay (specific)
-vkt=Malay, Tenggarong Kutai
+bfo=Malba Birifor
+mdy=Male (Ethiopia)
+mdc=Male (Papua New Guinea)
 pqm=Malecite-Passamaquoddy
-mdy=Male (Ethiopia)
-gut=Mal\u00e9ku Ja\u00edka
 pkt=Maleng
-mdc=Male (Papua New Guinea)
 mgl=Maleu-Kilenge
 mlx=Malfaxal
 vml=Malgana
@@ -4136,54 +4030,49 @@
 mgq=Malila
 mzd=Malimba
 mli=Malimpung
-sic=Malinguat
+tcf=Malinaltepec Me'phaa
 mla=Malo
 mbk=Malol
-mkb=Mal Paharia
 mlt=Maltese
 mt=Maltese
 mdl=Maltese Sign Language
 mll=Malua Bay
 mup=Malvi
+gut=Mal\u221a\u00a9ku Ja\u221a\u2260ka
+mam=Mam
 mma=Mama
 mhf=Mamaa
+wmd=Mamaind\u221a\u00a9
 mmn=Mamanwa
+myk=Mamara Senoufo
 mqj=Mamasa
 mgm=Mambae
 mcs=Mambai
-mcu=Mambila, Cameroon
-mzk=Mambila, Nigeria
 mvd=Mamboru
 mgr=Mambwe-Lungu
-mvc=Mam, Central
-mam=Mam, Northern
 maw=Mampruli
-mms=Mam, Southern
-mpf=Mam, Tajumulco
-mvj=Mam, Todos Santos Cuchumat\u00e1n
 mqx=Mamuju
 emm=Mamulique
 kdf=Mamusi
 mdi=Mamvu
+mml=Man Met
+xmm=Manado Malay
 mva=Manam
 mle=Manambu
 nmm=Manangba
 znk=Manangkari
 mnc=Manchu
 zma=Manda (Australia)
+mha=Manda (India)
+mgs=Manda (Tanzania)
 mht=Mandahuaca
 mid=Mandaic
-myz=Mandaic, Classical
-mha=Manda (India)
 mhq=Mandan
 zmk=Mandandanyi
 mdr=Mandar
 tbf=Mandara
 mqu=Mandari
-mgs=Manda (Tanzania)
-mst=Mandaya, Cataelano
-mry=Mandaya, Karaga
-myt=Mandaya, Sangab
+cmn=Mandarin Chinese
 mjl=Mandeali
 mqr=Mander
 man=Mandingo
@@ -4193,6 +4082,7 @@
 bwp=Mandobo Bawah
 jet=Manem
 zng=Mang
+kby=Manga Kanuri
 mem=Mangala
 mpc=Mangarayi
 mrv=Mangareva
@@ -4201,42 +4091,27 @@
 mdj=Mangbetu
 mdk=Mangbutu
 zme=Mangerr
+mmo=Mangga Buang
 mqy=Manggarai
 mge=Mango
 mqc=Mangole
 mbh=Mangseng
+xmn=Manichaean Middle Persian
+xkb=Manigri-Kambol\u221a\u00a9 Ede Nago
 mnx=Manikion
-myq=Maninka, Forest
-emk=Maninkakan, Eastern
-mwk=Maninkakan, Kita
-mlq=Maninkakan, Western
-mku=Maninka, Konyanka
-msc=Maninka, Sankaran
 mqp=Manipa
 mni=Manipuri
-omp=Manipuri, Old
 knf=Mankanya
-mml=Man Met
 mev=Mann
 mju=Manna-Dora
 mjv=Mannan
-msm=Manobo, Agusan
-atd=Manobo, Ata
-mkx=Manobo, Cinamiguin
-mta=Manobo, Cotabato
-mbd=Manobo, Dibabawon
-mbi=Manobo, Ilianen
-mbt=Manobo, Matigsalug
-obo=Manobo, Obo
-mqk=Manobo, Rajah Kabunsuwan
-mbs=Manobo, Sarangani
-mbb=Manobo, Western Bukidnon
 woo=Manombai
 msk=Mansaka
 mns=Mansi
 msw=Mansoanka
 myg=Manta
 nty=Mantsi
+kxf=Manumanaw Karen
 wha=Manusela
 glv=Manx
 gv=Manx
@@ -4244,27 +4119,33 @@
 mny=Manyawa
 mxc=Manyika
 mzv=Manza
+nbi=Mao Naga
 mmd=Maonan
+swb=Maore Comorian
 mi=Maori
 mri=Maori
-mjn=Ma (Papua New Guinea)
 mlh=Mape
 mnm=Mapena
 mpy=Mapia
 mpw=Mapidian
+bzh=Mapos Buang
 mcg=Mapoyo
+arn=Mapudungun
 sjm=Mapun
 mch=Maquiritari
 mec=Mara
+mrh=Mara Chin
+lri=Marachi
 vmh=Maraghei
 mrs=Maragus
+nma=Maram Naga
+lrm=Marama
 myd=Maramba
 mrw=Maranao
 zmr=Maranunggu
 mgb=Mararit
 mar=Marathi
 mr=Marathi
-omr=Marathi, Old
 mvr=Marau
 mpg=Marba
 mrx=Maremgi
@@ -4273,58 +4154,57 @@
 zmc=Margany
 mrt=Marghi Central
 mfm=Marghi South
+qvm=Margos-Yarowilca-Lauricocha Quechua
 mhg=Margu
-daq=Maria, Dandami
+mbx=Mari (East Sepik Province)
+hob=Mari (Madang Province)
+chm=Mari (Russia)
 mrr=Maria (India)
 mds=Maria (Papua New Guinea)
 mrc=Maricopa
 zmd=Maridan
 zmj=Maridjabin
-mhr=Mari, Eastern
-mbx=Mari (East Sepik Province)
 dad=Marik
-hob=Mari (Madang Province)
 zmm=Marimanindji
 mrz=Marind
-bpv=Marind, Bian
 mbw=Maring
+nng=Maring Naga
 zmt=Maringarr
 mrb=Marino
 mqi=Mariri
-chm=Mari (Russia)
 mfr=Marithiel
 nsr=Maritime Sign Language
-msp=Maritsau\u00e1
-mrj=Mari, Western
+msp=Maritsau\u221a\u00b0
 zmy=Mariyedi
 rkm=Marka
+enb=Markweeta
+rmz=Marma
 mvo=Marovo
-mrq=Marquesan, North
-mqm=Marquesan, South
+xru=Marriammu
 umc=Marrucinian
-mah=Marshall
-mh=Marshall
+mah=Marshallese
+mh=Marshallese
 ims=Marsian
 mre=Martha's Vineyard Sign Language
 zmg=Marti Ke
 mpj=Martu Wangka
 vma=Martuyhunira
 mhx=Maru
-mzr=Mar\u00fabo
 mwr=Marwari
 rwr=Marwari (India)
 mve=Marwari (Pakistan)
-myx=Masaba
+mzr=Mar\u221a\u222bbo
+myx=Masaaba
+tis=Masadiit Itneg
 mas=Masai
 mls=Masalit
 mcn=Masana
+bks=Masbate Sorsogon
 msb=Masbatenyo
-mxz=Masela, Central
-vme=Masela, East
-mss=Masela, West
 cuj=Mashco Piro
 jms=Mashi (Nigeria)
 mho=Mashi (Zambia)
+msh=Masikoro Malagasy
 ism=Masimasi
 bnf=Masiwang
 klv=Maskelynes
@@ -4338,48 +4218,41 @@
 xmt=Matbat
 mgv=Matengo
 mqe=Matepi
+mbt=Matigsalug Manobo
 mzo=Matipuhy
-mpq=Mat\u00eds
-ocu=Matlatzinca, Atzingo
-mat=Matlatzinca, San Francisco
 met=Mato
+axg=Mato Grosso Ar\u221a\u00b0ra
 mtm=Mator
 ymt=Mator-Taygi-Karagas
-mcf=Mats\u00e9s
+mcf=Mats\u221a\u00a9s
 mvb=Mattole
 mjk=Matukar
 mgw=Matumbi
+stj=Matya Samo
+mpq=Mat\u221a\u2260s
 mph=Maung
 mhl=Mauwake
 mcw=Mawa (Chad)
+wma=Mawa (Nigeria)
 mjj=Mawak
 mcz=Mawan
-wma=Mawa (Nigeria)
 mzx=Mawayana
 mke=Mawchi
 mgk=Mawes
-mbl=Maxakal\u00ed
-slz=Ma'ya
-yus=Maya, Chan Santa Cruz
+mbl=Maxakal\u221a\u2260
+mxl=Maxi Gbe
+sym=Maya Samo
 xmy=Mayaguduna
-emy=Mayan, Epigraphic
-yua=Maya, Yucat\u00e1n
 myc=Mayeka
 mnt=Maykulan
 mfy=Mayo
 mdm=Mayogo
+ifu=Mayoyao Ifugao
 dkx=Mazagway
-maz=Mazahua Central
-mmc=Mazahua, Michoac\u00e1n
+zpy=Mazaltepec Zapotec
 mzn=Mazanderani
-vmy=Mazatec, Ayautla
-maq=Mazatec, Chiquihuitl\u00e1n
-mau=Mazatec, Huautla
-mzi=Mazatec, Ixcatl\u00e1n
-maj=Mazatec, Jalapa De D\u00edaz
-vmz=Mazatec, Mazatl\u00e1n
-maa=Mazatec, San Jer\u00f3nimo Tec\u00f3atl
-vmp=Mazatec, Soyaltepec
+vmz=Mazatl\u221a\u00b0n Mazatec
+mzl=Mazatl\u221a\u00b0n Mixe
 mfc=Mba
 vmb=Mbabaram
 mdp=Mbala
@@ -4398,8 +4271,6 @@
 mtk=Mbe'
 xmd=Mbedam
 mql=Mbelime
-mfn=Mbembe, Cross River
-nza=Mbembe, Tigon
 mdt=Mbere
 zms=Mbesa
 mbo=Mbo (Cameroon)
@@ -4410,7 +4281,6 @@
 xmb=Mbonga
 bgu=Mbongno
 mdw=Mbosi
-mux=Mbo-Ung
 mxo=Mbowe
 mka=Mbre
 muc=Mbu'
@@ -4427,26 +4297,29 @@
 mgy=Mbunga
 bbt=Mburku
 mfu=Mbwela
+gun=Mby\u221a\u00b0 Guaran\u221a\u2260
+mym=Me'en
 meg=Mea
 mjm=Medebur
+mue=Media Lengua
 mwx=Mediak
-mue=Media Lengua
 xme=Median
+mud=Mednyj Aleut
 byv=Medumba
-mym=Me'en
 mfj=Mefele
 mef=Megam
+ruq=Megleno Romanian
 nux=Mehek
-mmh=Mehin\u00e1ku
+mmh=Mehin\u221a\u00b0ku
 gdq=Mehri
 mek=Mekeo
 mvk=Mekmek
 msf=Mekwei
-mel=Melanau
 mxe=Mele-Fila
 mfx=Melo
 med=Melpa
 mby=Memoni
+xkd=Mendalam Kayan
 mfd=Mendankwe-Nkwen
 sim=Mende (Papua New Guinea)
 men=Mende (Sierra Leone)
@@ -4457,8 +4330,6 @@
 mez=Menominee
 mwv=Mentawai
 mcr=Menya
-emg=Meohang, Eastern
-raf=Meohang, Western
 mvx=Meoswar
 mnu=Mer
 mxm=Meramera
@@ -4470,156 +4341,123 @@
 mer=Meru
 wry=Merwari
 iyo=Mesaka
+apm=Mescalero-Chiricahua Apache
 mci=Mese
+sac=Meskwaki
 zim=Mesme
 mys=Mesmes
+acm=Mesopotamian Arabic
 mvz=Mesqan
-sac=Mesquakie
 cms=Messapic
 mgo=Meta'
+mxv=Metlat\u221a\u2265noc Mixtec
 mtr=Mewari
 wtm=Mewati
 mfs=Mexican Sign Language
 mej=Meyah
+pbe=Mezontla Popoloca
+ote=Mezquital Otomi
 zmf=Mfinu
 nfu=Mfumte
+mic=Mi'kmaq
+zam=Miahuatl\u221a\u00b0n Zapotec
 mia=Miami
 mpt=Mian
 pla=Miani
-xmi=Miarr\u00e3
 crg=Michif
 cmm=Michigamea
-mic=Micmac
+mmc=Michoac\u221a\u00b0n Mazahua
+ncl=Michoac\u221a\u00b0n Nahuatl
+dnt=Mid Grand Valley Dani
+bjo=Mid-Southern Banda
+axm=Middle Armenian
+xbm=Middle Breton
+cnx=Middle Cornish
+dum=Middle Dutch (ca. 1050-1350)
+enm=Middle English (1100-1500)
+frm=Middle French (ca. 1400-1600)
+gmh=Middle High German (ca. 1050-1500)
+htx=Middle Hittite
+mga=Middle Irish (900-1200)
+okm=Middle Korean (10th-16th cent.)
+gml=Middle Low German
+xng=Middle Mongolian
+nwx=Middle Newar
+mpl=Middle Watut
+wlm=Middle Welsh
 mei=Midob
 mmy=Migaama
 mpp=Migabac
 mxj=Miju-Mishmi
 mik=Mikasuki
+ymh=Mili
 mlj=Miltu
 iml=Miluk
 imy=Milyan
-miv=Mimi
+mnp=Min Bei Chinese
+cdo=Min Dong Chinese
+nan=Min Nan Chinese
+czo=Min Zhong Chinese
 hna=Mina (Cameroon)
+myi=Mina (India)
 inm=Minaean
-myi=Mina (India)
 min=Minangkabau
 mcv=Minanibai
 mvn=Minaveha
 mpn=Mindiri
 mko=Mingang Doso
 xmf=Mingrelian
+hto=Minica Huitoto
+wii=Minidien
 vmg=Minigir
 omn=Minoan
 mqq=Minokok
 mnq=Minriq
 mzt=Mintil
+zgm=Minz Zhuang
+yiq=Miqie
 mwl=Mirandese
 mvh=Mire
 zrg=Mirgan
 mrg=Miri
 mmv=Miriti
 mep=Miriwung
+pmu=Mirpur Panjabi
 mjs=Miship
 mpx=Misima-Paneati
-miq=M\u00edskito
+zaw=Mitla Zapotec
+vmm=Mitlatongo Mixtec
 mwu=Mittu
 zmq=Mituku
 mpo=Miu
 vmi=Miwa
-mkq=Miwok, Bay
-csm=Miwok, Central Sierra
-csi=Miwok, Coast
-lmw=Miwok, Lake
-nsq=Miwok, Northern Sierra
-pmw=Miwok, Plains
-skd=Miwok, Southern Sierra
-mco=Mixe, Coatl\u00e1n
-mir=Mixe, Isthmus
-mxq=Mixe, Juquila
-mzl=Mixe, Mazatl\u00e1n
-neq=Mixe, North Central
-pxm=Mixe, Quetzaltepec
-mxp=Mixe, Tlahuitoltepec
-mto=Mixe, Totontepec
 mfg=Mixifore
-mim=Mixtec, Alacatlatzala
-xta=Mixtec, Alcozauca
-mbz=Mixtec, Amoltepec
-mip=Mixtec, Apasco-Apoala
-mib=Mixtec, Atatl\u00e1huca
-miy=Mixtec, Ayutla
-miu=Mixtec, Cacaloxtepec
-mih=Mixtec, Chayuco
-xtb=Mixtec, Chazumba
-mii=Mixtec, Chigmecatitl\u00e1n
-miz=Mixtec, Coatzospan
-xtu=Mixtec, Cuyamecalco
-xtd=Mixtec, Diuxi-Tilantongo
-mxs=Mixtec, Huitepec
-mce=Mixtec, Itundujia
-vmj=Mixtec, Ixtayutla
-mxt=Mixtec, Jamiltepec
-vmc=Mixtec, Juxtlahuaca
-xtm=Mixtec, Magdalena Pe\u00f1asco
-mxv=Mixtec, Metlat\u00f3noc
-vmm=Mixtec, Mitlatongo
-mix=Mixtec, Mixtepec
-xtn=Mixtec, Northern Tlaxiaco
-mxa=Mixtec, Northwest Oaxaca
-mie=Mixtec, Ocotepec
-mil=Mixtec, Pe\u00f1oles
-mio=Mixtec, Pinotepa Nacional
-mjc=Mixtec, San Juan Colorado
-xtj=Mixtec, San Juan Teita
-mig=Mixtec, San Miguel El Grande
-xtp=Mixtec, San Miguel Piedras
-mdv=Mixtec, Santa Luc\u00eda Monteverde
-mza=Mixtec, Santa Mar\u00eda Zacatepec
-mks=Mixtec, Silacayoapan
-xts=Mixtec, Sindihui
-xti=Mixtec, Sinicahua
-mxy=Mixtec, Southeastern Nochixtl\u00e1n
-mit=Mixtec, Southern Puebla
-meh=Mixtec, Southwestern Tlaxiaco
-vmq=Mixtec, Soyaltepec
-xtt=Mixtec, Tacahua
-vmx=Mixtec, Tamazola
-mxb=Mixtec, Tezoatl\u00e1n
-mtx=Mixtec, Tida\u00e1
-xtl=Mixtec, Tijaltepec
-mqh=Mixtec, Tlazoyaltepec
-mtu=Mixtec, Tututepec
-jmx=Mixtec, Western Juxtlahuaca
-xty=Mixtec, Yoloxochitl
-mpm=Mixtec, Yosond\u00faa
-mvg=Mixtec, Yucua\u00f1e
-mab=Mixtec, Yutanduchi
+mix=Mixtepec Mixtec
+zpm=Mixtepec Zapotec
 mkf=Miya
 mvi=Miyako
 soy=Miyobe
 mra=Mlabri
-lhs=Mlahs\u00f6
+lhs=Mlahs\u221a\u2202
 kja=Mlap
 mlo=Mlomp
 mmu=Mmaala
 bfm=Mmen
-cmo=Mnong, Central
-mng=Mnong, Eastern
-mnn=Mnong, Southern
+gbn=Mo'da
 obm=Moabite
 mfq=Moba
 mod=Mobilian
-mhn=M\u00f3cheno
+ahm=Mobumrin Aizi
 old=Mochi
 omc=Mochica
 mhc=Mocho
-moc=Mocov\u00ed
-gbn=Mo'da
+moc=Mocov\u221a\u2260
 mxd=Modang
+el=Modern Greek (1453-)
+ell=Modern Greek (1453-)
 mqo=Modole
 mvq=Moere
 mif=Mofu-Gudur
-mfk=Mofu, North
 mhj=Mogholi
 mou=Mogum
 mov=Mohave
@@ -4628,8 +4466,8 @@
 mow=Moi (Congo)
 mxn=Moi (Indonesia)
 mkp=Moikodi
-mob=Moinba
 mwz=Moingi
+ymi=Moji
 mqt=Mok
 mwt=Moken
 mft=Mokerang
@@ -4641,68 +4479,67 @@
 mdf=Moksha
 mbe=Molale
 pwm=Molbog
-mol=Moldavian
-mo=Moldavian
 vsi=Moldova Sign Language
 bxc=Molengue
 mox=Molima
+aun=Molmo One
 zmo=Molo
 msl=Molof
 mlw=Moloko
+ver=Mom Jango
 myl=Moma
 msz=Momare
 mso=Mombum
 mmb=Momina
-ver=Mom Jango
 mqf=Momuna
 mnw=Mon
 mzg=Monastic Sign Language
-mnd=Mond\u00e9
 npn=Mondropolon
+mnd=Mond\u221a\u00a9
 lol=Mongo
 mgt=Mongol
+bxm=Mongolia Buriat
 mn=Mongolian
 mon=Mongolian
-cmg=Mongolian, Classical
-khk=Mongolian, Halh
-xng=Mongolian, Middle
-mvf=Mongolian, Peripheral
 msr=Mongolian Sign Language
 mog=Mongondow
 mnz=Moni
 mom=Monimbo
 mru=Mono (Cameroon)
 mnh=Mono (Democratic Republic of Congo)
-omx=Mon, Old
-moo=Monom
 mte=Mono (Solomon Islands)
 mnr=Mono (USA)
+moo=Monom
+nmh=Monsang Naga
 moe=Montagnais
 mtl=Montol
 mxk=Monumbo
 moj=Monzombo
 gwg=Moo
-mop=Mop\u00e1n Maya
+crm=Moose Cree
+mop=Mop\u221a\u00b0n Maya
+moq=Mor (Bomberai Peninsula)
+mhz=Mor (Mor Islands)
 msg=Moraid
 mze=Morawa
-moq=Mor (Bomberai Peninsula)
+nhm=Morelos Nahuatl
 xmo=Morerebi
 msx=Moresada
 mzq=Mori Atas
 xmz=Mori Bawah
 mdb=Morigi
 mfe=Morisyen
-mhz=Mor (Mor Islands)
 mor=Moro
+ary=Moroccan Arabic
 xms=Moroccan Sign Language
 mgc=Morokodo
+bdo=Morom
 mqn=Moronene
 mok=Morori
 mrp=Morouas
 mrl=Mortlockese
 mgd=Moru
 mqv=Mosimo
-msn=Mosina
 mwy=Mosiro
 mtj=Moskona
 mos=Mossi
@@ -4710,7 +4547,10 @@
 mlv=Motlav
 meu=Motu
 mwh=Mouk-Aria
+kpx=Mountain Koiali
 mzp=Movima
+ity=Moyadan Itneg
+nmo=Moyon Naga
 mzy=Mozambican Sign Language
 mxi=Mozarabic
 mpi=Mpade
@@ -4721,55 +4561,60 @@
 mvt=Mpotovoro
 zmp=Mpuono
 akc=Mpur
+cmr=Mro Chin
 mro=Mru
 kqx=Mser
+atl=Mt. Iraya Agta
+agz=Mt. Iriga Agta
 mtd=Mualang
 tsx=Mubami
 mub=Mubi
+ymd=Muda
 mwd=Mudbura
+gau=Mudhili Gadaba
+vmd=Mudu Koraga
 wiv=Muduapa
+udg=Muduga
 aoj=Mufian
 muk=Mugom
 bmr=Muinane
 mmk=Mukha-Dora
-vmo=Muko-Muko
 moz=Mukulu
 mfw=Mulaha
 mlm=Mulam
+kpb=Mullu Kurumba
 mpb=Mullukmulluk
 mul=Multiple languages
 vmu=Muluridyi
 kqa=Mum
 mzm=Mumuye
 mnb=Muna
+unx=Munda
 boe=Mundabli
 mua=Mundang
 mnf=Mundani
-muw=Mundari
+unr=Mundari
 mmf=Mundat
-muh=M\u00fcnd\u00fc
-myu=Munduruk\u00fa
+myu=Munduruk\u221a\u222b
 mhk=Mungaka
 mth=Munggui
+mpv=Mungkip
 myr=Muniche
 mtc=Munit
 mnj=Munji
-mpv=Munkip
 umu=Munsee
 mtq=Muong
 asx=Muratayak
-emu=Muria, Eastern
-fmu=Muria, Far Western
-mut=Muria, Western
-mtf=Murik
+mxr=Murik (Malaysia)
+mtf=Murik (Papua New Guinea)
 rmh=Murkim
 mur=Murle
 mwf=Murrinh-Patha
 muz=Mursi
+huu=Murui Huitoto
 mqw=Murupi
 zmu=Muruwari
 mmq=Musak
-mmp=Musan
 mmi=Musar
 smm=Musasa
 mse=Musey
@@ -4777,26 +4622,37 @@
 xma=Mushungulu
 mui=Musi
 mje=Muskum
+ttt=Muslim Tat
 msu=Musom
 emi=Mussau-Emira
 muv=Muthuvan
 tuc=Mutu
 mvm=Muya
 muy=Muyang
-kti=Muyu, North
-kts=Muyu, South
 myw=Muyuw
+ymz=Muzi
 mcj=Mvanip
 mxh=Mvuba
 sur=Mwaghavul
+wlc=Mwali Comorian
 moa=Mwan
 wmw=Mwani
 mwa=Mwatebu
 mwe=Mwera (Chimwera)
 mjh=Mwera (Nyasa)
 mws=Mwimbi-Muthambi
+gmy=Mycenaean Greek
 mye=Myene
 yms=Mysian
+nme=Mzieme Naga
+gmd=M\u221a\u00b0ghd\u221a\u00a8
+miq=M\u221a\u2260skito
+mhn=M\u221a\u2265cheno
+mwq=M\u221a\u00ban Chin
+muh=M\u221a\u00band\u221a\u00ba
+pmh=M\u0192\u00c5h\u0192\u00c5r\u0192\u00c5\u00b7\u03c0\u00a3\u00b7\u03c0\u2260ri Pr\u0192\u00c5krit
+nqo=N'Ko
+ngh=N/u
 nbt=Na
 nao=Naaba
 nas=Naasioi
@@ -4804,85 +4660,20 @@
 naf=Nabak
 mty=Nabi
 ncd=Nachering
-mbj=Nad\u00ebb
 ndf=Nadruvian
+mbj=Nad\u221a\u00b4b
 nfr=Nafaanra
 srf=Nafi
 nxx=Nafri
 jbn=Nafusi
-njm=Naga, Angami
-njo=Naga, Ao
-nbc=Naga, Chang
-nri=Naga, Chokri
-nct=Naga, Chothe
-nkf=Naga, Inpui
-kfw=Naga, Kharam
-nkh=Naga, Khezha
-nky=Naga, Khiamniungan
-nkb=Naga, Khoibu
-nbe=Naga, Konyak
-njn=Naga, Liangmai
-njh=Naga, Lotha
-nbi=Naga, Mao
-nma=Naga, Maram
-nng=Naga, Maring
-nmh=Naga, Monsang
-nmo=Naga, Moyon
-nme=Naga, Mzieme
-njb=Naga, Nocte
-nnl=Naga, Northern Rengma
-nph=Naga, Phom
 nag=Naga Pidgin
-npo=Naga, Pochuri
-pmx=Naga, Poumei
-npu=Naga, Puimei
-puz=Naga, Purum
 nbg=Nagarchal
-nbu=Naga, Rongmei
-nsa=Naga, Sangtam
-nre=Naga, Southern Rengma
-nsm=Naga, Sumi
-nmf=Naga, Tangkhul
-tro=Naga, Tarao
-nst=Naga, Tase
-nki=Naga, Thangal
-tvt=Naga, Tutsa
-nnp=Naga, Wancho
-yim=Naga, Yimchungru
-nzm=Naga, Zeme
 nxe=Nage
 ngv=Nagumi
 nlx=Nahali
 nhh=Nahari
-nhn=Nahuatl, Central
-nch=Nahuatl, Central Huasteca
-ncx=Nahuatl, Central Puebla
-nci=Nahuatl, Classical
-naz=Nahuatl, Coatepec
-nln=Nahuatl, Durango
-nhe=Nahuatl, Eastern Huasteca
-ngu=Nahuatl, Guerrero
-azz=Nahuatl, Highland Puebla
-nhq=Nahuatl, Huaxcaleca
-nhk=Nahuatl, Isthmus-Cosoleacaque
-nhx=Nahuatl, Isthmus-Mecayapan
-nhp=Nahuatl, Isthmus-Pajapan
-ncl=Nahuatl, Michoac\u00e1n
-nhm=Nahuatl, Morelos
-nhy=Nahuatl, Northern Oaxaca
-ncj=Nahuatl, Northern Puebla
-nht=Nahuatl, Ometepec
-nlv=Nahuatl, Orizaba
-nhz=Nahuatl, Santa Mar\u00eda La Alta
-nhs=Nahuatl, Southeastern Puebla
-nhc=Nahuatl, Tabasco
-nhv=Nahuatl, Temascaltepec
-nhi=Nahuatl, Tenango
-nhg=Nahuatl, Tetelcingo
-nhj=Nahuatl, Tlalitzlipa
-nuz=Nahuatl, Tlamacazapa
-nhw=Nahuatl, Western Huasteca
 bio=Nai
+ars=Najdi Arabic
 nae=Naka'ela
 nkj=Nakai
 nib=Nakama
@@ -4895,19 +4686,18 @@
 nss=Nali
 nal=Nalik
 naj=Nalu
-nmk=Namakura
+ylo=Naluo Yi
+nlz=Nal\u221a\u2202go
 naq=Nama (Namibia)
 nmx=Nama (Papua New Guinea)
+nmk=Namakura
 nkm=Namat
-nmb=Nambas, Big
-mbg=Nambiku\u00e1ra, Northern
-nab=Nambiku\u00e1ra, Southern
 ncm=Nambo
 nmq=Nambya
-neo=N\u00e1-Meo
 nnm=Namia
 nvm=Namiae
 nbs=Namibian Sign Language
+naa=Namla
 mxw=Namo
 nmt=Namonuito
 bwb=Namosi-Naitasiri-Serua
@@ -4915,12 +4705,17 @@
 gld=Nanai
 nnc=Nancere
 nnb=Nande
+niq=Nandi
+sen=Nanerig\u221a\u00a9 S\u221a\u00a9noufo
 ngr=Nanggu
 nam=Nangikurrunggurr
 nnk=Nankina
 cox=Nanti
 nnt=Nanticoke
+afk=Nanubae
+qvo=Napo Lowland Quechua
 npy=Napu
+npa=Nar Phu
 nrb=Nara
 nac=Narak
 nrg=Narango
@@ -4928,18 +4723,21 @@
 loh=Narim
 nhr=Naro
 nrm=Narom
-npa=Nar Phu
 nay=Narrinyeri
 nnr=Narungga
+nsy=Nasal
 nvh=Nasarian
 nsk=Naskapi
 nts=Natagaimas
 ntz=Natanzi
+ais=Nataoran Amis
 ncz=Natchez
 ntm=Nateni
 nte=Nathembo
 nti=Natioro
+ntu=Nat\u221a\u00bagu
 nxa=Nauete
+ynk=Naukan Yupik
 ncn=Nauna
 na=Nauru
 nau=Nauru
@@ -4955,24 +4753,20 @@
 nyq=Nayini
 ncr=Ncane
 nlu=Nchumbulu
+nnz=Nda'nda'
 gke=Ndai
 ndk=Ndaka
 ncp=Ndaktup
 ndh=Ndali
 ndm=Ndam
 ndj=Ndamba
-nnz=Nda'nda'
 nda=Ndasa
 ndc=Ndau
-nde=Ndebele, North
-nd=Ndebele, North
-nbl=Ndebele, South
-nr=Ndebele, South
 ned=Nde-Gbite
+ndd=Nde-Nsele-Nta
 nml=Ndemli
 dne=Ndendeule
 ndg=Ndengereko
-ndd=Nde-Nsele-Nta
 eli=Nding
 ndp=Ndo
 ndw=Ndobo
@@ -4987,11 +4781,11 @@
 ndr=Ndoola
 ndx=Nduga
 nmd=Ndumu
-nfd=Ndun
 nuh=Ndunda
 ndt=Ndunga
 ndv=Ndut
 njt=Ndyuka-Trio Pidgin
+wni=Ndzwani Comorian
 nap=Neapolitan
 nec=Nedebang
 nef=Nefamese
@@ -5009,25 +4803,24 @@
 anh=Nend
 yrk=Nenets
 nen=Nengone
+nei=Neo-Hittite
 nsp=Nepalese Sign Language
 ne=Nepali
 nep=Nepali
+kxl=Nepali Kurux
 net=Nete
+jas=New Caledonian Javanese
+nzs=New Zealand Sign Language
 new=Newari
-nwc=Newari, Classical; Old Newari
-nwx=Newar, Middle
-nzs=New Zealand Sign Language
 ney=Neyo
 nez=Nez Perce
+hlt=Nga La
 ntj=Ngaanyatjarra
-gym=Ng\u00e4bere
 nxg=Ngad'a
-nea=Ngad'a, Eastern
 nju=Ngadjunmaya
 nnf=Ngaing
 nij=Ngaju
 nud=Ngala
-hlt=Nga La
 nig=Ngalakan
 ngk=Ngalkbun
 szb=Ngalum
@@ -5050,12 +4843,12 @@
 anc=Ngas
 nsg=Ngasa
 ngm=Ngatik Men's Creole
+cnw=Ngawn Chin
 nxn=Ngawun
+zdj=Ngazidja Comorian
 nga=Ngbaka
 nbm=Ngbaka Ma'bo
 ngg=Ngbaka Manza
-ngb=Ngbandi, Northern
-nbw=Ngbandi, Southern
 jgb=Ngbee
 nbd=Ngbinda
 nuu=Ngbundu
@@ -5071,6 +4864,7 @@
 nnq=Ngindo
 niy=Ngiti
 ngi=Ngizim
+kcd=Ngk\u221a\u00a2lmpw Kanum
 nra=Ngom
 jgo=Ngomba
 nla=Ngombale
@@ -5083,27 +4877,28 @@
 nlo=Ngul
 ngp=Ngulu
 nuw=Nguluwan
-nmg=Ngumba
 nui=Ngumbi
 ndn=Ngundi
 nue=Ngundu
 ngz=Ngungwel
-nuo=Ngu\u00f4n
 nbx=Ngura
 ngq=Ngurimi
 nrx=Ngurmbur
+nuo=Ngu\u221a\u00a5n
 ngw=Ngwaba
 nwe=Ngwe
 ngn=Ngwo
+gym=Ng\u221a\u00a7bere
+nha=Nhanda
 yrl=Nhengatu
 nhf=Nhuwala
 nia=Nias
 bzk=Nicaragua Creole English
 ncs=Nicaraguan Sign Language
-caq=Nicobarese, Car
-ncb=Nicobarese, Central
-nik=Nicobarese, Southern
 nie=Niellim
+mzk=Nigeria Mambila
+fuv=Nigerian Fulfulde
+pcm=Nigerian Pidgin
 nsi=Nigerian Sign Language
 nll=Nihali
 nii=Nii
@@ -5124,16 +4919,18 @@
 nxr=Ninggerum
 niz=Ningil
 nns=Ningye
+nlk=Ninia Yali
 nin=Ninzo
 nps=Nipsan
 njs=Nisa
 nsz=Nisenan
 ncg=Nisga'a
-dap=Nisi
+yso=Nisi (China)
+dap=Nisi (India)
 num=Niuafo'ou
 nkp=Niuatoputapu
 niu=Niuean
-cag=Nivacl\u00e9
+cag=Nivacl\u221a\u00a9
 njl=Njalgulgule
 nzb=Njebi
 njj=Njen
@@ -5150,34 +4947,135 @@
 nbo=Nkukoli
 nkw=Nkutu
 nbp=Nnam
+zxx=No linguistic content
 fia=Nobiin
 gaw=Nobonob
-nom=Nocam\u00e1n
+nom=Nocam\u221a\u00b0n
+njb=Nocte Naga
 nog=Nogai
 noi=Noiri
 nkk=Nokuku
-zxx=No linguistic content
 lem=Nomaande
 nof=Nomane
 not=Nomatsiguenga
 noh=Nomu
+zhn=Nong Zhuang
 nok=Nooksack
 snf=Noon
 nhu=Noone
 noo=Nootka
+cya=Nopala Chatino
 nrc=Noric
 nrn=Norn
 nrr=Norra
-non=Norse, Old
-xna=North Arabian, Ancient
+esi=North Alaskan Inupiatun
+mmg=North Ambrym
+nks=North Asmat
+yir=North Awyu
+azj=North Azerbaijani
+bcd=North Babar
+qul=North Bolivian Quechua
+neq=North Central Mixe
+llp=North Efate
+fll=North Fali
+gis=North Giziga
+qvn=North Jun\u221a\u2260n Quechua
+apc=North Levantine Arabic
+mrq=North Marquesan
+ayp=North Mesopotamian Arabic
+mfk=North Mofu
+max=North Moluccan Malay
+kti=North Muyu
+nd=North Ndebele
+nde=North Ndebele
+nni=North Nuaulu
+nrp=North Picene
+scs=North Slavey
+tbg=North Tairora
+tnn=North Tanna
+whg=North Wahgi
+una=North Watut
+weo=North Wemale
+kiw=Northeast Kiwai
+nmu=Northeast Maidu
+aee=Northeast Pashayi
+dip=Northeastern Dinka
+pef=Northeastern Pomo
+tts=Northeastern Thai
+aqn=Northern Alta
+atv=Northern Altai
+ryn=Northern Amami-Oshima
+bfc=Northern Bai
+bmm=Northern Betsimisaraka Malagasy
+bbo=Northern Bobo Madar\u221a\u00a9
+cts=Northern Catanduanes Bicolano
+qxn=Northern Conchucos Ancash Quechua
+dgi=Northern Dagara
+doc=Northern Dong
+crl=Northern East Cree
+emp=Northern Ember\u221a\u00b0
+frr=Northern Frisian
+ghh=Northern Ghale
+gno=Northern Gondi
+gbo=Northern Grebo
+huj=Northern Guiyang Hmong
+hdn=Northern Haida
+hno=Northern Hindko
+hmi=Northern Huishui Hmong
 nrt=Northern Kalapuya
+xnn=Northern Kankanay
+kxm=Northern Khmer
+kqs=Northern Kissi
+kmr=Northern Kurdish
+lbr=Northern Lorung
+lrc=Northern Luri
+hmp=Northern Mashan Hmong
+ymx=Northern Muji
+ngb=Northern Ngbandi
+yiv=Northern Nisu
+nuv=Northern Nuni
+nhy=Northern Oaxaca Nahuatl
+cst=Northern Ohlone
+onr=Northern One
+pao=Northern Paiute
+pmq=Northern Pame
+pbu=Northern Pashto
+qvz=Northern Pastaza Quichua
+pej=Northern Pomo
+ncj=Northern Puebla Nahuatl
+pmi=Northern Pumi
+hea=Northern Qiandong Miao
+cng=Northern Qiang
+nnl=Northern Rengma Naga
+rog=Northern Roglai
 se=Northern Sami
 sme=Northern Sami
-nrp=North Picene
+nsq=Northern Sierra Miwok
+stb=Northern Subanen
+thh=Northern Tarahumara
+ntp=Northern Tepehuan
+nod=Northern Thai
+twf=Northern Tiwa
+xtn=Northern Tlaxiaco Mixtec
+tsp=Northern Toussian
+tji=Northern Tujia
+ttm=Northern Tutchone
+uzn=Northern Uzbek
+ykg=Northern Yukaghir
+esk=Northwest Alaska Inupiatun
+gya=Northwest Gbaya
+mjd=Northwest Maidu
+mxa=Northwest Oaxaca Mixtec
+glh=Northwest Pashayi
+diw=Northwestern Dinka
+faz=Northwestern Fars
+kfb=Northwestern Kolami
+ojb=Northwestern Ojibwa
+tmk=Northwestern Tamang
 no=Norwegian
 nor=Norwegian
-nb=Norwegian Bokm\u00e5l
-nob=Norwegian Bokm\u00e5l
+nb=Norwegian Bokm\u221a\u2022l
+nob=Norwegian Bokm\u221a\u2022l
 nn=Norwegian Nynorsk
 nno=Norwegian Nynorsk
 nsl=Norwegian Sign Language
@@ -5193,18 +5091,14 @@
 nsx=Nsongo
 bud=Ntcham
 nto=Ntomba
-ngh=N/u
-nni=Nuaulu, North
-nxl=Nuaulu, South
 baf=Nubaca
 kcn=Nubi
-onw=Nubian, Old
 kte=Nubri
 nus=Nuer
 nnv=Nugunu (Australia)
 yas=Nugunu (Cameroon)
 noc=Nuk
-mbr=Nukak Mak\u00fa
+mbr=Nukak Mak\u221a\u222b
 klt=Nukna
 nuc=Nukuini
 nuq=Nukumanu
@@ -5216,24 +5110,19 @@
 tgs=Nume
 kdk=Numee
 nxm=Numidian
+nun=Nung (Myanmar)
+nut=Nung (Viet Nam)
 nug=Nungali
 nuy=Nunggubuyu
-nun=Nung (Myanmar)
 rin=Nungu
-nut=Nung (Viet Nam)
-nuv=Nuni, Northern
-nnw=Nuni, Southern
 npb=Nupbikha
 nup=Nupe-Nupe-Tako
 nul=Nusa Laut
 nuf=Nusu
 nwb=Nyabwa
-nxj=Nyadu
 nev=Nyaheun
 cbn=Nyahkur
 nyy=Nyakyusa-Ngonde
-nle=Nyala, East
-yly=Ny\u00e2layu
 nlj=Nyali
 nmi=Nyam
 nly=Nyamal
@@ -5242,24 +5131,29 @@
 mwn=Nyamwanga
 nym=Nyamwezi
 nyk=Nyaneka
+nyp=Nyang'i
 nyj=Nyanga
 nyc=Nyanga-li
 nnj=Nyangatom
 nyb=Nyangbo
 nny=Nyangga
-nyp=Nyang'i
 nna=Nyangumarta
+ny=Nyanja
+nya=Nyanja
 nyn=Nyankole
+sev=Nyarafolo Senoufo
 rim=Nyaturu
 nyw=Nyaw
 nyt=Nyawaygi
 nba=Nyemba
-nfg=Nyeng
 nye=Nyengo
 neh=Nyenkha
 nyl=Nyeu
 nyh=Nyigina
-nih=Nyiha
+nyr=Nyiha (Malawi)
+nih=Nyiha (Tanzania)
+nkv=Nyika (Malawi and Zambia)
+nkt=Nyika (Tanzania)
 lid=Nyindrou
 nyg=Nyindu
 nuj=Nyole
@@ -5269,86 +5163,113 @@
 nyv=Nyulnyul
 nys=Nyunga
 nyu=Nyungwe
+yly=Ny\u221a\u00a2layu
 nzy=Nzakambay
 nzk=Nzakara
 nja=Nzanyi
 nzi=Nzima
+neo=N\u221a\u00b0-Meo
+hux=N\u221a\u00bapode Huitoto
+xoc=O'chi'chi'
+tyh=O'du
 bzy=Obanliku
-obi=Obispe\u00f1o
+obi=Obispe\u221a\u00b1o
 obl=Oblo
+obo=Obo Manobo
 afz=Obokuitai
 ann=Obolo
 obu=Obulom
 oca=Ocaina
-occ=Occidental
-oci=Occitan (post 1500); Proven\u00e7al
-oc=Occitan (post 1500); Proven\u00e7al
+oc=Occitan (post 1500)
+oci=Occitan (post 1500)
+mie=Ocotepec Mixtec
+zac=Ocotl\u221a\u00b0n Zapotec
 odk=Od
 bhf=Odiai
 kkc=Odoodee
-tyh=O'du
 odu=Odual
 oda=Odut
-opy=Ofay\u00e9
+opy=Ofay\u221a\u00a9
+arc=Official Aramaic (700-300 BCE)
 ofo=Ofo
-ogn=Ogan
 ogc=Ogbah
 ogb=Ogbia
 ogg=Ogbogolo
 ogu=Ogbronuagum
 eri=Ogea
-cst=Ohlone, Northern
-css=Ohlone, Southern
 oia=Oirata
-xwo=Oirat, Written
+oj=Ojibwa
 oji=Ojibwa
-oj=Ojibwa
-ojc=Ojibwa, Central
-ojg=Ojibwa, Eastern
-ojb=Ojibwa, Northwestern
-ojs=Ojibwa, Severn
-ojw=Ojibwa, Western
+chj=Ojitl\u221a\u00b0n Chinantec
 oka=Okanagan
+okn=Oki-No-Erabu
 oki=Okiek
-ryu=Okinawan, Central
-okn=Oki-No-Erabu
+oks=Oko-Eni-Osayen
+okj=Oko-Juwoi
 okb=Okobo
 okd=Okodia
-oks=Oko-Eni-Osayen
-okj=Oko-Juwoi
 kqv=Okolod
 opa=Okpamheri
 okx=Okpe (Northwestern Edo)
 oke=Okpe (Southwestern Edo)
 opm=Oksapmin
 oku=Oku
+oar=Old Aramaic (up to 700 BCE)
+oav=Old Avar
+obt=Old Breton
+obr=Old Burmese
+och=Old Chinese
+oco=Old Cornish
+odt=Old Dutch
+ang=Old English (ca. 450-1100)
+fro=Old French (842-ca. 1400)
+ofs=Old Frisian
+oge=Old Georgian
+goh=Old High German (ca. 750-1050)
+oht=Old Hittite
+ohu=Old Hungarian
+sga=Old Irish (to 900)
+ojp=Old Japanese
 okl=Old Kentish Sign Language
+oko=Old Korean (3rd-9th cent.)
+omp=Old Manipuri
+omr=Old Marathi
+omx=Old Mon
+non=Old Norse
+onw=Old Nubian
+oos=Old Ossetic
+peo=Old Persian (ca. 600-400 B.C.)
+pro=Old Proven\u221a\u00dfal (to 1500)
+orv=Old Russian
+osx=Old Saxon
+osp=Old Spanish
+oty=Old Tamil
+otb=Old Tibetan
+otk=Old Turkish
+oui=Old Uighur
+owl=Old Welsh
 ole=Olekha
 ong=Olo
 olm=Oloma
+olr=Olrat
 lul=Olu'bo
 iko=Olulumo-Ikom
+plo=Oluta Popoluca
 omg=Omagua
 oma=Omaha-Ponca
+acx=Omani Arabic
 mgx=Omati
 mbm=Ombamba
 oml=Ombo
 ome=Omejes
+nht=Ometepec Nahuatl
 omi=Omi
-aom=\u00d6mie
 omk=Omok
 omt=Omotik
 omu=Omurano
 ona=Ona
 one=Oneida
-oin=One, Inebu
-onk=One, Kabore
-okk=One, Kwamtim
-aun=One, Molmo
-onr=One, Northern
-osu=One, Southern
 oog=Ong
-oon=\u00d6nge
 oni=Onin
 onx=Onin Based Pidgin
 onj=Onjob
@@ -5363,31 +5284,27 @@
 lgn=Opuuo
 orn=Orang Kanaq
 ors=Orang Seletar
-orq=Orcish
-ore=Orej\u00f3n
+sdr=Oraon Sadri
+ore=Orej\u221a\u2265n
 org=Oring
+or=Oriya
 ori=Oriya
-or=Oriya
-ort=Oriya, Adivasi
-dso=Oriya, Desiya
+nlv=Orizaba Nahuatl
 orc=Orma
 orz=Ormu
 oru=Ormuri
 orx=Oro
+orw=Oro Win
 oac=Oroch
 ora=Oroha
 oaa=Orok
-ork=Orokaiva
+okv=Orokaiva
 bdu=Oroko
 oro=Orokolo
 om=Oromo
 orm=Oromo
-gax=Oromo, Borana-Arsi-Guji
-hae=Oromo, Eastern
-gaz=Oromo, West Central
 orh=Oroqen
 bpk=Orowe
-orw=Oro Win
 orr=Oruma
 ury=Orya
 osa=Osage
@@ -5395,166 +5312,156 @@
 osc=Oscan
 osi=Osing
 oso=Ososo
-os=Ossetian; Ossetic
-oss=Ossetian; Ossetic
-oos=Ossetic, Old
+os=Ossetian
+oss=Ossetian
+otd=Ot Danum
 uta=Otank
 oti=Oti
-otm=Otomi, Eastern Highland
-ots=Otomi, Estado de M\u00e9xico
-otz=Otomi, Ixtenco
-ote=Otomi, Mezquital
-otq=Otomi, Quer\u00e9taro
-ott=Otomi, Temoaya
-otn=Otomi, Tenango
-otx=Otomi, Texcatepec
-otl=Otomi, Tilapa
 otr=Otoro
 otw=Ottawa
+ota=Ottoman Turkish (1500-1928)
 lot=Otuho
 otu=Otuke
 oum=Ouma
-oue=Oune
-oun=!O!ung
+oue=Ounge
 stn=Owa
 wsr=Owenia
 owi=Owiniga
 oyb=Oy
 oyy=Oya'oya
 oyd=Oyda
+zao=Ozolotepec Zapotec
+chz=Ozumac\u221a\u2260n Chinantec
+pdi=Pa Di
 pqa=Pa'a
-pfa=P\u00e1\u00e1fang
+blk=Pa'o Karen
+pha=Pa-Hng
 pma=Paama
 sig=Paasaal
 pcp=Pacahuara
+qvp=Pacaraos Quechua
+ems=Pacific Gulf Yupik
 pac=Pacoh
-pdi=Pa Di
 pdo=Padoe
 pkc=Paekche
 pgn=Paelignian
-pbb=P\u00e1ez
 pgi=Pagi
 pae=Pagibete
 pgu=Pagu
-kfx=Pahari, Kullu
-bfz=Pahari, Mahasu
 phr=Pahari-Potwari
 lgt=Pahi
 phv=Pahlavani
 pal=Pahlavi
-pha=Pa-Hng
-pri=Paic\u00ee
+pta=Pai Tavytera
+pri=Paic\u221a\u00c6
 ppi=Paipai
-pta=Pai Tavytera
-pao=Paiute, Northern
+pck=Paite Chin
 pwn=Paiwan
-pav=Paka\u00e1snovos
+pkg=Pak-Tong
 pkn=Pakanha
+pav=Paka\u221a\u00b0snovos
 pks=Pakistan Sign Language
-pkg=Pak-Tong
 pku=Paku
+kpp=Paku Karen
 abw=Pal
 plq=Palaic
+plr=Palaka Senoufo
+cpa=Palantla Chinantec
 pau=Palauan
-pce=Palaung, Pale
-rbb=Palaung, Rumai
-pll=Palaung, Shwe
-plw=Palawano, Brooke's Point
-plc=Palawano, Central
-plv=Palawano, Southwest
-plm=Palembang
 pln=Palenquero
 pi=Pali
 pli=Pali
-plu=Palik\u00far
+plu=Palik\u221a\u222br
 pcf=Paliyan
 fap=Palor
 plp=Palpa
 pbz=Palu
+ple=Palu'e
 plz=Paluan
-ple=Palu'e
 pmc=Palumata
+bpx=Palya Bareli
 pmn=Pam
 pmb=Pambia
-pbs=Pame, Central
-pmq=Pame, Northern
-pmz=Pame, Southern
 pmk=Pamlico
-bcx=Pamona
+pmf=Pamona
 hih=Pamosu
 pam=Pampanga
+att=Pamplona Atta
 pnq=Pana (Burkina Faso)
 pnz=Pana (Central African Republic)
+lsp=Panamanian Sign Language
 par=Panamint
 pcr=Panang
+qxh=Panao Hu\u221a\u00b0nuco Quechua
+kre=Panar\u221a\u00b0
 psn=Panasuan
+pwb=Panawa
 pnp=Pancana
 tdb=Panchpargania
 bkj=Pande
 pag=Pangasinan
 pgs=Pangseng
+slm=Pangutaran Sama
 pbr=Pangwa
 pgg=Pangwali
 pnr=Panim
 pcg=Paniya
+pa=Panjabi
 pan=Panjabi
-pa=Panjabi
-pmu=Panjabi, Mirpur
-pnb=Panjabi, Western
-pax=Pankarar\u00e9
-paz=Pankarar\u00fa
+pax=Pankarar\u221a\u00a9
+paz=Pankarar\u221a\u222b
 pkh=Pankhu
 pnc=Pannei
+knt=Panoan Katuk\u221a\u2260na
 pno=Panobo
 pnw=Panytyima
 ppa=Pao
+top=Papantla Totonac
 ppn=Papapana
 dpp=Papar
 pas=Papasena
-ppv=Papav\u00f4
 pbo=Papel
 ppe=Papi
 pap=Papiamento
 pat=Papitalai
 ppu=Papora
+pmy=Papuan Malay
 ppm=Papuma
+pzn=Para Naga
 prc=Parachi
-pak=Parakan\u00e3
+gug=Paraguayan Guaran\u221a\u2260
+pak=Parakan\u221a\u00a3
 agp=Paranan
-paf=Paranaw\u00e1t
+paf=Paranaw\u221a\u00b0t
 pbg=Paraujano
 prk=Parauk
 prw=Parawen
-kif=Parbate, Eastern
-kjl=Parbate, Western
 pch=Pardhan
 pcl=Pardhi
 ppt=Pare
-pab=Parec\u00eds
+pab=Parec\u221a\u2260s
 pcj=Parenga
-lkr=P\u00e4ri
+kvx=Parkari Koli
 pbi=Parkwa
 prp=Parsi
 prd=Parsi-Dari
 xpr=Parthian
 paq=Parya
-pse=Pasemah
-aee=Pashayi, Northeast
-glh=Pashayi, Northwest
-psi=Pashayi, Southeast
-psh=Pashayi, Southwest
-pst=Pashto, Central
-pbu=Pashto, Northern
-pbt=Pashto, Southern
+aap=Par\u221a\u00b0 Ar\u221a\u00b0ra
+gvp=Par\u221a\u00b0 Gavi\u221a\u00a3o
 psq=Pasi
+yac=Pass Valley Yali
 pbc=Patamona
 ptn=Patani
-pth=Patax\u00f3-H\u00e3ha\u00e3i
+pth=Patax\u221a\u2265 H\u221a\u00a3-Ha-H\u221a\u00a3e
 ptp=Patep
+pty=Pathiya
 gfk=Patpatar
 lae=Pattani
+mfa=Pattani Malay
 plh=Paulohi
-pad=Paumar\u00ed
+pad=Paumar\u221a\u2260
+bfb=Pauri Bareli
 psm=Pauserna
 pwa=Pawaia
 paw=Pawnee
@@ -5563,6 +5470,7 @@
 pcb=Pear
 pay=Pech
 xpc=Pecheneg
+nso=Pedi
 pfe=Peere
 ppq=Pei
 pel=Pekal
@@ -5570,31 +5478,29 @@
 ata=Pele-Ata
 ppp=Pelende
 aoc=Pemon
-pev=P\u00e9mono
-pez=Penan, Eastern
 psg=Penang Sign Language
-pne=Penan, Western
 pek=Penchal
 ums=Pendau
-pen=Penesak
 peg=Pengo
+pdc=Pennsylvania German
 pnh=Penrhyn
 ptw=Pentlatch
 wet=Perai
+pea=Peranakan Indonesian
+mvf=Peripheral Mongolian
 pip=Pero
 fa=Persian
 fas=Persian
-ope=Persian, Old
-peo=Persian, Old (ca.600-400 B.C.)
 psc=Persian Sign Language
 prl=Peruvian Sign Language
-pec=Pesisir, Southern
+zpe=Petapa Zapotec
 pex=Petats
 pey=Petjo
-lme=P\u00e9v\u00e9
+mil=Pe\u221a\u00b1oles Mixtec
 pfl=Pfaelzisch
 prt=Phai
 phk=Phake
+ypa=Phala
 phl=Phalura
 phq=Phana'
 phw=Phangduwali
@@ -5602,29 +5508,36 @@
 psp=Philippine Sign Language
 phm=Phimbi
 phn=Phoenician
+ypg=Phola
+yip=Pholo
+nph=Phom Naga
 pnx=Phong-Kniang
+kjt=Phrae Pwo Karen
 xpg=Phrygian
+pht=Phu Thai
 phu=Phuan
 phd=Phudagi
 pug=Phuie
-phh=Phula
+phh=Phukha
+ypm=Phuma
 pho=Phunoi
 phg=Phuong
-pht=Phu Thai
+ypp=Phupa
+yph=Phupha
+ypz=Phuza
 ptr=Piamatsina
 pin=Piame
 pio=Piapoco
 pid=Piaroa
 pcd=Picard
+cpu=Pichis Ash\u221a\u00a9ninka
 xpi=Pictish
-wes=Pidgin, Cameroon
-pcm=Pidgin, Nigerian
-tvy=Pidgin, Timor
+dep=Pidgin Delaware
 pms=Piemontese
 pij=Pijao
 piz=Pije
 pis=Pijin
-plg=Pilag\u00e1
+plg=Pilag\u221a\u00b0
 piv=Pileni
 pia=Pima Bajo
 piw=Pimbwe
@@ -5633,42 +5546,43 @@
 pii=Pini
 pnv=Pinigura
 pic=Pinji
+mio=Pinotepa Nacional Mixtec
 pti=Pintiini
 piu=Pintupi-Luritja
 pny=Pinyin
 ppl=Pipil
-myp=Pirah\u00e3
+myp=Pirah\u221a\u00a3
 pir=Piratapuyo
 bxi=Pirlatapa
 pie=Piro
 ppr=Piru
 pig=Pisabo
+tpp=Pisaflores Tepehua
 psy=Piscataway
 xps=Pisidian
 pih=Pitcairn-Norfolk
+sje=Pite Sami
 pcn=Piti
 pjt=Pitjantjatjara
 pit=Pitta Pitta
 pix=Piu
 piy=Piya-Kwonci
+crk=Plains Cree
 psd=Plains Indian Sign Language
+pmw=Plains Miwok
+ktj=Plapo Krumen
+plt=Plateau Malagasy
 pdt=Plautdietsch
 gob=Playero
 pbv=Pnar
+npo=Pochuri Naga
 xpo=Pochutec
 pdn=Podena
 poy=Pogolo
 pon=Pohnpeian
-pok=Pokang\u00e1
+pok=Pokang\u221a\u00b0
 pof=Poke
-poc=Pokomam, Central
-poa=Pokomam, Eastern
-pou=Pokomam, Southern
-poh=Pokomch\u00ed, Eastern
-pob=Pokomch\u00ed, Western
-poj=Pokomo, Lower
-pkb=Pokomo, Upper
-pko=P\u00f6koot
+pkb=Pokomo
 pox=Polabian
 pld=Polari
 plj=Polci
@@ -5678,65 +5592,51 @@
 plb=Polonombauk
 pmo=Pom
 pmm=Pomo
-poo=Pomo, Central
-peb=Pomo, Eastern
-pef=Pomo, Northeastern
-pej=Pomo, Northern
-pom=Pomo, Southeastern
-peq=Pomo, Southern
 ncc=Ponam
 pod=Ponares
 png=Pongu
 pgy=Pongyong
 pns=Ponosakan
 pnt=Pontic
-pbf=Popoloca, Coyotepec
-pbe=Popoloca, Mezontla
-pow=Popoloca, San Felipe Otlaltepec
-poe=Popoloca, San Juan Atzingo
-pps=Popoloca, San Lu\u00eds Temalacayuca
-pls=Popoloca, San Marcos Tlalcoyalco
-pca=Popoloca, Santa In\u00e9s Ahuatempan
-poi=Popoluca, Highland
-plo=Popoluca, Oluta
-pos=Popoluca, Sayula
-poq=Popoluca, Texistepec
+jac=Popti'
+poc=Poqomam
+poh=Poqomchi'
 prh=Porohanon
 psw=Port Sandwich
+ptv=Port Vato
 por=Portuguese
 pt=Portuguese
 psr=Portuguese Sign Language
-ptv=Port Vato
 pot=Potawatomi
-pog=Potigu\u00e1ra
+pog=Potigu\u221a\u00b0ra
+gdb=Pottangi Ollar Gadaba
+pmx=Poumei Naga
 bye=Pouye
 pwr=Powari
 pim=Powhatan
-pyn=Poyan\u00e1wa
+pyn=Poyan\u221a\u00b0wa
 prn=Prasuni
 pry=Pray 3
 pre=Principense
-prv=Proven\u00e7al
-pro=Proven\u00e7al, Old (to 1500)
 prz=Providencia Sign Language
 prg=Prussian
 kvj=Psikye
-pux=Puari
-pun=Pubian
+puk=Pu Ko
+cpx=Pu-Xian Chinese
+pux=Puare
+atp=Pudtol Atta
 pue=Puelche
 psl=Puerto Rican Sign Language
+npu=Puimei Naga
 pui=Puinave
 pkp=Pukapuka
-puk=Pu Ko
 fuc=Pulaar
 pup=Pulabu
 fuf=Pular
 puw=Puluwatese
 pum=Puma
-yae=Pum\u00e9
-pmi=Pumi, Northern
-pmj=Pumi, Southern
 xpm=Pumpokol
+yae=Pum\u221a\u00a9
 pud=Punan Aput
 pna=Punan Bah-Biau
 pnm=Punan Batu 1
@@ -5744,18 +5644,19 @@
 puc=Punan Merap
 puj=Punan Tubu
 xpu=Punic
+qxp=Puno Quechua
 puu=Punu
 puo=Puoc
 puq=Puquina
 pru=Puragi
 iar=Purari
 tsz=Purepecha
-pua=Purepecha, Western Highland
 prr=Puri
 prx=Purik
-puy=Purisime\u00f1o
-pur=Purubor\u00e1
+puy=Purisime\u221a\u00b1o
+pur=Purubor\u221a\u00b0
 pub=Purum
+puz=Purum Naga
 ps=Pushto
 pus=Pushto
 mfl=Putai
@@ -5766,136 +5667,110 @@
 pyu=Puyuma
 pme=Pwaamei
 pop=Pwapwa
+kjp=Pwo Eastern Karen
+pww=Pwo Northern Karen
+pwo=Pwo Western Karen
 pcw=Pyapun
+pye=Pye Krumen
 pyy=Pyen
 pby=Pyu
 pyx=Pyu (Myanmar)
+pbb=P\u221a\u00b0ez
+pfa=P\u221a\u00b0\u221a\u00b0fang
+lkr=P\u221a\u00a7ri
+pev=P\u221a\u00a9mono
+lme=P\u221a\u00a9v\u221a\u00a9
+pko=P\u221a\u2202koot
+kjb=Q'anjob'al
 laq=Qabiao
 byx=Qaqet
 qxq=Qashqa'i
 xqt=Qatabanian
 alc=Qawasqar
-cng=Qiang, Northern
-qxs=Qiang, Southern
+ymq=Qila Muji
 ahg=Qimant
+zqe=Qiubei Zhuang
 qua=Quapaw
 fcs=Quebec Sign Language
 yum=Quechan
+qu=Quechua
 que=Quechua
-qu=Quechua
-qva=Quechua, Ambo-Pasco
-qxu=Quechua, Arequipa-La Uni\u00f3n
-quy=Quechua, Ayacucho
-qvc=Quechua, Cajamarca
-qvl=Quechua, Cajatambo North Lima
-quk=Quechua, Chachapoyas
-cqu=Quechua, Chilean
-qxc=Quechua, Chincha
-qxa=Quechua, Chiqui\u00e1n Ancash
-qwc=Quechua, Classical
-qwa=Quechua, Corongo Ancash
-quz=Quechua, Cusco
-qve=Quechua, Eastern Apur\u00edmac
-qub=Quechua, Huallaga Hu\u00e1nuco
-qvh=Quechua, Huamal\u00edes-Dos de Mayo Hu\u00e1nuco
-qwh=Quechua, Huaylas Ancash
-qvw=Quechua, Huaylla Wanca
-qxw=Quechua, Jauja Wanca
-quf=Quechua, Lambayeque
-qvm=Quechua, Margos-Yarowilca-Lauricocha
-qvo=Quechua, Napo Lowland
-qul=Quechua, North Bolivian
-qxn=Quechua, Northern Conchucos Ancash
-qvn=Quechua, North Jun\u00edn
-qvp=Quechua, Pacaraos
-qxh=Quechua, Panao Hu\u00e1nuco
-qxp=Quechua, Puno
-qvs=Quechua, San Mart\u00edn
-qxt=Quechua, Santa Ana de Tusi Pasco
-qws=Quechua, Sihuas Ancash
-quh=Quechua, South Bolivian
-qxo=Quechua, Southern Conchucos Ancash
-qup=Quechua, Southern Pastaza
-qur=Quechua, Yanahuanca Pasco
-qux=Quechua, Yauyos
 qya=Quenya
+otq=Quer\u221a\u00a9taro Otomi
+pxm=Quetzaltepec Mixe
 qvy=Queyu
-quc=Quich\u00e9, Central
-cun=Quich\u00e9, Cun\u00e9n
-quu=Quich\u00e9, Eastern
-quj=Quich\u00e9, Joyabaj
-qxi=Quich\u00e9, San Andr\u00e9s
-qut=Quich\u00e9, West Central
-qud=Quichua, Calder\u00f3n Highland
-qxr=Quichua, Ca\u00f1ar Highland
-qug=Quichua, Chimborazo Highland
-qvi=Quichua, Imbabura Highland
-qvj=Quichua, Loja Highland
-qvz=Quichua, Northern Pastaza
-qxl=Quichua, Salasaca Highland
-qus=Quichua, Santiago del Estero
-quw=Quichua, Tena Lowland
+zpj=Quiavicuzas Zapotec
 qui=Quileute
 qun=Quinault
 quq=Quinqui
+ztq=Quioquitani-Quier\u221a\u2260 Zapotec
+chq=Quiotepec Chinantec
+qyp=Quiripi
 rah=Rabha
 rad=Rade
 xrr=Raetic
-rm=Raeto-Romance
-roh=Raeto-Romance
 raz=Rahambuu
+mqk=Rajah Kabunsuwan Manobo
 raj=Rajasthani
-rjb=Rajbanshi
+rjs=Rajbanshi
 rji=Raji
 rjg=Rajong
+gra=Rajput Garasia
 rkh=Rakahanga-Manihiki
+rki=Rakhine
 ral=Ralte
 rma=Rama
 rai=Ramoaaina
 kjx=Ramopa
 lje=Rampi
-rae=Ranau
+thr=Rana Tharu
 rax=Rang
 rgk=Rangkas
+rnl=Ranglong
+rkt=Rangpuri
 rao=Rao
 ray=Rapa
 rap=Rapanui
 kyx=Rapoisi
 rpt=Rapting
+lra=Rara Bakati'
 rar=Rarotongan
 rac=Rasawa
 btn=Ratagnon
 rth=Ratahan
 rtw=Rathawi
+bgd=Rathwi Bareli
 rau=Raute
 yea=Ravula
 rwo=Rawa
 raw=Rawang
-rws=Rawas
 jnl=Rawat
 rwa=Rawo
+zor=Ray\u221a\u2265n Zoque
 rat=Razajerdi
+gir=Red Gelao
 atu=Reel
 rej=Rejang
+ree=Rejang Kayan
 rei=Reli
 bow=Rema
 rmb=Rembarunga
 reb=Rembong
 rem=Remo
+agv=Remontado Agta
 rmp=Rempi
 lkj=Remun
 rel=Rendille
 ren=Rengao
-mnv=Rennell-Belona
+mnv=Rennell-Bellona
 rsi=Rennellese Sign Language
 rpn=Repanbitip
+rer=Rer Bare
 rea=Rerau
-rer=Rer Bare
 pgk=Rerep
 res=Reshe
-rgr=Res\u00edgaro
+rgr=Res\u221a\u2260garo
 ret=Retta
-rcf=R\u00e9union Creole French
 rey=Reyesano
 ria=Riang (India)
 ril=Riang (Myanmar)
@@ -5903,33 +5778,25 @@
 rir=Ribun
 rie=Rien
 rkb=Rikbaktsa
+zar=Rinc\u221a\u2265n Zapotec
 rgu=Ringgou
 rri=Ririo
 rit=Ritarungo
 riu=Riung
-roc=Roglai, Cacgia
-rog=Roglai, Northern
-rgs=Roglai, Southern
+snj=Riverain Sango
 rod=Rogo
+rhg=Rohingya
 rmm=Roma
+rgn=Romagnol
 rmx=Romam
+ro=Romanian
 ron=Romanian
-ro=Romanian
-ruo=Romanian, Istro
-rup=Romanian, Macedo
-ruq=Romanian, Megleno
 rms=Romanian Sign Language
-rmn=Romani, Balkan
-rml=Romani, Baltic
-rmc=Romani, Carpathian
-rmf=Romani, Kalo Finnish
-rmo=Romani, Sinte
-rmu=Romani, Tavringer
-rmy=Romani, Vlax
-rmw=Romani, Welsh
 rge=Romano-Greek
 rsb=Romano-Serbian
 rmv=Romanova
+rm=Romansh
+roh=Romansh
 rom=Romany
 rol=Romblomanon
 rof=Rombo
@@ -5937,6 +5804,7 @@
 cla=Ron
 rng=Ronga
 ror=Rongga
+nbu=Rongmei Naga
 rnp=Rongpo
 roe=Ronji
 rnn=Roon
@@ -5944,12 +5812,13 @@
 roo=Rotokas
 rtm=Rotuman
 rug=Roviana
+pce=Ruching Palaung
 rdb=Rudbari
 rui=Rufiji
 ruh=Ruga
 dru=Rukai
-ruc=Ruli
 ruz=Ruma
+rbb=Rumai Palaung
 klq=Rumu
 rna=Runa
 rn=Rundi
@@ -5957,30 +5826,36 @@
 rou=Runga
 drg=Rungus
 rnw=Rungwa
+bxr=Russia Buriat
 ru=Russian
 rus=Russian
-orv=Russian, Old
 rsl=Russian Sign Language
 rue=Rusyn
 rut=Rutul
+ruc=Ruuli
 rnd=Ruund
 rwk=Rwa
+rcf=R\u221a\u00a9union Creole French
+ksw=S'gaw Karen
 sax=Sa
 apb=Sa'a
+snv=Sa'ban
+scq=Sa'och
 sav=Saafi-Saafi
 raq=Saam
+lsm=Saamia
 sxr=Saaroa
 saa=Saba
 xsa=Sabaean
-snv=Sa'ban
-sae=Saban\u00eas
+bsy=Sabah Bisaya
+msi=Sabah Malay
+sae=Saban\u221a\u2122
 spy=Sabaot
 sbv=Sabine
 hvn=Sabu
-sbo=Sab\u00fcm
+sbo=Sab\u221a\u00bam
 quv=Sacapulteco
 sck=Sadri
-sdr=Sadri, Oraon
 skb=Saek
 spd=Saep
 saf=Safaliba
@@ -5990,123 +5865,152 @@
 tga=Sagalla
 ssy=Saho
 saj=Sahu
+aec=Saidi Arabic
 acf=Saint Lucian Creole French
 xsy=Saisiyat
 sjl=Sajalong
 sjb=Sajau Basap
+sch=Sakachep
+skg=Sakalava Malagasy
 skm=Sakam
-xsk=Sakan
 sku=Sakao
 skt=Sakata
 sak=Sake
-sch=Sakechep
-skf=Sakirabi\u00e1
+skf=Sakirabi\u221a\u00b0
 shq=Sala
 slx=Salampasu
 slr=Salar
 sgu=Salas
+qxl=Salasaca Highland Quichua
 slq=Salchuq
 sau=Saleman
 sbe=Saliba
-slc=S\u00e1liba
 sln=Salinan
-slh=Salish, Southern Puget Sound
-str=Salish, Straits
 sdz=Sallands
 sll=Salt-Yui
-loe=Saluan, Coastal
-slb=Saluan, Kahumamahon
-slj=Salum\u00e1
+loe=Saluan
+slj=Salum\u221a\u00b0
 esn=Salvadoran Sign Language
 snx=Sam
 smd=Sama
-sml=Sama, Central
-slm=Sama, Pangutaran
 smp=Samaritan
+sam=Samaritan Aramaic
 tmj=Samarokena
-ssb=Sama, Southern
+ysd=Samatao
 smx=Samba
 ccg=Samba Daka
-sbl=Sambal, Botolan
 ndi=Samba Leko
-xsb=Sambal, Tin\u00e0
+xab=Sambe
 ssx=Samberigi
 saq=Samburu
 smh=Samei
-sia=Sami, Akkala
-sjk=Sami, Kemi
-sjd=Sami, Kildin
-sje=Sami, Pite
-sjt=Sami, Ter
-sju=Sami, Ume
 smq=Samo
+sm=Samoan
 smo=Samoan
-sm=Samoan
-stj=Samo, Matya
-sym=Samo, Maya
 swm=Samosa
-sbd=Samo, Southern
 rav=Sampang
 sxm=Samre
 stu=Samtao
 smv=Samvedi
-sap=Sanapan\u00e1
+ztm=San Agust\u221a\u2260n Mixtepec Zapotec
+zpx=San Baltazar Loxicha Zapotec
+cuk=San Blas Kuna
+hve=San Dionisio Del Mar Huave
+pow=San Felipe Otlaltepec Popoloca
+hue=San Francisco Del Mar Huave
+mat=San Francisco Matlatzinca
+maa=San Jer\u221a\u2265nimo Tec\u221a\u2265atl Mazatec
+poe=San Juan Atzingo Popoloca
+mjc=San Juan Colorado Mixtec
+zab=San Juan Guelav\u221a\u2260a Zapotec
+xtj=San Juan Teita Mixtec
+pps=San Lu\u221a\u2260s Temalacayuca Popoloca
+pls=San Marcos Tlalcoyalco Popoloca
+trq=San Mart\u221a\u2260n Itunyoso Triqui
+qvs=San Mart\u221a\u2260n Quechua
+huv=San Mateo Del Mar Huave
+scf=San Miguel Creole French
+mig=San Miguel El Grande Mixtec
+xtp=San Miguel Piedras Mixtec
+azg=San Pedro Amuzgos Amuzgo
+zpf=San Pedro Quiatoni Zapotec
+kwy=San Salvador Kongo
+zpt=San Vicente Coatl\u221a\u00b0n Zapotec
+ayn=Sanaani Arabic
+sap=Sanapan\u221a\u00b0
 sad=Sandawe
 sng=Sanga (Democratic Republic of Congo)
 xsn=Sanga (Nigeria)
+myt=Sangab Mandaya
 scg=Sanggau
 snl=Sangil
 sxn=Sangir
 sgr=Sangisari
+sgk=Sangkong
 sgl=Sanglechi-Ishkashimi
 sag=Sango
 sg=Sango
-snj=Sango, Riverain
+nsa=Sangtam Naga
 snq=Sangu (Gabon)
 sbp=Sangu (Tanzania)
+ysn=Sani
+ysy=Sanie
 sny=Saniyo-Hiyewe
-scf=San Miguel Creole French
+msc=Sankaran Maninka
 ssi=Sansi
+sa=Sanskrit
 san=Sanskrit
-sa=Sanskrit
 sca=Sansu
-stc=Santa Cruz
+qxt=Santa Ana de Tusi Pasco Quechua
+ztn=Santa Catarina Albarradas Zapotec
+pca=Santa In\u221a\u00a9s Ahuatempan Popoloca
+zpn=Santa In\u221a\u00a9s Yatzechi Zapotec
+mdv=Santa Luc\u221a\u2260a Monteverde Mixtec
+hvv=Santa Mar\u221a\u2260a Del Mar Huave
+nhz=Santa Mar\u221a\u2260a La Alta Nahuatl
+zpi=Santa Mar\u221a\u2260a Quiegolani Zapotec
+mza=Santa Mar\u221a\u2260a Zacatepec Mixtec
+cok=Santa Teresa Cora
 sat=Santali
-xsu=Sanum\u00e1
-ssn=Sanye
-scq=Sa'och
-cri=S\u00e3otomense
+zpr=Santiago Xanica Zapotec
+qus=Santiago del Estero Quichua
+zas=Santo Domingo Albarradas Zapotec
+xsu=Sanum\u221a\u00b0
 spr=Saparua
-spc=Sap\u00e9
 krn=Sapo
 spi=Saponi
 sps=Saposa
 spu=Sapuan
+spc=Sap\u221a\u00a9
 mwm=Sar
 sre=Sara
 koj=Sara Dunjo
 sbz=Sara Kaba
+kwg=Sara Kaba Deme
+kwv=Sara Kaba N\u221a\u00b0\u221a\u2020
 srm=Saramaccan
+bps=Sarangani Blaan
+mbs=Sarangani Manobo
+zsa=Sarasira
 sar=Saraveca
 sc=Sardinian
 srd=Sardinian
-sro=Sardinian, Campidanese
-sdn=Sardinian, Gallurese
-src=Sardinian, Logudorese
-sdc=Sardinian, Sassarese
 srh=Sarikoli
 sdf=Sarli
 srs=Sarsi
+onp=Sartang
 swy=Sarua
 sdu=Sarudu
 sra=Saruga
 sas=Sasak
 sxs=Sasaru
+sdc=Sassarese Sardinian
 stw=Satawalese
-mav=Sater\u00e9-Maw\u00e9
 stq=Saterfriesisch
+mav=Sater\u221a\u00a9-Maw\u221a\u00a9
 sdl=Saudi Arabian Sign Language
 skc=Sauk
+psu=Sauraseni Pr\u0192\u00c5krit
 saz=Saurashtra
 srt=Sauri
 mjt=Sauria Paharia
@@ -6120,16 +6024,18 @@
 saw=Sawi
 swt=Sawila
 swn=Sawknah
-osx=Saxon, Old
-sxu=Saxon, Upper
+sxw=Saxwe Gbe
 say=Saya
-gsw=Schwyzerd\u00fctsch
+pos=Sayula Popoluca
 sco=Scots
+gd=Scottish Gaelic
+gla=Scottish Gaelic
 xsc=Scythian
 gul=Sea Island Creole English
 kdg=Seba
 sgw=Sebat Bet Gurage
 sbx=Seberuang
+sib=Sebop
 snb=Sebuyau
 sec=Sechelt
 sey=Secoya
@@ -6151,7 +6057,6 @@
 skx=Seko Padang
 sko=Seko Tengah
 lip=Sekpele
-skl=Selako
 kgi=Selangor Sign Language
 slu=Selaru
 sly=Selayar
@@ -6166,13 +6071,12 @@
 szc=Semaq Beri
 sbr=Sembakung Murut
 sza=Semelai
-sdd=Semendo
 etz=Semimi
 ssm=Semnam
 smy=Semnani
 xse=Sempan
 seh=Sena
-swk=Sena, Malawi
+seq=Senara S\u221a\u00a9noufo
 syn=Senaya
 sej=Sene
 see=Seneca
@@ -6182,29 +6086,18 @@
 spk=Sengo
 ssz=Sengseng
 sjs=Senhaja De Srair
-sef=Senoufo, Cebaara
-dyi=Senoufo, Djimini
-myk=Senoufo, Mamara
-sen=S\u00e9noufo, Nanerig\u00e9
-sev=Senoufo, Nyarafolo
-plr=Senoufo, Palaka
-seq=S\u00e9noufo, Senara
-seb=Senoufo, Shempire
-sep=S\u00e9noufo, S\u00ecc\u00ect\u00e9
-spp=Senoufo, Supyire
-shz=Senoufo, Syenara
-tgw=Senoufo, Tagwana
 sni=Sensi
 set=Sentani
+sez=Senthang Chin
 std=Sentinel
 spb=Sepa (Indonesia)
 spe=Sepa (Papua New Guinea)
 spm=Sepen
+iws=Sepik Iwam
 sry=Sera
 skr=Seraiki
-srj=Serawai
+sr=Serbian
 srp=Serbian
-sr=Serbian
 hbs=Serbo-Croatian
 sh=Serbo-Croatian
 swf=Sere
@@ -6222,6 +6115,7 @@
 stm=Setaman
 sbi=Seti
 sta=Settla
+ojs=Severn Ojibwa
 sew=Sewa Bay
 sze=Seze
 scw=Sha
@@ -6229,12 +6123,12 @@
 sbf=Shabo
 srz=Shahmirzadi
 shm=Shahrudi
-nfk=Shakara
 sha=Shall-Zwall
+sqa=Shama-Sambuga
 xsh=Shamang
-sqa=Shama-Sambuga
 ksb=Shambala
 shn=Shan
+swo=Shanenawa
 sho=Shanga
 jih=Shangzhai
 mcd=Sharanahua
@@ -6250,23 +6144,25 @@
 moy=Shekkacho
 she=Sheko
 sth=Shelta
+seb=Shempire Senoufo
 shl=Shendu
 scv=Sheni
 bun=Sherbro
 sdp=Sherdukpen
 xsr=Sherpa
+kip=Sheshi Kham
 shr=Shi
+ssh=Shihhi Arabic
 gua=Shiki
 shk=Shilluk
 scl=Shina
 snh=Shinabo
-plk=Shina, Kohistani
 shp=Shipibo-Conibo
 sxg=Shixing
 sle=Sholaga
 sii=Shom Peng
+sn=Shona
 sna=Shona
-sn=Shona
 bcv=Shoo-Minda-Nye
 cjs=Shor
 shh=Shoshoni
@@ -6280,23 +6176,31 @@
 shs=Shuswap
 ksa=Shuwa-Zamani
 shw=Shwai
+pll=Shwe Palaung
 slw=Sialum
 sif=Siamou
 spg=Sian
 snp=Siane
 sya=Siang
 sjr=Siar-Lak
+mmp=Siawi
 nco=Sibe
-sdx=Sibu
+sdx=Sibu Melanau
 sxc=Sicanian
 scx=Sicel
+ii=Sichuan Yi
+iii=Sichuan Yi
 scn=Sicilian
+sqr=Siculo Arabic
 sid=Sidamo
 xsd=Sidetic
 erg=Sie
 sgx=Sierra Leone Sign Language
+nsu=Sierra Negra Nahuatl
+zaa=Sierra de Ju\u221a\u00b0rez Zapotec
 sxe=Sighu
 snr=Sihan
+qws=Sihuas Ancash Quechua
 ski=Sika
 sky=Sikaiana
 tty=Sikaritai
@@ -6305,12 +6209,13 @@
 bla=Siksika
 skh=Sikule
 slt=Sila
+mks=Silacayoapan Mixtec
 sbq=Sileibi
-sli=Silesian, Lower
+szl=Silesian
 wul=Silimo
 mkc=Siliput
 xsp=Silopi
-xst=Silt'e
+stv=Silt'e
 sie=Simaa
 sbw=Simba
 smg=Simbali
@@ -6322,31 +6227,32 @@
 siu=Sinagen
 sst=Sinasina
 snc=Sinaugoro
-sdi=Sindang Kelingi
 sjn=Sindarin
 sd=Sindhi
 snd=Sindhi
 sbn=Sindhi Bhil
+xts=Sindihui Mixtec
 sgm=Singa
 sls=Singapore Sign Language
 sgp=Singpho
-sin=Sinhalese
-si=Sinhalese
+si=Sinhala
+sin=Sinhala
+xti=Sinicahua Mixtec
 skq=Sininkere
 snz=Sinsauru
+rmo=Sinte Romani
 sys=Sinyar
 xsi=Sio
 snn=Siona
 qum=Sipacapense
 swj=Sira
 fos=Siraya
+ysr=Sirenik Yupik
 sir=Siri
 sri=Siriano
-srq=Sirion\u00f3
+srq=Sirion\u221a\u2265
 srx=Sirmauri
 ssd=Siroi
-sil=Sisaala, Tumulung
-ssl=Sisaala, Western
 sld=Sissala
 sso=Sissano
 sis=Siuslaw
@@ -6354,28 +6260,26 @@
 siw=Siwai
 siz=Siwi
 akp=Siwu
-szk=Sizaki
+csy=Siyin Chin
 ska=Skagit
 svx=Skalvian
 skw=Skepi Creole Dutch
 sms=Skolt Sami
 skv=Skou
 den=Slave (Athapascan)
-scs=Slavey, North
-xsl=Slavey, South
-chu=Slavic, Church
-cu=Slavic, Church
 sk=Slovak
 slk=Slovak
 svk=Slovakian Sign Language
 sl=Slovenian
 slv=Slovenian
+sfm=Small Flowery Miao
+kxq=Sm\u221a\u00a7rky Kanum
 sno=Snohomish
-sss=S\u00f4
+sox=So (Cameroon)
+soc=So (Democratic Republic of Congo)
 ssq=So'a
 sob=Sobei
-sox=So (Cameroon)
-soc=So (Democratic Republic of Congo)
+cso=Sochiapam Chinantec
 xog=Soga
 sog=Sogdian
 soj=Soi
@@ -6386,17 +6290,14 @@
 aaw=Solong
 sol=Solos
 smc=Som
+so=Somali
 som=Somali
-so=Somali
 sor=Somrai
 smu=Somray
 kgt=Somyev
 shc=Sonde
 sgo=Songa
 sop=Songe
-ses=Songhai, Koyraboro Senni
-hmb=Songhay, Humburi Senni
-khq=Songhay, Koyra Chiini
 soo=Songo
 soe=Songomeno
 sod=Songoora
@@ -6408,61 +6309,168 @@
 urw=Sop
 sqt=Soqotri
 srb=Sora
-dsb=Sorbian, Lower
-hsb=Sorbian, Upper
 sbh=Sori-Harengan
 sqo=Sorkhei
 sxo=Sorothaptic
-bks=Sorsogon, Masbate
-srv=Sorsogon, Waray
-nso=Sotho, Northern
-sot=Sotho, Southern
-st=Sotho, Southern
+ays=Sorsogon Ayta
+sdk=Sos Kundi
+krz=Sota Kanum
 sqq=Sou
 sfs=South African Sign Language
-sma=Southern Sami
+aws=South Awyu
+azb=South Azerbaijani
+quh=South Bolivian Quechua
+lnl=South Central Banda
+dib=South Central Dinka
+erk=South Efate
+fal=South Fali
+giz=South Giziga
+lmf=South Lembata
+ajp=South Levantine Arabic
+mqm=South Marquesan
+kts=South Muyu
+nbl=South Ndebele
+nr=South Ndebele
+nxl=South Nuaulu
 spx=South Picene
+xsl=South Slavey
+omw=South Tairora
+cpy=South Ucayali Ash\u221a\u00a9ninka
+mcy=South Watut
+tlw=South Wemale
 sns=South West Bay
+tvk=Southeast Ambrym
+vbb=Southeast Babar
+ijs=Southeast Ijo
+psi=Southeast Pashayi
+dks=Southeastern Dinka
+zpd=Southeastern Ixtl\u221a\u00b0n Zapotec
+nit=Southeastern Kolami
+mxy=Southeastern Nochixtl\u221a\u00b0n Mixtec
+pom=Southeastern Pomo
+npl=Southeastern Puebla Nahuatl
+tcu=Southeastern Tarahumara
+stp=Southeastern Tepehuan
+agy=Southern Alta
+alt=Southern Altai
+ams=Southern Amami-Oshima
+ayc=Southern Aymara
+bfs=Southern Bai
+bcc=Southern Balochi
+bjq=Southern Betsimisaraka Malagasy
+biv=Southern Birifor
+bwq=Southern Bobo Madar\u221a\u00a9
+caf=Southern Carrier
+bln=Southern Catanduanes Bicolano
+qxo=Southern Conchucos Ancash Quechua
+dga=Southern Dagaare
+kmc=Southern Dong
+crj=Southern East Cree
+ghe=Southern Ghale
+ggo=Southern Gondi
+grj=Southern Grebo
+hmy=Southern Guiyang Hmong
+hax=Southern Haida
+hnd=Southern Hindko
+sxk=Southern Kalapuya
+ksc=Southern Kalinga
+kss=Southern Kisi
+kjd=Southern Kiwai
+sdh=Southern Kurdish
+ysp=Southern Lolopo
+lrr=Southern Lorung
+luz=Southern Luri
+snm=Southern Ma'di
+hma=Southern Mashan Hmong
+mnn=Southern Mnong
+ymc=Southern Muji
+nab=Southern Nambiku\u221a\u00b0ra
+nbw=Southern Ngbandi
+nik=Southern Nicobarese
+nsd=Southern Nisu
+nnw=Southern Nuni
+css=Southern Ohlone
+osu=Southern One
+pmz=Southern Pame
+pbt=Southern Pashto
+qup=Southern Pastaza Quechua
+peq=Southern Pomo
+mit=Southern Puebla Mixtec
+slh=Southern Puget Sound Salish
+pmj=Southern Pumi
+hms=Southern Qiandong Miao
+qxs=Southern Qiang
+nre=Southern Rengma Naga
+zsr=Southern Rincon Zapotec
+rgs=Southern Roglai
+ssb=Southern Sama
+sma=Southern Sami
+sbd=Southern Samo
+skd=Southern Sierra Miwok
+sot=Southern Sotho
+st=Southern Sotho
+sou=Southern Thai
+tix=Southern Tiwa
+wib=Southern Toussian
+tjs=Southern Tujia
+tce=Southern Tutchone
+uzs=Southern Uzbek
+yux=Southern Yukaghir
+gso=Southwest Gbaya
+plv=Southwest Palawano
+psh=Southwest Pashayi
+nwi=Southwest Tanna
+dik=Southwestern Dinka
+fay=Southwestern Fars
+hmg=Southwestern Guiyang Hmong
+hmh=Southwestern Huishui Hmong
+nsv=Southwestern Nisu
+tsf=Southwestern Tamang
+twr=Southwestern Tarahumara
+tla=Southwestern Tepehuan
+meh=Southwestern Tlaxiaco Mixtec
 sww=Sowa
 sow=Sowanda
+vmp=Soyaltepec Mazatec
+vmq=Soyaltepec Mixtec
 es=Spanish
 spa=Spanish
-spq=Spanish, Loreto-Ucayali
-osp=Spanish, Old
 ssp=Spanish Sign Language
 spt=Spiti Bhoti
 spo=Spokane
 squ=Squamish
-srn=Sranan
+srn=Sranan Tongo
 sci=Sri Lankan Creole Malay
 sqs=Sri Lankan Sign Language
+arb=Standard Arabic
+ekk=Standard Estonian
+zsm=Standard Malay
 stl=Stellingwerfs
-stt=Stieng, Budeh
-sti=Stieng, Bulo
 sbu=Stod Bhoti
 sto=Stoney
+str=Straits Salish
 szp=Suabo
 seo=Suarmin
 swp=Suau
-suh=Suba
-syb=Subanen, Central
-stb=Subanen, Northern
-skn=Subanon, Kolibugan
-suc=Subanon, Western
-laa=Subanun, Lapuyan
+sxb=Suba
+ssc=Suba-Simbiti
 xsj=Subi
 sbs=Subiya
 sut=Subtiaba
+apd=Sudanese Arabic
+pga=Sudanese Creole Arabic
 tgo=Sudest
 xsv=Sudovian
 sue=Suena
 sgi=Suga
 sug=Suganga
+kzs=Sugut Dusun
 swi=Sui
 sui=Suki
 sub=Suku
 suk=Sukuma
 syk=Sukur
+zsu=Sukurum
 szn=Sula
 sua=Sulka
 srg=Sulod
@@ -6473,101 +6481,115 @@
 smw=Sumbawa
 suw=Sumbwa
 sux=Sumerian
+nsm=Sumi Naga
 sum=Sumo-Mayangna
 ssk=Sunam
+su=Sundanese
 sun=Sundanese
-su=Sundanese
-suu=Sungkai
 suz=Sunwar
 syo=Suoy
+spp=Supyire Senoufo
 tdl=Sur
-sjp=Surajpuri
 sbj=Surbakhal
 suq=Suri
 sul=Surigaonon
+sjp=Surjapuri
 sgz=Sursurunga
-swx=Suruah\u00e1
+swx=Suruah\u221a\u00b0
 sde=Surubu
-sru=Suru\u00ed
-mdz=Suru\u00ed Do Par\u00e1
+sru=Suru\u221a\u2260
+mdz=Suru\u221a\u2260 Do Par\u221a\u00b0
 sqn=Susquehannock
 sus=Susu
 ssu=Susuami
 sdj=Suundi
 swu=Suwawa
-suy=Suy\u00e1
+suy=Suy\u221a\u00b0
 sva=Svan
 swg=Swabian
-swc=Swahili, Congo
-swa=Swahili (generic)
-sw=Swahili (generic)
-swh=Swahili (specific)
+swh=Swahili (individual language)
+sw=Swahili (macrolanguage)
+swa=Swahili (macrolanguage)
+csw=Swampy Cree
 ss=Swati
 ssw=Swati
 sv=Swedish
 swe=Swedish
 swl=Swedish Sign Language
+gsw=Swiss German
 ssr=Swiss-French Sign Language
 sgg=Swiss-German Sign Language
 slf=Swiss-Italian Sign Language
+shz=Syenara Senoufo
 syl=Sylheti
 syr=Syriac
-syc=Syriac, Classical
+slc=S\u221a\u00b0liba
+zkp=S\u221a\u00a3o Paulo Kaing\u221a\u00b0ng
+cri=S\u221a\u00a3otomense
+sep=S\u221a\u00a8c\u221a\u00a8t\u221a\u00a9 S\u221a\u00a9noufo
+sss=S\u221a\u00a5
+tct=T'en
+acq=Ta'izzi-Adeni Arabic
 tap=Taabwa
+zat=Tabaa Zapotec
 tby=Tabaru
+chf=Tabasco Chontal
+nhc=Tabasco Nahuatl
+zoq=Tabasco Zoque
 tab=Tabassaran
 tnm=Tabla
 knv=Tabo
 tzx=Tabriak
+xtt=Tacahua Mixtec
 tna=Tacana
-mtz=Tacanec
 shy=Tachawit
 shi=Tachelhit
+lts=Tachoni
 dsq=Tadaksahak
 tdy=Tadyawan
 rob=Tae'
 tcd=Tafi
 bgs=Tagabawa
+klg=Tagakaulu Kalagan
 mvv=Tagal Murut
 tgl=Tagalog
 tl=Tagalog
 oua=Tagargrent
 tbw=Tagbanwa
-tbk=Tagbanwa, Calamian
-tgt=Tagbanwa, Central
 tbm=Tagbu
 tda=Tagdal
 tgx=Tagish
 tag=Tagoi
+tgw=Tagwana Senoufo
+thv=Tahaggart Tamahaq
 tah=Tahitian
 ty=Tahitian
 tht=Tahltan
 taw=Tai
-gpn=Taiap
 tyr=Tai Daeng
 blt=Tai Dam
 tyj=Tai Do
-twh=Tai D\u00f3n
+twh=Tai D\u221a\u2265n
 thc=Tai Hang Tong
 tiz=Tai Hongjin
-aos=Taikat
 tlq=Tai Loi
 thi=Tai Long
-tmp=Tai M\u00e8ne
+tmp=Tai M\u221a\u00aene
+tdd=Tai N\u221a\u00baa
+tpo=Tai Pao
+tmm=Tai Thanh
+cuu=Tai Ya
+gpn=Taiap
+aos=Taikat
 ago=Tainae
 tnq=Taino
-tdd=Tai N\u00fca
-tpo=Tai Pao
-tbg=Tairora, North
-omw=Tairora, South
 uar=Tairuma
 dav=Taita
-tmm=Tai Thanh
 tss=Taiwan Sign Language
-cuu=Tai Ya
 pee=Taje
+tg=Tajik
 tgk=Tajik
-tg=Tajik
+abh=Tajiki Arabic
 tdj=Tajio
 tja=Tajuasohn
 tkm=Takelma
@@ -6579,7 +6601,6 @@
 tke=Takwane
 tal=Tal
 tak=Tala
-tle=Talai
 tld=Talaud
 tlv=Taliabu
 tdf=Talieng
@@ -6588,87 +6609,73 @@
 tlo=Talodi
 tlk=Taloki
 tln=Talondo'
+yta=Talu
 ilw=Talur
 tly=Talysh
 tma=Tama (Chad)
 ten=Tama (Colombia)
 tcg=Tamagario
-thv=Tamahaq, Tahaggart
-ttq=Tamajaq, Tawallammat
-thz=Tamajeq, Tayart
-tmz=Tamanaku
-taj=Tamang, Eastern
-tge=Tamang, Eastern Gorkha
-tmk=Tamang, Northwestern
-tsf=Tamang, Southwestern
-tdg=Tamang, Western
 tmn=Taman (Indonesia)
 tcl=Taman (Myanmar)
+tmz=Tamanaku
 tmh=Tamashek
 taq=Tamasheq
-tzm=Tamazight, Central Atlas
-tjo=Tamazight, Temacine
-tia=Tamazight, Tidikelt
+vmx=Tamazola Mixtec
 tdk=Tambas
+xxt=Tambora
 tls=Tambotalo
+kzt=Tambunan Dusun
 tmy=Tami
+ta=Tamil
 tam=Tamil
-ta=Tamil
-oty=Tamil, Old
 tax=Tamki
+tml=Tamnim Citak
+low=Tampias Lobu
 tpu=Tampuan
 tpm=Tampulma
 tcb=Tanacross
 tcm=Tanahmerah
 tfn=Tanaina
-taa=Tanana, Lower
-tau=Tanana, Upper
 tpv=Tanapag
 tni=Tandia
+tdx=Tandroy-Mahafaly Malagasy
 tnx=Tanema
 tan=Tangale
 tnv=Tangchangya
 tgg=Tangga
 tgu=Tanggu
+nmf=Tangkhul Naga
 tkx=Tangko
+ytl=Tanglang
 tgp=Tangoa
 tnf=Tangshewi
 tbs=Tanguat
 txg=Tangut
 tbe=Tanimbili
-tnc=Tanimuca-Retuar\u00e3
+tnc=Tanimuca-Retuar\u221a\u00a3
 uji=Tanjijili
-tnj=Tanjong
-tnn=Tanna, North
-nwi=Tanna, Southwest
+txy=Tanosy Malagasy
 tza=Tanzanian Sign Language
-tto=Ta'oih, Lower
-tth=Ta'oih, Upper
 tbb=Tapeba
-tpj=Tapiet\u00e9
-taf=Tapirap\u00e9
-tar=Tarahumara, Central
-tac=Tarahumara, Lowland
-thh=Tarahumara, Northern
-tcu=Tarahumara, Southeastern
-twr=Tarahumara, Southwestern
-tre=Tarangan, East
-txn=Tarangan, West
+afp=Tapei
+tpj=Tapiet\u221a\u00a9
+taf=Tapirap\u221a\u00a9
+tro=Tarao Naga
 tgr=Tareng
-tae=Tariano
+tae=Tariana
 rif=Tarifit
 yer=Tarok
 trv=Taroko
-tov=Taromi, Upper
-suf=Tarpia
+tpf=Tarpia
 txr=Tartessian
 twq=Tasawaq
+nst=Tase Naga
 xtz=Tasmanian
 tmt=Tasmate
+cta=Tataltepec Chatino
 txx=Tatana
 tat=Tatar
 tt=Tatar
-ttt=Tat, Muslim
 tav=Tatuyo
 ttd=Tauade
 tuh=Taulil
@@ -6680,35 +6687,39 @@
 tya=Tauya
 tvs=Taveta
 tvn=Tavoyan
+rmu=Tavringer Romani
 tbo=Tawala
+ttq=Tawallammat Tamajaq
+xtw=Tawand\u221a\u2122
+twm=Tawang Monpa
 twl=Tawara
-bnj=Tawbuid, Eastern
-twb=Tawbuid, Western
 tbp=Taworta
 twy=Tawoyan
-tyz=T\u00e0y
+tcp=Tawr Chin
 tas=Tay Boi
 tnu=Tay Khang
+ayy=Tayabas Ayta
+thz=Tayart Tamajeq
 cks=Tayo
-tys=T\u00e0y Sa Pa
-tyt=T\u00e0y Tac
 grr=Taznatit
 tbl=Tboli
-tcj=Tceqli
 tck=Tchitchege
 bqa=Tchumbuli
+tve=Te'un
 tkw=Teanu
-tgb=Tebilung
+tsy=Tebul Sign Language
+dtu=Tebul Ure Dogon
+tcw=Tecpatl\u221a\u00b0n Totonac
 tuq=Tedaga
+ctd=Tedim Chin
 tkq=Tee
-lor=T\u00e9\u00e9n
 tfo=Tefaro
 ras=Tegali
 kps=Tehit
 teh=Tehuelche
+ztt=Tejalapan Zapotec
 ebo=Teke-Ebo
 ifm=Teke-Fuumu
-tek=Teke, Ibali
 kkw=Teke-Kukuya
 lli=Teke-Laali
 nzu=Teke-Nzikou
@@ -6718,20 +6729,27 @@
 ttc=Tektiteko
 tvm=Tela-Masbuar
 tlf=Telefol
+te=Telugu
 tel=Telugu
-te=Telugu
 tlt=Teluti
 kdh=Tem
-tqb=Temb\u00e9
+tjo=Temacine Tamazight
+nhv=Temascaltepec Nahuatl
 tbt=Tembo (Kitembo)
 tmv=Tembo (Motembo)
+tqb=Temb\u221a\u00a9
 tdo=Teme
 teq=Temein
 soz=Temi
 tea=Temiar
+ott=Temoaya Otomi
 tmo=Temoq
+tdu=Tempasuk Dusun
 tmw=Temuan
-tct=T'en
+quw=Tena Lowland Quichua
+otn=Tenango Otomi
+dtk=Tene Kan Dogon
+vkt=Tenggarong Kutai Malay
 tes=Tengger
 pah=Tenharim
 tqn=Tenino
@@ -6740,12 +6758,11 @@
 tio=Teop
 tev=Teor
 tep=Tepecano
-tee=Tepehua, Huehuetla
-ntp=Tepehuan, Northern
-stp=Tepehuan, Southeastern
-tla=Tepehuan, Southwestern
-tpp=Tepehua, Pisaflores
-tpt=Tepehua, Tlachichilco
+cnt=Tepetotutla Chinantec
+cux=Tepeuxila Cuicatec
+cte=Tepinapa Chinantec
+ted=Tepo Krumen
+sjt=Ter Sami
 ttr=Tera
 trb=Terebu
 buo=Terei
@@ -6753,76 +6770,82 @@
 tef=Teressa
 twg=Tereweng
 tfr=Teribe
+tec=Terik
 twu=Termanu
 tft=Ternate
-tmg=Ternate\u00f1o
+tmg=Ternate\u221a\u00b1o
 keg=Tese
 twc=Teshenawa
 teo=Teso
 tll=Tetela
+nhg=Tetelcingo Nahuatl
 teb=Tetete
 tet=Tetum
 tdt=Tetun Dili
-tve=Te'un
+cut=Teutila Cuicatec
 twe=Tewa (Indonesia)
 tew=Tewa (USA)
 twx=Tewe
+otx=Texcatepec Otomi
+poq=Texistepec Popoluca
+zpz=Texmelucan Zapotec
+mxb=Tezoatl\u221a\u00b0n Mixtec
 thy=Tha
+thn=Thachanadan
+tcz=Thado Chin
+th=Thai
 tha=Thai
-th=Thai
-tts=Thai, Northeastern
-nod=Thai, Northern
 tsq=Thai Sign Language
 soa=Thai Song
-sou=Thai, Southern
 ths=Thakali
+nki=Thangal Naga
 thf=Thangmi
 ssf=Thao
 thk=Tharaka
-the=Tharu, Chitwania
-thl=Tharu, Dangaura
-tkt=Tharu, Kathoriya
-thq=Tharu, Kochila
-thr=Tharu, Rana
 thd=Thayore
 typ=Thaypan
 thx=The
 tou=Tho
 thp=Thompson
+ytp=Thopho
 txh=Thracian
+tyl=Thu Lao
 thw=Thudam
-tyl=Thu Lao
 tdh=Thulung
 tbh=Thurawal
 thu=Thuri
+ahi=Tiagbamrin Aizi
 mnl=Tiale
 tbj=Tiang
 ngy=Tibea
+bo=Tibetan
 bod=Tibetan
-bo=Tibetan
-adx=Tibetan, Amdo
-xct=Tibetan, Classical
-khg=Tibetan, Khams
-otb=Tibetan, Old
 tcn=Tichurong
 tca=Ticuna
+mtx=Tida\u221a\u00b0 Mixtec
+tia=Tidikelt Tamazight
 tid=Tidong
 tvo=Tidore
-tiq=Ti\u00e9fo
+boo=Tiemac\u221a\u00aew\u221a\u00ae Bozo
 tii=Tiene
 tif=Tifal
 tgc=Tigak
+nza=Tigon Mbembe
 tig=Tigre
+ti=Tigrinya
 tir=Tigrinya
-ti=Tigrinya
 txq=Tii
+xtl=Tijaltepec Mixtec
 tik=Tikar
 tkp=Tikopia
+otl=Tilapa Otomi
 til=Tillamook
+zts=Tilquiapan Zapotec
 tij=Tilung
 tms=Tima
 tim=Timbe
 tem=Timne
+tvy=Timor Pidgin
 tjm=Timucua
 tih=Timugon Murut
 lbf=Tinani
@@ -6830,7 +6853,9 @@
 tie=Tingal
 tgv=Tingui-Boto
 tit=Tinigua
+tne=Tinoc Kallahan
 tpz=Tinputz
+xsb=Tin\u221a\u2020 Sambal
 tpe=Tippera
 tic=Tira
 tra=Tirahi
@@ -6840,40 +6865,45 @@
 ttv=Titan
 tiv=Tiv
 lax=Tiwa
-twf=Tiwa, Northern
-tix=Tiwa, Southern
 tiw=Tiwi
+tiq=Ti\u221a\u00a9fo
+boz=Ti\u221a\u00a9yaxo Bozo
 tju=Tjurruru
-tpx=Tlapanec, Acatepec
-tpc=Tlapanec, Azoy\u00fa
-tcf=Tlapanec, Malinaltepec
-tpl=Tlapanec, Tlacoapa
+tpt=Tlachichilco Tepehua
+tpl=Tlacoapa Me'phaa
+ctl=Tlacoatzintepec Chinantec
+zpk=Tlacolulita Zapotec
+mxp=Tlahuitoltepec Mixe
+nuz=Tlamacazapa Nahuatl
+mqh=Tlazoyaltepec Mixtec
 tli=Tlingit
 toz=To
 mlu=To'abaita
-tlz=Toala'
 tqo=Toaripi
 tob=Toba
+tmf=Toba-Maskoy
 tgh=Tobagonian Creole English
-tmf=Toba-Maskoy
 tng=Tobanga
 tti=Tobati
 tlb=Tobelo
 tox=Tobian
+tgb=Tobilung
 tbv=Tobo
+asu=Tocantins Asurini
 taz=Tocho
 tcx=Toda
 tdr=Todrah
 tlg=Tofanma
-lht=Toga
+tfi=Tofin Gbe
+tor=Togbo-Vara Banda
 tgy=Togoyo
 ood=Tohono O'odham
 toj=Tojolabal
+tpi=Tok Pisin
 zuh=Tokano
 tkl=Tokelau
 xto=Tokharian A
 txb=Tokharian B
-tpi=Tok Pisin
 tkn=Toku-No-Shima
 jic=Tol
 lbw=Tolaki
@@ -6882,17 +6912,17 @@
 tod=Toma
 tdi=Tomadino
 ttp=Tombelala
-txa=Tombonuwo
+txa=Tombonuo
 tom=Tombulu
 toe=Tomedes
 txm=Tomini
+dtm=Tomo Kan Dogon
 tqp=Tomoip
-tmx=Tomyang
 tdn=Tondano
 tog=Tonga (Nyasa)
 tnz=Tonga (Thailand)
+to=Tonga (Tonga Islands)
 ton=Tonga (Tonga Islands)
-to=Tonga (Tonga Islands)
 toi=Tonga (Zambia)
 tny=Tongwe
 tjn=Tonjon
@@ -6903,52 +6933,47 @@
 ttj=Tooro
 toy=Topoiyo
 toq=Toposa
-trz=Tor\u00e1
 sda=Toraja-Sa'dan
 trj=Toram
 ttu=Torau
+fit=Tornedalen Finnish
 tdv=Toro
+dts=Toro So Dogon
+dtt=Toro Tegu Dogon
 tno=Toromono
 tqr=Torona
 tcs=Torres Strait Creole
 tei=Torricelli
 trw=Torwali
+trz=Tor\u221a\u00b0
+als=Tosk Albanian
 ttl=Totela
 txo=Toto
 txe=Totoli
-toc=Totonac, Coyutla
-tlp=Totonac, Filomena Mata-Coahuitl\u00e1n
-tos=Totonac, Highland
-tqt=Totonac, Ozumatl\u00e1n
-top=Totonac, Papantla
-tot=Totonac, Patla-Chicontla
-too=Totonac, Xicotepec De Ju\u00e1rez
-tlc=Totonac, Yecuatla
+zph=Totomachapan Zapotec
+mto=Totontepec Mixe
 ttk=Totoro
 tqu=Touo
-neb=Toura (C\u00f4te d'Ivoire)
+neb=Toura (C\u221a\u00a5te d'Ivoire)
 don=Toura (Papua New Guinea)
-tsp=Toussian, Northern
-wib=Toussian, Southern
 ttn=Towei
+xtg=Transalpine Gaulish
 rmd=Traveller Danish
 rmg=Traveller Norwegian
 trl=Traveller Scottish
 trm=Tregami
-tme=Trememb\u00e9
+tme=Trememb\u221a\u00a9
 stg=Trieng
 tip=Trimuris
 tgq=Tring
-trx=Tringgus
+trx=Tringgus-Sembaan Bidayuh
+lst=Trinidad and Tobago Sign Language
 trf=Trinidadian Creole English
 trn=Trinitario
-tri=Tri\u00f3
-xtr=Tripuri, Early
-trs=Triqui, Chicahuaxtla
-trc=Triqui, Copala
-trq=Triqui, San Mart\u00edn Itunyoso
-tka=Truk\u00e1
-tpy=Truma\u00ed
+tri=Tri\u221a\u2265
+tka=Truk\u221a\u00b0
+tpy=Trumai
+tsl=Ts'\u221a\u00ban-Lao
 tsa=Tsaangi
 tkr=Tsakhur
 tsd=Tsakonian
@@ -6959,18 +6984,19 @@
 txc=Tsetsaut
 tsj=Tshangla
 kdl=Tsikimba
-cas=Tsiman\u00e9
+cas=Tsiman\u221a\u00a9
+xmw=Tsimihety Malagasy
 tsi=Tsimshian
 tsw=Tsishingini
 ldp=Tso
 hio=Tsoa
 tsv=Tsogo
+ts=Tsonga
 tso=Tsonga
-ts=Tsonga
 fly=Tsotsitaal
+lto=Tsotso
 tsu=Tsou
 ttz=Tsum
-tsl=Ts'\u00fcn-Lao
 tvd=Tsuvadi
 tsh=Tsuvan
 tsc=Tswa
@@ -6980,20 +7006,16 @@
 mjg=Tu
 pmt=Tuamotuan
 tbu=Tubar
-tba=Tubar\u00e3o
-tub=T\u00fcbatulabal
 tuo=Tucano
-tuy=Tugen, North
+tuy=Tugen
 tzn=Tugun
 tuj=Tugutil
-tji=Tujia, Northern
-tjs=Tujia, Southern
 khc=Tukang Besi North
 bhq=Tukang Besi South
 bag=Tuki
 tpq=Tukpa
 tkd=Tukudede
-tkf=Tukumanf\u00e9d
+tkf=Tukumanf\u221a\u00a9d
 tul=Tula
 tlu=Tulehu
 tey=Tulishi
@@ -7001,38 +7023,39 @@
 rak=Tulu-Bohuai
 iou=Tuma-Irumu
 tmc=Tumak
+krt=Tumari Kanuri
 tum=Tumbuka
 kku=Tumi
 tmq=Tumleo
+xtq=Tumshuqese
 tbr=Tumtum
+sil=Tumulung Sisaala
 mzb=Tumzabt
-tnd=Tunebo, Angosturas
-tbn=Tunebo, Barro Negro
-tuf=Tunebo, Central
-tnb=Tunebo, Western
+enh=Tundra Enets
 baz=Tunen
 lcm=Tungag
 trt=Tunggare
 tug=Tunia
 tun=Tunica
+aeb=Tunisian Arabic
 tse=Tunisian Sign Language
 tjg=Tunjung
 tqq=Tunni
+dza=Tunzu
 ttf=Tuotomb
-tpr=Tupar\u00ed
-tpw=Tup\u00ed
-tpn=Tupinamb\u00e1
+tpr=Tupar\u221a\u2260
+tpn=Tupinamb\u221a\u00b0
 tpk=Tupinikin
 tui=Tupuri
+tpw=Tup\u221a\u2260
 trh=Turaka
 trd=Turi
-twt=Turiw\u00e1ra
+twt=Turiw\u221a\u00b0ra
 tuz=Turka
 tuv=Turkana
+klj=Turkic Khalaj
 tr=Turkish
 tur=Turkish
-otk=Turkish, Old
-ota=Turkish, Ottoman (1500-1928)
 tsm=Turkish Sign Language
 tk=Turkmen
 tuk=Turkmen
@@ -7041,46 +7064,45 @@
 tqm=Turumsa
 try=Turung
 tus=Tuscarora
-ttm=Tutchone, Northern
-tce=Tutchone, Southern
 tta=Tutelo
-ttx=Tutong 1
-ttg=Tutong 2
+ttg=Tutong
+tvt=Tutsa Naga
 tmi=Tutuba
+mtu=Tututepec Mixtec
 tuu=Tututni
 tvl=Tuvalu
 tyv=Tuvinian
+ifk=Tuwali Ifugao
 tww=Tuwari
 bov=Tuwuli
-tud=Tux\u00e1
-tux=Tuxin\u00e1wa
+tux=Tuxin\u221a\u00b0wa
+tud=Tux\u221a\u00b0
 tue=Tuyuca
 twa=Twana
 twn=Twendi
 twd=Twents
+tw=Twi
 twi=Twi
-tw=Twi
 kcg=Tyap
 woa=Tyaraity
-tzb=Tzeltal, Bachaj\u00f3n
-tzh=Tzeltal, Oxchuc
-tzc=Tzotzil, Chamula
-tze=Tzotzil, Chenalh\u00f3
-tzu=Tzotzil, Huixt\u00e1n
-tzs=Tzotzil, San Andr\u00e9s Larrainzar
-tzo=Tzotzil, Venustiano Carranza
-tzz=Tzotzil, Zinacant\u00e1n
-tzj=Tzutujil, Eastern
-tzt=Tzutujil, Western
+tzj=Tz'utujil
+tzh=Tzeltal
+tzo=Tzotzil
+tyz=T\u221a\u2020y
+tys=T\u221a\u2020y Sa Pa
+tyt=T\u221a\u2020y Tac
+lor=T\u221a\u00a9\u221a\u00a9n
+tub=T\u221a\u00babatulabal
 uuu=U
 aoz=Uab Meto
-uam=Uamu\u00e9
+uam=Uamu\u221a\u00a9
 ksj=Uare
 byc=Ubaghara
 uba=Ubang
 ubi=Ubi
 ubr=Ubir
 uby=Ubykh
+cpb=Ucayali-Yur\u221a\u222ba Ash\u221a\u00a9ninka
 uda=Uda
 udi=Udi
 ude=Udihe
@@ -7094,7 +7116,6 @@
 uha=Uhami
 ug=Uighur
 uig=Uighur
-oui=Uighur, Old
 uis=Uisai
 udj=Ujir
 kcf=Ukaan
@@ -7102,8 +7123,8 @@
 umi=Ukit
 ukp=Ukpe-Bayobiri
 akd=Ukpet-Ehom
+uk=Ukrainian
 ukr=Ukrainian
-uk=Ukrainian
 ukl=Ukrainian Sign Language
 uku=Ukue
 ukg=Ukuriguma
@@ -7116,38 +7137,56 @@
 ulb=Ulukwumi
 ulm=Ulumanda'
 ppk=Uma
+xky=Uma' Lasan
+ulu=Uma' Lung
 gdn=Umanakaina
 uma=Umatilla
 umd=Umbindhamu
 xum=Umbrian
+ubu=Umbu-Ungu
 umr=Umbugarla
 umb=Umbundu
-ubu=Umbu-Ungu
 umg=Umbuygamu
+sju=Ume Sami
 upi=Umeda
+due=Umiray Dumaget Agta
 umm=Umon
-umo=Umot\u00edna
+umo=Umot\u221a\u2260na
 ump=Umpila
-xup=Umpqua, Upper
 mtg=Una
 unm=Unami
+mis=Uncoded languages
+unz=Unde Kaili
 und=Undetermined
 bbn=Uneapa
 une=Uneme
 uln=Unserdeutsch
 onu=Unua
 uok=Uokha
+cjh=Upper Chehalis
+dna=Upper Grand Valley Dani
+pov=Upper Guinea Crioulo
+dmg=Upper Kinabatangan
+kuu=Upper Kuskokwim
+tku=Upper Necaxa Totonac
+sxu=Upper Saxon
+hsb=Upper Sorbian
+tth=Upper Ta'oih
+tau=Upper Tanana
+kgh=Upper Tanudan Kalinga
+tov=Upper Taromi
+xup=Upper Umpqua
+uro=Ura (Papua New Guinea)
+uur=Ura (Vanuatu)
 urf=Uradhi
 urk=Urak Lawoi'
 url=Urali
-uro=Ura (Papua New Guinea)
 urm=Urapmin
 ura=Urarina
 xur=Urartian
 urt=Urat
-uur=Ura (Vanuatu)
+ur=Urdu
 urd=Urdu
-ur=Urdu
 urh=Urhobo
 uvh=Uri
 urg=Urigina
@@ -7156,19 +7195,20 @@
 upv=Uripiv-Wala-Rano-Atchin
 urc=Urningangg
 ure=Uru
+urz=Uru-Eu-Wau-Wau
+urp=Uru-Pa-In
 urn=Uruangnirin
 urv=Uruava
-urb=Urub\u00fa-Kaapor
-uks=Urub\u00fa-Kaapor Sign Language
-urz=Uru-Eu-Wau-Wau
+urb=Urub\u221a\u222b-Kaapor
+uks=Urub\u221a\u222b-Kaapor Sign Language
 ugy=Uruguayan Sign Language
 uum=Urum
 uru=Urumi
-urp=Uru-Pa-In
 usk=Usaghade
 wnu=Usan
 usa=Usarufa
 ush=Ushojo
+cuc=Usila Chinantec
 ulf=Usku
 usp=Uspanteco
 usi=Usui
@@ -7176,12 +7216,10 @@
 ute=Ute-Southern Paiute
 utu=Utu
 evh=Uvbie
-uve=Uvean, West
 usu=Uya
+uz=Uzbek
 uzb=Uzbek
-uz=Uzbek
-uzn=Uzbek, Northern
-uzs=Uzbek, Southern
+auz=Uzbeki Arabic
 eze=Uzekwe
 vaa=Vaagri Booli
 vaf=Vafsi
@@ -7192,6 +7230,9 @@
 vai=Vai
 vap=Vaiphei
 vae=Vale
+vsv=Valencian Sign Language
+cvn=Valle Nacional Chinantec
+vmv=Valley Maidu
 van=Valman
 vlp=Valpei
 mkt=Vamale
@@ -7207,35 +7248,39 @@
 vav=Varli
 vas=Vasavi
 vaj=Vasekela Bushman
-vlr=Vatrata
 ved=Veddah
 val=Vehes
 vel=Veluws
 vem=Vemgo-Mabas
+ve=Venda
 ven=Venda
-ve=Venda
 vec=Venetian
 xve=Venetic
 vsl=Venezuelan Sign Language
 bav=Vengo
-veo=Venture\u00f1o
+veo=Venture\u221a\u00b1o
 vep=Veps
+vra=Vera'a
 xvs=Vestinian
 vid=Vidunda
 vig=Viemo
+vi=Vietnamese
 vie=Vietnamese
-vi=Vietnamese
 vil=Vilela
 vif=Vili
+dyg=Villa Viciosa Agta
 svc=Vincentian Creole English
 vnm=Vinmavis
 vin=Vinza
 vic=Virgin Islands Creole English
 vis=Vishavan
 vit=Viti
+vto=Vitou
 vls=Vlaams
-vol=Volap\u00fck
-vo=Volap\u00fck
+vgt=Vlaamse Gebarentaal
+rmy=Vlax Romani
+vo=Volap\u221a\u00bak
+vol=Volap\u221a\u00bak
 xvo=Volscian
 kch=Vono
 vor=Voro
@@ -7243,18 +7288,24 @@
 vum=Vumbu
 vnp=Vunapu
 vun=Vunjo
+msn=Vur\u221a\u00b4s
 vut=Vute
+wbi=Vwanji
+vro=V\u221a\u00b5ro
 wbm=Wa
+wag=Wa'ema
 wwa=Waama
 wmn=Waamwang
+ssn=Waata
 wab=Wab
 wbb=Wabo
 kmx=Waboda
+wci=Waci Gbe
 wdg=Wadaginam
 wbq=Waddar
+kxp=Wadiyara Koli
 wdj=Wadjiginy
 wdu=Wadjigu
-wag=Wa'ema
 wrx=Wae Rana
 waj=Waffa
 wgw=Wagawaga
@@ -7262,8 +7313,9 @@
 wbr=Wagdi
 waq=Wageman
 fad=Wagi
+whu=Wahau Kayan
+whk=Wahau Kenyah
 wgi=Wahgi
-whg=Wahgi, North
 wbk=Waigali
 wgo=Waigeo
 wlk=Wailaki
@@ -7271,6 +7323,7 @@
 rro=Waima
 wmh=Waima'a
 bao=Waimaha
+atr=Waimiri-Atroari
 wli=Waioli
 waw=Waiwai
 wja=Waja
@@ -7279,19 +7332,19 @@
 wkw=Wakawaka
 wkd=Wakde
 wbl=Wakhi
-waf=Wakon\u00e1
+waf=Wakon\u221a\u00b0
 lgl=Wala
 wlw=Walak
-wal=Walamo
 wlx=Wali (Ghana)
+wll=Wali (Sudan)
 wly=Waling
 wla=Walio
-wll=Wali (Sudan)
 waa=Walla Walla
 wls=Wallisian
 wa=Walloon
 wln=Walloon
 wmt=Walmajarri
+dwl=Walo Kumbe Dogon
 wae=Walser
 ola=Walungge
 wmc=Wamas
@@ -7306,38 +7359,37 @@
 wan=Wan
 wnb=Wanambre
 wnp=Wanap
+nnp=Wancho Naga
 wbh=Wanda
 mfi=Wandala
 wad=Wandamen
 wnd=Wandarang
 wdd=Wandji
-hwa=Wan\u00e9
 wne=Waneci
+lwg=Wanga
 wyb=Wangaaybuwan-Ngiyambaa
 wnm=Wanggamala
 wgg=Wangganguru
 wng=Wanggom
-wbi=Wanji
 wbt=Wanman
 jub=Wannu
 wno=Wano
 wnc=Wantoat
 wnk=Wanukaka
+hwa=Wan\u221a\u00a9
 auc=Waorani
 juk=Wapan
-juw=W\u00e3pha
 wap=Wapishana
 wao=Wappo
-aml=War
+aml=War-Jaintia
 wbf=Wara
-tci=W\u00e1ra
 wba=Warao
 wra=Warapu
 wrz=Waray (Australia)
 war=Waray (Philippines)
+srv=Waray Sorsogon
 wrr=Wardaman
 wrd=Warduji
-wre=Ware
 wsa=Warembori
 wai=Wares
 wrs=Waris
@@ -7365,17 +7417,15 @@
 wtk=Watakataui
 wax=Watam
 wah=Watubela
-mpl=Watut, Middle
-una=Watut, North
-mcy=Watut, South
-wau=Waur\u00e1
+wau=Waur\u221a\u00b0
 wuy=Wauyai
 www=Wawa
 wow=Wawonii
 wxa=Waxianghua
 oym=Wayampi
 way=Wayana
-wyr=Wayor\u00f3
+ctt=Wayanad Chetti
+wyr=Wayor\u221a\u2265
 vay=Wayu
 guc=Wayuu
 wed=Wedau
@@ -7383,44 +7433,101 @@
 wew=Wejewa
 weu=Welaung
 klh=Weliki
+cy=Welsh
 cym=Welsh
-cy=Welsh
-wlm=Welsh, Middle
-owl=Welsh, Old
-weo=Wemale, North
-tlw=Wemale, South
-wob=W\u00e8 Northern
+rmw=Welsh Romani
+wem=Weme Gbe
 wei=Were
 wer=Weri
 kvw=Wersing
-gxx=W\u00e8 Southern
+nnd=West Ambae
+zbw=West Berawan
+bbp=West Central Banda
+gaz=West Central Oromo
+bdr=West Coast Bajau
+drn=West Damar
+kew=West Kewa
+lmj=West Lembata
+mqs=West Makian
+mss=West Masela
+txn=West Tarangan
+uve=West Uvean
+ybe=West Yugur
+lia=West-Central Limba
+abe=Western Abnaki
+apw=Western Apache
+are=Western Arrarnta
+bgn=Western Balochi
+gnw=Western Bolivian Guaran\u221a\u2260
+brv=Western Bru
+mbb=Western Bukidnon Manobo
+ikt=Western Canadian Inuktitut
+cja=Western Cham
+dnw=Western Dani
+pes=Western Farsi
+wyy=Western Fijian
+fry=Western Frisian
+fy=Western Frisian
+gvr=Western Gurung
+ctp=Western Highland Chatino
+pua=Western Highland Purepecha
+nhw=Western Huasteca Nahuatl
+jmx=Western Juxtlahuaca Mixtec
+knj=Western Kanjobal
+kza=Western Karaboro
+kuf=Western Katu
+kyu=Western Kayah
+kjq=Western Keres
+krw=Western Krahn
+ywl=Western Lalu
+lcp=Western Lawa
+mrd=Western Magar
+mlq=Western Maninkakan
+mrj=Western Mari
+hmw=Western Mashan Hmong
+raf=Western Meohang
+mut=Western Muria
 amw=Western Neo-Aramaic
+fuh=Western Niger Fulfulde
+ojw=Western Ojibwa
+pnb=Western Panjabi
+kjl=Western Parbate Kham
+pne=Western Penan
+ssl=Western Sisaala
+suc=Western Subanon
+tdg=Western Tamang
+twb=Western Tawbuid
+tqt=Western Totonac
+tnb=Western Tunebo
+mmr=Western Xiangxi Miao
+xwl=Western Xwla Gbe
+yih=Western Yiddish
 wep=Westphalien
 wwo=Wetamut
 wea=Wewaw
-wec=W\u00e8 Western
 woy=Weyto
+giw=White Gelao
+lwh=White Lachi
 tnp=Whitesands
-wii=Wiaki
 tua=Wiarumus
-mzh=Wich\u00ed Lhamt\u00e9s G\u00fcisnay
-mtp=Wich\u00ed Lhamt\u00e9s Nocten
-wlv=Wich\u00ed Lhamt\u00e9s Vejoz
 wic=Wichita
-wik=Wikalkan
+mzh=Wich\u221a\u2260 Lhamt\u221a\u00a9s G\u221a\u00baisnay
+mtp=Wich\u221a\u2260 Lhamt\u221a\u00a9s Nocten
+wlv=Wich\u221a\u2260 Lhamt\u221a\u00a9s Vejoz
 wie=Wik-Epa
 wij=Wik-Iiyanh
 wif=Wik-Keyangan
 wih=Wik-Me'anha
 wim=Wik-Mungkan
 wig=Wik-Ngathana
+wik=Wikalkan
 wua=Wikngenchera
 wil=Wilawila
 wit=Wintu
-kst=Winy\u00e9
+kst=Winy\u221a\u00a9
 gdr=Wipi
 wrh=Wiradhuri
-wir=Wiraf\u00e9d
+wir=Wiraf\u221a\u00a9d
 wiw=Wirangu
 wiu=Wiru
 wiy=Wiyot
@@ -7429,15 +7536,18 @@
 woc=Wogeo
 wbw=Woi
 jod=Wojenaka
+wle=Wolane
 wod=Wolani
+wal=Wolaytta
 woe=Woleaian
 wlo=Wolio
+wo=Wolof
 wol=Wolof
-wo=Wolof
-wof=Wolof, Gambian
 wom=Wom (Nigeria)
 wmo=Wom (Papua New Guinea)
+wmx=Womo
 won=Wongo
+cwd=Woods Cree
 wor=Woria
 kda=Worimi
 jud=Worodougou
@@ -7445,13 +7555,19 @@
 wsv=Wotapuri-Katarqalai
 wtw=Wotu
 noa=Woun Meu
+xwo=Written Oirat
+wuu=Wu Chinese
+ywq=Wuding-Luquan Yi
 wud=Wudu
 wlu=Wuliwuli
 wux=Wulna
 bqm=Wumboko
 wum=Wumbvu
+ywu=Wumeng Nasu
+bwn=Wunai Bunu
 wub=Wunambal
 wur=Wurrugu
+yig=Wusa Nasu
 bse=Wushi
 wsi=Wusi
 wut=Wutung
@@ -7459,31 +7575,41 @@
 wuv=Wuvulu-Aua
 udl=Wuzlam
 wya=Wyandot
+wym=Wymysorys
+tci=W\u221a\u00b0ra
+juw=W\u221a\u00a3pha
+wob=W\u221a\u00ae Northern
+gxx=W\u221a\u00ae Southern
+wec=W\u221a\u00ae Western
 kao=Xaasongaxango
-xkr=Xakriab\u00e1
-xam=/Xam
+zax=Xadani Zapotec
+xkr=Xakriab\u221a\u00b0
 xan=Xamtanga
-ane=X\u00e2r\u00e2c\u00f9\u00f9
+ztg=Xanagu\u221a\u2260a Zapotec
 axx=Xaragure
-xav=Xav\u00e1nte
-xeg=//Xegwi
-xer=Xer\u00e9nte
-xet=Xet\u00e1
+xav=Xav\u221a\u00b0nte
+xer=Xer\u221a\u00a9nte
+xet=Xet\u221a\u00b0
+xh=Xhosa
 xho=Xhosa
-xh=Xhosa
 xia=Xiandao
+hsn=Xiang Chinese
 sjo=Xibe
+too=Xicotepec De Ju\u221a\u00b0rez Totonac
 xin=Xinca
+asn=Xing\u221a\u222b Asurin\u221a\u2260
 xiy=Xipaya
-xip=Xipin\u00e1wa
+xip=Xipin\u221a\u00b0wa
 xii=Xiri
-xir=Xiri\u00e2na
+xir=Xiri\u221a\u00a2na
+ywt=Xishanba Lalo
 xok=Xokleng
-nmn=!X\u00f3\u00f5
-xoo=Xukur\u00fa
+xoo=Xukur\u221a\u222b
+xwe=Xwela Gbe
+ane=X\u221a\u00a2r\u221a\u00a2c\u221a\u03c0\u221a\u03c0
 muu=Yaaku
-ybn=Yaba\u00e2na
 yar=Yabarana
+ybn=Yaba\u221a\u00a2na
 jae=Yabem
 ybm=Yaben
 ybo=Yabong
@@ -7502,7 +7628,6 @@
 iyx=Yaka (Congo)
 yaf=Yaka (Democratic Republic of Congo)
 ykk=Yakaikeke
-ykm=Yakamul
 yka=Yakan
 ybh=Yakha
 yak=Yakima
@@ -7510,14 +7635,11 @@
 sah=Yakut
 yba=Yala
 jal=Yalahatan
+xyl=Yalakalore
 ylr=Yalarnnga
 nce=Yale
-kkl=Yale, Kosarek
-yli=Yali, Angguruk
-nlk=Yali, Ninia
-yac=Yali, Pass Valley
 yal=Yalunka
-yag=Y\u00e1mana
+zpu=Yal\u221a\u00b0lag Zapotec
 ymp=Yamap
 yam=Yamba
 ymb=Yambes
@@ -7530,9 +7652,13 @@
 ymg=Yamongeri
 yma=Yamphe
 ybi=Yamphu
+jay=Yan-nhangu
 ynn=Yana
+qur=Yanahuanca Pasco Quechua
+dym=Yanda Dom Dogon
 ynd=Yandruwandha
 ame=Yanesha'
+zyg=Yang Zhuang
 yav=Yangben
 ybd=Yangbye
 ynh=Yangho
@@ -7540,37 +7666,47 @@
 jng=Yangman
 yng=Yango
 ynl=Yangulam
+yde=Yangum Dey
+ygl=Yangum Gel
+ymo=Yangum Mon
 kdd=Yankunytjatjara
-wca=Yanom\u00e1mi
-guu=Yanomam\u00f6
+guu=Yanomam\u221a\u2202
+wca=Yanom\u221a\u00b0mi
 yns=Yansi
 jao=Yanyuwa
 yao=Yao
-yre=Yaour\u00e9
+asy=Yaosakor Asmat
+yre=Yaour\u221a\u00a9
 yap=Yapese
 yev=Yapunda
 jaq=Yaqay
 yaq=Yaqui
 yrw=Yarawata
 yrb=Yareba
-yri=Yar\u00ed
+zae=Yareni Zapotec
 yrs=Yarsun
+yri=Yar\u221a\u2260
 yko=Yasa
 ysc=Yassic
+zty=Yatee Zapotec
+zav=Yatzachi Zapotec
+yuw=Yau (Morobe Province)
+yyu=Yau (Sandaun Province)
 yla=Yaul
 yax=Yauma
-yuw=Yau (Morobe Province)
 jau=Yaur
-yyu=Yau (Sandaun Province)
+zpb=Yautepec Zapotec
+qux=Yauyos Quechua
 yvt=Yavitero
 yva=Yawa
-yaw=Yawalapit\u00ed
+yaw=Yawalapit\u221a\u2260
 ywn=Yawanawa
 yww=Yawarawarga
 yby=Yaweyuha
 ybx=Yawiyo
 ywr=Yawuru
 yah=Yazgulyam
+tlc=Yecuatla Totonac
 jei=Yei
 ets=Yekhee
 ykr=Yekora
@@ -7592,190 +7728,112 @@
 yet=Yetfa
 yej=Yevanic
 yey=Yeyi
-yif=Yi, Ache
-yiu=Yi, Awu
-yix=Yi, Axi
-yiz=Yi, Azhe
-ycl=Yi, Central
-yio=Yi, Dayao
+yi=Yiddish
 yid=Yiddish
-yi=Yiddish
-ydd=Yiddish, Eastern
 yds=Yiddish Sign Language
-yih=Yiddish, Western
 ydg=Yidgha
 yii=Yidiny
-yit=Yi, Eastern Lalu
-yiv=Yi, Eshan-Xinping
-yig=Yi, Guizhou
 yll=Yil
-ylm=Yi, Limi
 yee=Yimas
-ymh=Yi, Mili
-yiq=Yi, Miqie
-ymj=Yi, Muji
-ylo=Yi, Naluo
+yim=Yimchungru Naga
+kvu=Yinbaw Karen
 yin=Yinchia
 yij=Yindjibarndi
 yil=Yindjilandji
 pib=Yine
 yia=Yinggarda
-yib=Yinglish
-yip=Yi, Poluo
-ypl=Yi, Pula
-ypw=Yi, Puwa
+kvy=Yintale Karen
 yiy=Yir Yoront
 yis=Yis
-ysn=Yi, Sani
-iii=Yi, Sichuan
-ii=Yi, Sichuan
-yso=Yi, Southeastern Lolo
-nos=Yi, Southern
-ysp=Yi, Southern Lolopho
-ywt=Yi, Western
-ywl=Yi, Western Lalu
 gek=Yiwom
-ywq=Yi, Wuding-Luquan
-ywm=Yi, Wumeng
-ywu=Yi, Wusa
-yik=Yi, Xishan Lalu
-yym=Yi, Yuanjiang-Mojiang
 yob=Yoba
+gud=Yocobou\u221a\u00a9 Dida
 yog=Yogad
 ydk=Yoidik
 yki=Yoke
 yok=Yokuts
+yol=Yola
+xty=Yoloxochitl Mixtec
 pil=Yom
 yom=Yombe
 yoi=Yonaguni
 yno=Yong
+zyb=Yongbei Zhuang
 yon=Yonggom
+zyn=Yongnan Zhuang
 yut=Yopno
 mts=Yora
 yox=Yoron
+yo=Yoruba
 yor=Yoruba
-yo=Yoruba
 yos=Yos
+mpm=Yosond\u221a\u222ba Mixtec
+zyj=Youjiang Zhuang
+jiu=Youle Jinuo
+buh=Younuo Bunu
 yoy=Yoy
 nua=Yuaga
 msd=Yucatec Maya Sign Language
+yua=Yucateco
 yuc=Yuchi
+mvg=Yucua\u221a\u00b1e Mixtec
 ycn=Yucuna
+yue=Yue Chinese
 yug=Yug
 yub=Yugambal
 yuu=Yugh
 ysl=Yugoslavian Sign Language
-yuy=Yugur, East
-ybe=Yugur, West
 yab=Yuhup
-ykg=Yukaghir, Northern
-yux=Yukaghir, Southern
 yuk=Yuki
 yup=Yukpa
 ybl=Yukuben
 yul=Yulu
-esu=Yupik, Central
-ess=Yupik, Central Siberian
-ynk=Yupik, Naukan
-ems=Yupik, Pacific Gulf
-ysr=Yupik, Sirenik
 yuq=Yuqui
 yuz=Yuracare
 yur=Yurok
-yui=Yurut\u00ed
+yui=Yurut\u221a\u2260
+mab=Yutanduchi Mixtec
 yau=Yuwana
+yag=Y\u221a\u00b0mana
+ztx=Zaachila Zapotec
 kji=Zabana
+ctz=Zacatepec Chatino
+nhi=Zacatl\u221a\u00b0n-Ahuacatl\u221a\u00b0n-Tepetzintla Nahuatl
 zag=Zaghawa
 atb=Zaiwa
 zkr=Zakhring
 zsl=Zambian Sign Language
+zna=Zan Gula
 zak=Zanaki
-zne=Zande (specific)
+zne=Zande (individual language)
 zau=Zangskari
-zna=Zan Gula
 zah=Zangwal
-zro=Z\u00e1paro
+zpw=Zaniza Zapotec
 zap=Zapotec
-zaq=Zapotec, Alo\u00e1pam
-zpo=Zapotec, Amatl\u00e1n
-zoo=Zapotec, Asunci\u00f3n Mixtepec
-zaf=Zapotec, Ayoquesco
-zad=Zapotec, Cajonos
-zpv=Zapotec, Chichicapan
-zpc=Zapotec, Choapan
-zca=Zapotec, Coatecas Altas
-zps=Zapotec, Coatl\u00e1n
-zpp=Zapotec, El Alto
-zte=Zapotec, Elotepec
-zpg=Zapotec, Guevea De Humboldt
-ztu=Zapotec, G\u00fcil\u00e1
-zai=Zapotec, Isthmus
-zpa=Zapotec, Lachiguiri
-ztc=Zapotec, Lachirioag
-zpl=Zapotec, Lachix\u00edo
-ztp=Zapotec, Loxicha
-zpy=Zapotec, Mazaltepec
-zam=Zapotec, Miahuatl\u00e1n
-zaw=Zapotec, Mitla
-zpm=Zapotec, Mixtepec
-zac=Zapotec, Ocotl\u00e1n
-zao=Zapotec, Ozolotepec
-zpe=Zapotec, Petapa
-zpj=Zapotec, Quiavicuzas
-ztq=Zapotec, Quioquitani-Quier\u00ed
-zar=Zapotec, Rinc\u00f3n
-ztm=Zapotec, San Agust\u00edn Mixtepec
-zpx=Zapotec, San Baltazar Loxicha
-zab=Zapotec, San Juan Guelav\u00eda
-zpf=Zapotec, San Pedro Quiatoni
-ztn=Zapotec, Santa Catarina Albarradas
-zpn=Zapotec, Santa In\u00e9s Yatzechi
-zpi=Zapotec, Santa Mar\u00eda Quiegolani
-ztl=Zapotec, Santiago Lapagu\u00eda
-zpr=Zapotec, Santiago Xanica
-zas=Zapotec, Santo Domingo Albarradas
-zpt=Zapotec, San Vicente Coatl\u00e1n
-zaa=Zapotec, Sierra de Ju\u00e1rez
-zpd=Zapotec, Southeastern Ixtl\u00e1n
-zsr=Zapotec, Southern Rincon
-zat=Zapotec, Tabaa
-ztt=Zapotec, Tejalapan
-zpz=Zapotec, Texmelucan
-zts=Zapotec, Tilquiapan
-zpk=Zapotec, Tlacolulita
-zph=Zapotec, Totomachapan
-zax=Zapotec, Xadani
-ztg=Zapotec, Xanagu\u00eda
-zpu=Zapotec, Yal\u00e1lag
-zae=Zapotec, Yareni
-zty=Zapotec, Yatee
-zav=Zapotec, Yatzachi
-zpb=Zapotec, Yautepec
-ztx=Zapotec, Zaachila
-zpw=Zapotec, Zaniza
-zpq=Zapotec, Zoogocho
 zaj=Zaramo
 zaz=Zari
 dje=Zarma
 zrp=Zarphatic
 zal=Zauzou
 zwa=Zay
+kxk=Zayein Karen
 zay=Zayse-Zergulla
+zza=Zaza
 jaj=Zazao
 zua=Zeem
 zea=Zeeuws
 dhm=Zemba
+nzm=Zeme Naga
 xzm=Zemgalian
 zeg=Zenag
 zen=Zenaga
+czn=Zenzontepec Chatino
 zhb=Zhaba
 xzh=Zhang-Zhung
 zhi=Zhire
 zhw=Zhoa
 za=Zhuang
 zha=Zhuang
-ccx=Zhuang, Northern
-ccy=Zhuang, Southern
 zia=Zia
 ziw=Zigula
 zik=Zimakani
@@ -7786,17 +7844,22 @@
 zrn=Zirenkel
 zir=Ziriya
 ziz=Zizilivakan
-pto=Zo'\u00e9
-zom=Zome
-zoh=Zoque, Chimalapa
-zoc=Zoque, Copainal\u00e1
-zos=Zoque, Francisco Le\u00f3n
-zor=Zoque, Ray\u00f3n
-zoq=Zoque, Tabasco
+pto=Zo'\u221a\u00a9
+yzk=Zokhuo
+zpq=Zoogocho Zapotec
+gbz=Zoroastrian Dari
+czt=Zotung Chin
+zom=Zou
 gnd=Zulgo-Gemzek
+zu=Zulu
 zul=Zulu
-zu=Zulu
 zuy=Zumaya
 jmb=Zumbun
 zun=Zuni
+zzj=Zuojiang Zhuang
 zyp=Zyphe
+zro=Z\u221a\u00b0paro
+ahn=\u221a\u00c4h\u221a\u2020n
+acb=\u221a\u00c5nc\u221a\u00b0
+aom=\u221a\u00f1mie
+oon=\u221a\u00f1nge

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -55,6 +55,10 @@
  * setting of Language defaults. If the requested language font does not exist a
  * more general one will be provided.
  * </p>
+ * <p>
+ * Note: Some languages are represented as transliterations
+ * and others have more than one script, which may or may not be supported by a single font.
+ * </p>
  * 
  * @see gnu.lgpl.License for license details.<br>
  *      The copyright to this program is held by it's authors.

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -260,10 +260,11 @@
     String getDriverName();
 
     /**
-     * Return the orientation of the language of the Book. If a book contains more than one language,
-     * it refers to the dominate language of the book. This will be used to present
+     * Return the orientation of the script of the Book. If a book contains more than one script,
+     * it refers to the dominate script of the book. This will be used to present
      * Arabic and Hebrew in their proper orientation.
-     * @return true if the orientation for the dominate language is LeftToRight.
+     * Note: some languages have multiple scripts which don't have the same directionality.
+     * @return true if the orientation for the dominate script is LeftToRight.
      */
     boolean isLeftToRight();
 

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -158,10 +158,11 @@
     String getDriverName();
 
     /**
-     * Return the orientation of the language of the Book. If a book contains more than one language,
-     * it refers to the dominate language of the book. This will be used to present
+     * Return the orientation of the script of the Book. If a book contains more than one script,
+     * it refers to the dominate script of the book. This will be used to present
      * Arabic and Hebrew in their proper orientation.
-     * @return true if the orientation for the dominate language is LeftToRight.
+     * Note: some languages have multiple scripts which don't have the same directionality.
+     * @return true if the orientation for the dominate script is LeftToRight.
      */
     boolean isLeftToRight();
 

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -62,7 +62,7 @@
 
     /**
      * Build an immutable Strong's Number.
-     * If the language is not 'G' or 'H' or the number is invalid, a BookException.
+     * If the language is not 'G' or 'H' or the number is invalid, throw a BookException.
      * @param language
      * @param strongsNumber
      * @throws BookException
@@ -74,7 +74,7 @@
 
     /**
      * Build an immutable Strong's Number.
-     * If the language is not 'G' or 'H' or the number is invalid, a BookException.
+     * If the language is not 'G' or 'H' or the number is invalid, throw a BookException.
      * @param language
      * @param strongsNumber
      * @throws BookException

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -586,10 +586,6 @@
 
     private void adjustLanguage()
     {
-        // Java thinks it is LtoR but it is stated to be something else
-        String dir = (String) getValue(ConfigEntryType.DIRECTION);
-        String newDir = dir == null ? (String) ConfigEntryType.DIRECTION.getDefault() : dir;
-
         Language lang = (Language) getValue(ConfigEntryType.LANG);
         if (lang == null)
         {
@@ -640,55 +636,7 @@
                 lang = langFrom;
                 add(ConfigEntryType.LANG, lang.toString());
             }
-
-            if (langFrom.isLeftToRight() != langTo.isLeftToRight())
-            {
-                newDir = ConfigEntryType.DIRECTION_BIDI;
-            }
-            else if (langFrom.isLeftToRight())
-            {
-                newDir = ConfigEntryType.DIRECTION_LTOR;
-            }
-            else
-            {
-                newDir = ConfigEntryType.DIRECTION_RTOL;
-            }
         }
-        else
-        {
-            if (lang.isLeftToRight())
-            {
-                newDir = ConfigEntryType.DIRECTION_LTOR;
-            }
-            else
-            {
-                newDir = ConfigEntryType.DIRECTION_RTOL;
-            }
-        }
-
-        if (newDir.equals(ConfigEntryType.DIRECTION_LTOR))
-        {
-            if (dir != null)
-            {
-                if (!newDir.equals(dir))
-                {
-                    log.warn("Fixing data for " + internal + ". Changing " + ConfigEntryType.DIRECTION.getName() + "=" + dir + " to " + newDir); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                }
-                table.remove(ConfigEntryType.DIRECTION);
-            }
-        }
-        else if (!newDir.equals(dir))
-        {
-            if (dir == null)
-            {
-                log.warn("Fixing data for " + internal + ". Adding " + ConfigEntryType.DIRECTION.getName() + "=" + newDir); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            }
-            else
-            {
-                log.warn("Fixing data for " + internal + ". Changing " + ConfigEntryType.DIRECTION.getName() + "=" + dir + " to " + newDir); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-            }
-            add(ConfigEntryType.DIRECTION, newDir);
-        }
     }
 
     private void adjustBookType()

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java	2008-11-27 22:02:34 UTC (rev 1927)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java	2009-02-22 17:57:49 UTC (rev 1928)
@@ -261,14 +261,21 @@
     }
 
     /* (non-Javadoc)
-     * @see org.crosswire.jsword.book.BookMetaData#lsLeftToRight()
+     * @see org.crosswire.jsword.book.BookMetaData#isLeftToRight()
      */
     public boolean isLeftToRight()
     {
-        // Return the dominate direction based upon the Book's Language not Direction
-        // because Direction can be BiDi.
-        Language lang = (Language) getProperty(ConfigEntryType.LANG);
-        return lang.isLeftToRight();
+        // This should return the dominate direction of the text, if it is BiDi,
+        // then we have to guess.
+        String dir = (String) getProperty(ConfigEntryType.DIRECTION);
+        if (ConfigEntryType.DIRECTION_BIDI.equals(dir))
+        {
+            // When BiDi, return the dominate direction based upon the Book's Language not Direction
+            Language lang = (Language) getProperty(ConfigEntryType.LANG);
+            return lang.isLeftToRight();
+        }
+
+        return ConfigEntryType.DIRECTION_LTOR.equals(dir);
     }
 
     /* (non-Javadoc)

More information about the jsword-svn mailing list