Imported Upstream version 3.31
[platform/upstream/iso-codes.git] / iso_3166_2 / iso_3166_2.xml
index 6ac6d01..50e2cb1 100644 (file)
@@ -186,6 +186,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_subset type="Dependency">
        <iso_3166_2_entry
                code="AG-10"    name="Barbuda" />
+       <iso_3166_2_entry
+               code="AG-11"    name="Redonda" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Albania -->
@@ -361,9 +363,11 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Argentina -->
 <iso_3166_country code="AR">
-<iso_3166_subset type="Province">
+<iso_3166_subset type="City">
        <iso_3166_2_entry
-               code="AR-C"     name="Capital federal" />
+               code="AR-C"     name="Ciudad Autónoma de Buenos Aires" />
+</iso_3166_subset>
+<iso_3166_subset type="Province">
        <iso_3166_2_entry
                code="AR-B"     name="Buenos Aires" />
        <iso_3166_2_entry
@@ -460,7 +464,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="AZ">
 <iso_3166_subset type="Autonomous republic">
        <iso_3166_2_entry
-               code="AZ NX"    name="Naxçıvan" />
+               code="AZ-NX"    name="Naxçıvan" />
 </iso_3166_subset>
 <iso_3166_subset type="City">
        <iso_3166_2_entry
@@ -623,10 +627,36 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="BA">
 <iso_3166_subset type="Entity">
        <iso_3166_2_entry
-               code="BA-BIH"   name="Federacija Bosna i Hercegovina" />
+               code="BA-BIH"   name="Federacija Bosne i Hercegovine" />
        <iso_3166_2_entry
                code="BA-SRP"   name="Republika Srpska" />
 </iso_3166_subset>
+<iso_3166_subset type="Canton">
+       <iso_3166_2_entry
+               code="BA-05"    name="Bosansko-podrinjski kanton"       parent="BIH" />
+       <iso_3166_2_entry
+               code="BA-07"    name="Hercegovačko-neretvanski kanton"         parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-10"    name="Kanton br. 10 (Livanjski kanton)"         parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-09"    name="Kanton Sarajevo"          parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-02"    name="Posavski kanton"          parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-06"    name="Srednjobosanski kanton"   parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-03"    name="Tuzlanski kanton"         parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-01"    name="Unsko-sanski kanton"      parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-08"    name="Zapadnohercegovački kanton"      parent="BIH"/>
+       <iso_3166_2_entry
+               code="BA-04"    name="Zeničko-dobojski kanton"         parent="BIH"/>
+</iso_3166_subset>
+<iso_3166_subset type="District">
+       <iso_3166_2_entry
+               code="BA-BRC"   name="Brčko distrikt" />
+</iso_3166_subset>
 </iso_3166_country>
        <!-- Barbados -->
 <iso_3166_country code="BB">
@@ -659,17 +689,17 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="BD">
 <iso_3166_subset type="Division">
        <iso_3166_2_entry
-               code="BD 1"     name="Barisal bibhag" />
+               code="BD-1"     name="Barisal bibhag" />
        <iso_3166_2_entry
-               code="BD 2"     name="Chittagong bibhag" />
+               code="BD-2"     name="Chittagong bibhag" />
        <iso_3166_2_entry
-               code="BD 3"     name="Dhaka bibhag" />
+               code="BD-3"     name="Dhaka bibhag" />
        <iso_3166_2_entry
-               code="BD 4"     name="Khulna bibhag" />
+               code="BD-4"     name="Khulna bibhag" />
        <iso_3166_2_entry
-               code="BD 5"     name="Rajshahi bibhag" />
+               code="BD-5"     name="Rajshahi bibhag" />
        <iso_3166_2_entry
-               code="BD 6"     name="Sylhet bibhag" />
+               code="BD-6"     name="Sylhet bibhag" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
        <iso_3166_2_entry
@@ -831,97 +861,125 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Burkina-Faso -->
 <iso_3166_country code="BF">
+<iso_3166_subset type="Region">
+       <iso_3166_2_entry
+               code="BF-01"    name="Boucle du Mouhoun" />
+       <iso_3166_2_entry
+               code="BF-02"    name="Cascades" />
+       <iso_3166_2_entry
+               code="BF-03"    name="Centre" />
+       <iso_3166_2_entry
+               code="BF-04"    name="Centre-Est" />
+       <iso_3166_2_entry
+               code="BF-05"    name="Centre-Nord" />
+       <iso_3166_2_entry
+               code="BF-06"    name="Centre-Ouest" />
+       <iso_3166_2_entry
+               code="BF-07"    name="Centre-Sud" />
+       <iso_3166_2_entry
+               code="BF-08"    name="Est" />
+       <iso_3166_2_entry
+               code="BF-09"    name="Hauts-Bassins" />
+       <iso_3166_2_entry
+               code="BF-10"    name="Nord" />
+       <iso_3166_2_entry
+               code="BF-11"    name="Plateau-Central" />
+       <iso_3166_2_entry
+               code="BF-12"    name="Sahel" />
+       <iso_3166_2_entry
+               code="BF-13"    name="Sud-Ouest" />
+</iso_3166_subset>
 <iso_3166_subset type="Province">
        <iso_3166_2_entry
-               code="BF-BAL"   name="Balé" />
+               code="BF-BAL"   name="Balé"    parent="01" />
        <iso_3166_2_entry
-               code="BF-BAM"   name="Bam" />
+               code="BF-BAM"   name="Bam"      parent="05" />
        <iso_3166_2_entry
-               code="BF-BAN"   name="Banwa" />
+               code="BF-BAN"   name="Banwa"    parent="01" />
        <iso_3166_2_entry
-               code="BF-BAZ"   name="Bazèga" />
+               code="BF-BAZ"   name="Bazèga"  parent="07" />
        <iso_3166_2_entry
-               code="BF-BGR"   name="Bougouriba" />
+               code="BF-BGR"   name="Bougouriba"       parent="13" />
        <iso_3166_2_entry
-               code="BF-BLG"   name="Boulgou" />
+               code="BF-BLG"   name="Boulgou"  parent="04" />
        <iso_3166_2_entry
-               code="BF-BLK"   name="Boulkiemdé" />
+               code="BF-BLK"   name="Boulkiemdé"      parent="06" />
        <iso_3166_2_entry
-               code="BF-COM"   name="Comoé" />
+               code="BF-COM"   name="Comoé"   parent="02" />
        <iso_3166_2_entry
-               code="BF-GAN"   name="Ganzourgou" />
+               code="BF-GAN"   name="Ganzourgou"       parent="11" />
        <iso_3166_2_entry
-               code="BF-GNA"   name="Gnagna" />
+               code="BF-GNA"   name="Gnagna"   parent="08" />
        <iso_3166_2_entry
-               code="BF-GOU"   name="Gourma" />
+               code="BF-GOU"   name="Gourma"   parent="08" />
        <iso_3166_2_entry
-               code="BF-HOU"   name="Houet" />
+               code="BF-HOU"   name="Houet"    parent="09" />
        <iso_3166_2_entry
-               code="BF-IOB"   name="Ioba" />
+               code="BF-IOB"   name="Ioba"     parent="13" />
        <iso_3166_2_entry
-               code="BF-KAD"   name="Kadiogo" />
+               code="BF-KAD"   name="Kadiogo"  parent="03" />
        <iso_3166_2_entry
-               code="BF-KEN"   name="Kénédougou" />
+               code="BF-KEN"   name="Kénédougou"     parent="09" />
        <iso_3166_2_entry
-               code="BF-KMD"   name="Komondjari" />
+               code="BF-KMD"   name="Komondjari"       parent="08" />
        <iso_3166_2_entry
-               code="BF-KMP"   name="Kompienga" />
+               code="BF-KMP"   name="Kompienga"        parent="08" />
        <iso_3166_2_entry
-               code="BF-KOS"   name="Kossi" />
+               code="BF-KOS"   name="Kossi"    parent="01" />
        <iso_3166_2_entry
-               code="BF-KOP"   name="Koulpélogo" />
+               code="BF-KOP"   name="Koulpélogo"      parent="04" />
        <iso_3166_2_entry
-               code="BF-KOT"   name="Kouritenga" />
+               code="BF-KOT"   name="Kouritenga"       parent="04" />
        <iso_3166_2_entry
-               code="BF-KOW"   name="Kourwéogo" />
+               code="BF-KOW"   name="Kourwéogo"       parent="11" />
        <iso_3166_2_entry
-               code="BF-LER"   name="Léraba" />
+               code="BF-LER"   name="Léraba"  parent="02" />
        <iso_3166_2_entry
-               code="BF-LOR"   name="Loroum" />
+               code="BF-LOR"   name="Loroum"   parent="10" />
        <iso_3166_2_entry
-               code="BF-MOU"   name="Mouhoun" />
+               code="BF-MOU"   name="Mouhoun"  parent="01" />
        <iso_3166_2_entry
-               code="BF-NAO"   name="Naouri" />
+               code="BF-NAO"   name="Naouri"   parent="07" />
        <iso_3166_2_entry
-               code="BF-NAM"   name="Namentenga" />
+               code="BF-NAM"   name="Namentenga"       parent="05" />
        <iso_3166_2_entry
-               code="BF-NAY"   name="Nayala" />
+               code="BF-NAY"   name="Nayala"   parent="01" />
        <iso_3166_2_entry
-               code="BF-NOU"   name="Noumbiel" />
+               code="BF-NOU"   name="Noumbiel" parent="13" />
        <iso_3166_2_entry
-               code="BF-OUB"   name="Oubritenga" />
+               code="BF-OUB"   name="Oubritenga"       parent="11" />
        <iso_3166_2_entry
-               code="BF-OUD"   name="Oudalan" />
+               code="BF-OUD"   name="Oudalan"  parent="12" />
        <iso_3166_2_entry
-               code="BF-PAS"   name="Passoré" />
+               code="BF-PAS"   name="Passoré" parent="10" />
        <iso_3166_2_entry
-               code="BF-PON"   name="Poni" />
+               code="BF-PON"   name="Poni"     parent="13" />
        <iso_3166_2_entry
-               code="BF-SNG"   name="Sanguié" />
+               code="BF-SNG"   name="Sanguié" parent="06" />
        <iso_3166_2_entry
-               code="BF-SMT"   name="Sanmatenga" />
+               code="BF-SMT"   name="Sanmatenga"       parent="05" />
        <iso_3166_2_entry
-               code="BF-SEN"   name="Séno" />
+               code="BF-SEN"   name="Séno"    parent="12" />
        <iso_3166_2_entry
-               code="BF-SIS"   name="Sissili" />
+               code="BF-SIS"   name="Sissili"  parent="06" />
        <iso_3166_2_entry
-               code="BF-SOM"   name="Soum" />
+               code="BF-SOM"   name="Soum"     parent="12" />
        <iso_3166_2_entry
-               code="BF-SOR"   name="Sourou" />
+               code="BF-SOR"   name="Sourou"   parent="01" />
        <iso_3166_2_entry
-               code="BF-TAP"   name="Tapoa" />
+               code="BF-TAP"   name="Tapoa"    parent="08" />
        <iso_3166_2_entry
-               code="BF-TUI"   name="Tui" />
+               code="BF-TUI"   name="Tui"      parent="09" />
        <iso_3166_2_entry
-               code="BF-YAG"   name="Yagha" />
+               code="BF-YAG"   name="Yagha"    parent="12" />
        <iso_3166_2_entry
-               code="BF-YAT"   name="Yatenga" />
+               code="BF-YAT"   name="Yatenga"  parent="10" />
        <iso_3166_2_entry
-               code="BF-ZIR"   name="Ziro" />
+               code="BF-ZIR"   name="Ziro"     parent="06" />
        <iso_3166_2_entry
-               code="BF-ZON"   name="Zondoma" />
+               code="BF-ZON"   name="Zondoma"  parent="10" />
        <iso_3166_2_entry
-               code="BF-ZOU"   name="Zoundwéogo" />
+               code="BF-ZOU"   name="Zoundwéogo"      parent="07" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Bulgaria -->
@@ -1006,7 +1064,9 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="BI-BB"    name="Bubanza" />
        <iso_3166_2_entry
-               code="BI-BJ"    name="Bujumbura" />
+               code="BI-BM"    name="Bujumbura Mairie" />
+       <iso_3166_2_entry
+               code="BI-BL"    name="Bujumbura Rural" />
        <iso_3166_2_entry
                code="BI-BR"    name="Bururi" />
        <iso_3166_2_entry
@@ -1156,7 +1216,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="BR-SE"    name="Sergipe" />
        <iso_3166_2_entry
-               code="BR-SP"    name="Sâo Paulo" />
+               code="BR-SP"    name="São Paulo" />
        <iso_3166_2_entry
                code="BR-TO"    name="Tocantins" />
 </iso_3166_subset>
@@ -1169,47 +1229,69 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="BS">
 <iso_3166_subset type="District">
        <iso_3166_2_entry
-               code="BS-AC"    name="Acklins and Crooked Islands" />
+               code="BS-AC"    name="Acklins Islands" />
+       <iso_3166_2_entry
+               code="BS-BY"    name="Berry Islands" />
        <iso_3166_2_entry
-               code="BS-BI"    name="Bimini" />
+               code="BS-BI"    name="Bimini and Cat Cay" />
+       <iso_3166_2_entry
+               code="BS-BP"    name="Black Point" />
        <iso_3166_2_entry
                code="BS-CI"    name="Cat Island" />
        <iso_3166_2_entry
-               code="BS-EX"    name="Exuma" />
+               code="BS-CO"    name="Central Abaco" />
+       <iso_3166_2_entry
+               code="BS-CS"    name="Central Andros" />
+       <iso_3166_2_entry
+               code="BS-CE"    name="Central Eleuthera" />
+       <iso_3166_2_entry
+               code="BS-FP"    name="City of Freeport" />
        <iso_3166_2_entry
-               code="BS-FP"    name="Freeport" />
+               code="BS-CK"    name="Crooked Island and Long Cay" />
        <iso_3166_2_entry
-               code="BS-FC"    name="Fresh Creek" />
+               code="BS-EG"    name="East Grand Bahama" />
        <iso_3166_2_entry
-               code="BS-GH"    name="Governor's Harbour" />
+               code="BS-EX"    name="Exuma" />
+       <iso_3166_2_entry
+               code="BS-GC"    name="Grand Cay" />
        <iso_3166_2_entry
                code="BS-GT"    name="Green Turtle Cay" />
        <iso_3166_2_entry
                code="BS-HI"    name="Harbour Island" />
        <iso_3166_2_entry
-               code="BS-HR"    name="High Rock" />
+               code="BS-HT"    name="Hope Town" />
        <iso_3166_2_entry
                code="BS-IN"    name="Inagua" />
        <iso_3166_2_entry
-               code="BS-KB"    name="Kemps Bay" />
-       <iso_3166_2_entry
                code="BS-LI"    name="Long Island" />
        <iso_3166_2_entry
-               code="BS-MH"    name="Marsh Harbour" />
+               code="BS-MC"    name="Mangrove Cay" />
        <iso_3166_2_entry
                code="BS-MG"    name="Mayaguana" />
        <iso_3166_2_entry
-               code="BS-NP"    name="New Providence" />
+               code="BS-MI"    name="Moore's Island" />
        <iso_3166_2_entry
-               code="BS-NB"    name="Nicholls Town and Berry Islands" />
+               code="BS-NO"    name="North Abaco" />
+       <iso_3166_2_entry
+               code="BS-NS"    name="North Andros" />
+       <iso_3166_2_entry
+               code="BS-NE"    name="North Eleuthera" />
        <iso_3166_2_entry
                code="BS-RI"    name="Ragged Island" />
        <iso_3166_2_entry
-               code="BS-RS"    name="Rock Sound" />
+               code="BS-RC"    name="Rum Cay" />
+       <iso_3166_2_entry
+               code="BS-SS"    name="San Salvador" />
        <iso_3166_2_entry
-               code="BS-SP"    name="Sandy Point" />
+               code="BS-SO"    name="South Abaco" />
        <iso_3166_2_entry
-               code="BS-SR"    name="San Salvador and Rum Cay" />
+               code="BS-SA"    name="South Andros" />
+       <iso_3166_2_entry
+               code="BS-SE"    name="South Eleuthera" />
+       <iso_3166_2_entry
+               code="BS-SW"    name="Spanish Wells" />
+       <iso_3166_2_entry
+               code="BS-WG"    name="West Grand Bahama" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Bhutan -->
@@ -1284,6 +1366,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Belarus -->
 <iso_3166_country code="BY">
+<iso_3166_subset type="City">
+       <iso_3166_2_entry
+               code="BY-HM"    name="Horad Minsk" />
+</iso_3166_subset>
 <iso_3166_subset type="Oblast">
        <!-- ISO 3166-2 gives several Romanised versions of the names; here we choose the GOST be version -->
        <iso_3166_2_entry
@@ -1384,6 +1470,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Central African Republic -->
 <iso_3166_country code="CF">
+<iso_3166_subset type="Commune">
+       <iso_3166_2_entry
+               code="CF-BGF"   name="Bangui" />
+</iso_3166_subset>
 <iso_3166_subset type="Prefecture">
        <iso_3166_2_entry
                code="CF-BB"    name="Bamingui-Bangoran" />
@@ -1394,11 +1484,11 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="CF-HM"    name="Haut-Mbomou" />
        <iso_3166_2_entry
-               code="CF-KG"    name="Kémo" />
+               code="CF-KG"    name="Kémo-Gribingui" />
        <iso_3166_2_entry
                code="CF-LB"    name="Lobaye" />
        <iso_3166_2_entry
-               code="CF-HS"    name="Mambéré-Kadéï" />
+               code="CF-HS"    name="Haute-Sangha / Mambéré-Kadéï" />
        <iso_3166_2_entry
                code="CF-MB"    name="Mbomou" />
        <iso_3166_2_entry
@@ -1412,17 +1502,13 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="CF-OP"    name="Ouham-Pendé" />
        <iso_3166_2_entry
-               code="CF-VR"    name="Vakaga" />
+               code="CF-VK"    name="Vakaga" />
 </iso_3166_subset>
 <iso_3166_subset type="Economic Prefecture">
        <iso_3166_2_entry
-               code="CF-KB"    name="Nana-Grébizi" />
+               code="CF-KB"    name="Gribingui" />
        <iso_3166_2_entry
-               code="CF-SE"    name="Sangha-Mbaéré" />
-</iso_3166_subset>
-<iso_3166_subset type="Autonomous Commune">
-       <iso_3166_2_entry
-               code="CF-BGF"   name="Bangui" />
+               code="CF-SE"    name="Sangha" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Congo -->
@@ -1564,6 +1650,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="CL-AR"    name="Araucanía" />
        <iso_3166_2_entry
+               code="CL-AP"    name="Arica y Parinacota" />
+       <iso_3166_2_entry
                code="CL-AT"    name="Atacama" />
        <iso_3166_2_entry
                code="CL-BI"    name="Bío-Bío" />
@@ -1574,6 +1662,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="CL-LL"    name="Los Lagos" />
        <iso_3166_2_entry
+               code="CL-LR"    name="Los Ríos" />
+       <iso_3166_2_entry
                code="CL-MA"    name="Magallanes y Antártica Chilena" />
        <iso_3166_2_entry
                code="CL-ML"    name="Maule" />
@@ -1820,11 +1910,11 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Cape Verde -->     
 <iso_3166_country code="CV">
-<iso_3166_subset type="District">
+<iso_3166_subset type="Geographical region">
        <iso_3166_2_entry
-               code="CV B"     name="Ilhas de Barlavento" />
+               code="CV-B"     name="Ilhas de Barlavento" />
        <iso_3166_2_entry
-               code="CV S"     name="Ilhas de Sotavento" />
+               code="CV-S"     name="Ilhas de Sotavento" />
 </iso_3166_subset>
 <iso_3166_subset type="Municipality">
        <iso_3166_2_entry
@@ -1832,35 +1922,45 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="CV-BR"    name="Brava"    parent="S" />
        <iso_3166_2_entry
-               code="CV-CS"    name="Calheta de São Miguel"   parent="S" />
-       <iso_3166_2_entry
                code="CV-MA"    name="Maio"     parent="S" />
        <iso_3166_2_entry
                code="CV-MO"    name="Mosteiros"        parent="S" />
        <iso_3166_2_entry
-               code="CV-PA"    name="Paúl"    parent="B" />
+               code="CV-PA"    name="Paul"     parent="B" />
        <iso_3166_2_entry
                code="CV-PN"    name="Porto Novo"       parent="B" />
        <iso_3166_2_entry
                code="CV-PR"    name="Praia"    parent="S" />
        <iso_3166_2_entry
+               code="CV-RB"    name="Ribeira Brava"    parent="B" />
+       <iso_3166_2_entry
                code="CV-RG"    name="Ribeira Grande"   parent="B" />
        <iso_3166_2_entry
+               code="CV-RS"    name="Ribeira Grande de Santiago"       parent="S" />
+       <iso_3166_2_entry
                code="CV-SL"    name="Sal"      parent="B" />
        <iso_3166_2_entry
                code="CV-CA"    name="Santa Catarina"   parent="S" />
        <iso_3166_2_entry
+               code="CV-CF"    name="Santa Catarina de Fogo"   parent="S" />
+       <iso_3166_2_entry
                code="CV-CR"    name="Santa Cruz"       parent="S" />
        <iso_3166_2_entry
                code="CV-SD"    name="São Domingos"    parent="S" />
        <iso_3166_2_entry
                code="CV-SF"    name="São Filipe"      parent="S" />
        <iso_3166_2_entry
-               code="CV-SN"    name="São Nicolau"     parent="B" />
+               code="CV-SL"    name="São Lourenço dos Órgãos"      parent="S" />
+       <iso_3166_2_entry
+               code="CV-SM"    name="São Miguel"      parent="S" />
+       <iso_3166_2_entry
+               code="CV-SS"    name="São Salvador do Mundo"   parent="S" />
        <iso_3166_2_entry
                code="CV-SV"    name="São Vicente"     parent="B" />
        <iso_3166_2_entry
                code="CV-TA"    name="Tarrafal" parent="S" />
+       <iso_3166_2_entry
+               code="CV-TS"    name="Tarrafal de São Nicolau" parent="S" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Cyprus -->
@@ -2404,6 +2504,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="EC-P"     name="Pichincha" />
        <iso_3166_2_entry
+               code="EC-SE"    name="Santa Elena" />
+       <iso_3166_2_entry
+               code="EC-SD"    name="Santo Domingo de los Tsáchilas" />
+       <iso_3166_2_entry
                code="EC-U"     name="Sucumbíos" />
        <iso_3166_2_entry
                code="EC-T"     name="Tungurahua" />
@@ -2476,6 +2580,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="EG-WAD"   name="Al Wādī al Jadīd" />
        <iso_3166_2_entry
+               code="EG-SU"    name="As Sādis min Uktūbar" />
+       <iso_3166_2_entry
                code="EG-SHR"   name="Ash Sharqīyah" />
        <iso_3166_2_entry
                code="EG-SUZ"   name="As Suways" />
@@ -2490,6 +2596,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="EG-DT"    name="Dumyāt" />
        <iso_3166_2_entry
+               code="EG-HU"    name="Ḩulwān" />
+       <iso_3166_2_entry
                code="EG-JS"    name="Janūb Sīnā'" />
        <iso_3166_2_entry
                code="EG-KFS"   name="Kafr ash Shaykh" />
@@ -2552,11 +2660,11 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="ES-MC"    name="Murcia, Región de" />
        <iso_3166_2_entry
-               code="ES-NC"    name="Navarra, Comunidad Foral de" />
+               code="ES-NC"    name="Navarra, Comunidad Foral de / Nafarroako Foru Komunitatea" />
        <iso_3166_2_entry
-               code="ES-PV"    name="País Vasco" />
+               code="ES-PV"    name="País Vasco / Euskal Herria" />
        <iso_3166_2_entry
-               code="ES-VC"    name="Valenciana, Comunidad" />
+               code="ES-VC"    name="Valenciana, Comunidad / Valenciana, Comunitat " />
 </iso_3166_subset>
 <iso_3166_subset type="Province">
        <iso_3166_2_entry
@@ -2576,8 +2684,6 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="ES-BA"    name="Badajoz"  parent="EX" />
        <iso_3166_2_entry
-               code="ES-IB"    name="Balears"  parent="IB" />
-       <iso_3166_2_entry
                code="ES-B"     name="Barcelona"        parent="CT" />
        <iso_3166_2_entry
                code="ES-BU"    name="Burgos"   parent="CL" />
@@ -2602,7 +2708,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="ES-GU"    name="Guadalajara"      parent="CM" />
        <iso_3166_2_entry
-               code="ES-SS"    name="Guipúzcoa"       parent="PV" />
+               code="ES-SS"    name="Guipúzcoa / Gipuzkoa"    parent="PV" />
        <iso_3166_2_entry
                code="ES-H"     name="Huelva"   parent="AN" />
        <iso_3166_2_entry
@@ -2626,12 +2732,14 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="ES-MU"    name="Murcia"   parent="MC" />
        <iso_3166_2_entry
-               code="ES-NA"    name="Navarra"  parent="NC" />
+               code="ES-NA"    name="Navarra / Nafarroa"       parent="NC" />
        <iso_3166_2_entry
                code="ES-OR"    name="Ourense"  parent="GA" />
        <iso_3166_2_entry
                code="ES-P"     name="Palencia" parent="CL" />
        <iso_3166_2_entry
+               code="ES-PM"    name="Balears"  parent="IB" />
+       <iso_3166_2_entry
                code="ES-PO"    name="Pontevedra"       parent="GA" />
        <iso_3166_2_entry
                code="ES-SA"    name="Salamanca"        parent="CL" />
@@ -2650,11 +2758,11 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="ES-TO"    name="Toledo"   parent="CM" />
        <iso_3166_2_entry
-               code="ES-V"     name="Valencia" parent="VC" />
+               code="ES-V"     name="Valencia / València"     parent="VC" />
        <iso_3166_2_entry
                code="ES-VA"    name="Valladolid"       parent="CL" />
        <iso_3166_2_entry
-               code="ES-BI"    name="Vizcaya"  parent="PV" />
+               code="ES-BI"    name="Vizcayaa / Bizkaia"       parent="PV" />
        <iso_3166_2_entry
                code="ES-ZA"    name="Zamora"   parent="CL" />
        <iso_3166_2_entry
@@ -3015,7 +3123,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="FR-TF"    name="Terres australes françaises" />
        <iso_3166_2_entry
-               code="FR-WF"    name="Wallis et Futuna" />
+               code="FR-WF"    name="Wallis-et-Futuna" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Gabon -->
@@ -3045,498 +3153,501 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="GB">
 <iso_3166_subset type="Country">
        <iso_3166_2_entry
-               code="GB ENG"   name="England" />
+               code="GB-ENG"   name="England" />
        <iso_3166_2_entry
-               code="GB SCT"   name="Scotland" />
+               code="GB-SCT"   name="Scotland" />
 </iso_3166_subset>
 <iso_3166_subset type="Province">
        <iso_3166_2_entry
-               code="GB NIR"   name="Northern Ireland" />
+               code="GB-NIR"   name="Northern Ireland" />
 </iso_3166_subset>
 <iso_3166_subset type="Principality">
        <iso_3166_2_entry
-               code="GB WLS"   name="Wales" />
+               code="GB-WLS"   name="Wales" />
 </iso_3166_subset>
 <iso_3166_subset type="Included for completeness">
        <iso_3166_2_entry
-               code="GB EAW"   name="England and Wales" />
+               code="GB-EAW"   name="England and Wales" />
        <iso_3166_2_entry
-               code="GB GBN"   name="Great Britain" />
+               code="GB-GBN"   name="Great Britain" />
        <iso_3166_2_entry
-               code="GB UKM"   name="United Kingdom" />
+               code="GB-UKM"   name="United Kingdom" />
 </iso_3166_subset>
 <iso_3166_subset type="Two-tier county">
        <iso_3166_2_entry
-               code="GB-BDF"   name="Bedfordshire"     parent="ENG" />
-       <iso_3166_2_entry
-               code="GB-BKM"   name="Buckinghamshire"  parent="ENG" />
+               code="GB-BKM"   name="Buckinghamshire" />
        <iso_3166_2_entry
-               code="GB-CAM"   name="Cambridgeshire"   parent="ENG" />
+               code="GB-CAM"   name="Cambridgeshire" />
        <iso_3166_2_entry
-               code="GB-CHS"   name="Cheshire" parent="ENG" />
+               code="GB-CMA"   name="Cumbria" />
        <iso_3166_2_entry
-               code="GB-CON"   name="Cornwall" parent="ENG" />
+               code="GB-DBY"   name="Derbyshire" />
        <iso_3166_2_entry
-               code="GB-CMA"   name="Cumbria"  parent="ENG" />
+               code="GB-DEV"   name="Devon" />
        <iso_3166_2_entry
-               code="GB-DBY"   name="Derbyshire"       parent="ENG" />
+               code="GB-DOR"   name="Dorset" />
        <iso_3166_2_entry
-               code="GB-DEV"   name="Devon"    parent="ENG" />
+               code="GB-ESX"   name="East Sussex" />
        <iso_3166_2_entry
-               code="GB-DOR"   name="Dorset"   parent="ENG" />
+               code="GB-ESS"   name="Essex" />
        <iso_3166_2_entry
-               code="GB-DUR"   name="Durham"   parent="ENG" />
+               code="GB-GLS"   name="Gloucestershire" />
        <iso_3166_2_entry
-               code="GB-ESX"   name="East Sussex"      parent="ENG" />
+               code="GB-HAM"   name="Hampshire" />
        <iso_3166_2_entry
-               code="GB-ESS"   name="Essex"    parent="ENG" />
+               code="GB-HRT"   name="Hertfordshire" />
        <iso_3166_2_entry
-               code="GB-GLS"   name="Gloucestershire"  parent="ENG" />
+               code="GB-KEN"   name="Kent" />
        <iso_3166_2_entry
-               code="GB-HAM"   name="Hampshire"        parent="ENG" />
+               code="GB-LAN"   name="Lancashire" />
        <iso_3166_2_entry
-               code="GB-HRT"   name="Hertfordshire"    parent="ENG" />
+               code="GB-LEC"   name="Leicestershire" />
        <iso_3166_2_entry
-               code="GB-KEN"   name="Kent"     parent="ENG" />
+               code="GB-LIN"   name="Lincolnshire" />
        <iso_3166_2_entry
-               code="GB-LAN"   name="Lancashire"       parent="ENG" />
+               code="GB-NFK"   name="Norfolk" />
        <iso_3166_2_entry
-               code="GB-LEC"   name="Leicestershire"   parent="ENG" />
+               code="GB-NYK"   name="North Yorkshire" />
        <iso_3166_2_entry
-               code="GB-LIN"   name="Lincolnshire"     parent="ENG" />
+               code="GB-NTH"   name="Northamptonshire" />
        <iso_3166_2_entry
-               code="GB-NFK"   name="Norfolk"  parent="ENG" />
+               code="GB-NTT"   name="Nottinghamshire" />
        <iso_3166_2_entry
-               code="GB-NYK"   name="North Yorkshire"  parent="ENG" />
+               code="GB-OXF"   name="Oxfordshire" />
        <iso_3166_2_entry
-               code="GB-NTH"   name="Northamptonshire" parent="ENG" />
+               code="GB-SOM"   name="Somerset" />
        <iso_3166_2_entry
-               code="GB-NBL"   name="Northumberland"   parent="ENG" />
+               code="GB-STS"   name="Staffordshire" />
        <iso_3166_2_entry
-               code="GB-NTT"   name="Nottinghamshire"  parent="ENG" />
+               code="GB-SFK"   name="Suffolk" />
        <iso_3166_2_entry
-               code="GB-OXF"   name="Oxfordshire"      parent="ENG" />
+               code="GB-SRY"   name="Surrey" />
        <iso_3166_2_entry
-               code="GB-SOM"   name="Somerset" parent="ENG" />
+               code="GB-WAR"   name="Warwickshire" />
        <iso_3166_2_entry
-               code="GB-STS"   name="Staffordshire"    parent="ENG" />
+               code="GB-WSX"   name="West Sussex" />
        <iso_3166_2_entry
-               code="GB-SFK"   name="Suffolk"  parent="ENG" />
-       <iso_3166_2_entry
-               code="GB-SRY"   name="Surrey"   parent="ENG" />
-       <iso_3166_2_entry
-               code="GB-WSX"   name="West Sussex"      parent="ENG" />
-       <iso_3166_2_entry
-               code="GB-WIL"   name="Wiltshire"        parent="ENG" />
-       <iso_3166_2_entry
-               code="GB-WOR"   name="Worcestershire"   parent="ENG" />
+               code="GB-WOR"   name="Worcestershire" />
 </iso_3166_subset>
 <iso_3166_subset type="London borough">
        <iso_3166_2_entry
-               code="GB-BDG"   name="Barking and Dagenham"     parent="ENG" />
+               code="GB-BDG"   name="Barking and Dagenham" />
        <iso_3166_2_entry
-               code="GB-BNE"   name="Barnet"   parent="ENG" />
+               code="GB-BNE"   name="Barnet" />
        <iso_3166_2_entry
-               code="GB-BEX"   name="Bexley"   parent="ENG" />
+               code="GB-BEX"   name="Bexley" />
        <iso_3166_2_entry
-               code="GB-BEN"   name="Brent"    parent="ENG" />
+               code="GB-BEN"   name="Brent" />
        <iso_3166_2_entry
-               code="GB-BRY"   name="Bromley"  parent="ENG" />
+               code="GB-BRY"   name="Bromley" />
        <iso_3166_2_entry
-               code="GB-CMD"   name="Camden"   parent="ENG" />
+               code="GB-CMD"   name="Camden" />
        <iso_3166_2_entry
-               code="GB-CRY"   name="Croydon"  parent="ENG" />
+               code="GB-CRY"   name="Croydon" />
        <iso_3166_2_entry
-               code="GB-EAL"   name="Ealing"   parent="ENG" />
+               code="GB-EAL"   name="Ealing" />
        <iso_3166_2_entry
-               code="GB-ENF"   name="Enfield"  parent="ENG" />
+               code="GB-ENF"   name="Enfield" />
        <iso_3166_2_entry
-               code="GB-GRE"   name="Greenwich"        parent="ENG" />
+               code="GB-GRE"   name="Greenwich" />
        <iso_3166_2_entry
-               code="GB-HCK"   name="Hackney"  parent="ENG" />
+               code="GB-HCK"   name="Hackney" />
        <iso_3166_2_entry
-               code="GB-HMF"   name="Hammersmith and Fulham"   parent="ENG" />
+               code="GB-HMF"   name="Hammersmith and Fulham" />
        <iso_3166_2_entry
-               code="GB-HRY"   name="Haringey" parent="ENG" />
+               code="GB-HRY"   name="Haringey" />
        <iso_3166_2_entry
-               code="GB-HRW"   name="Harrow"   parent="ENG" />
+               code="GB-HRW"   name="Harrow" />
        <iso_3166_2_entry
-               code="GB-HAV"   name="Havering" parent="ENG" />
+               code="GB-HAV"   name="Havering" />
        <iso_3166_2_entry
-               code="GB-HIL"   name="Hillingdon"       parent="ENG" />
+               code="GB-HIL"   name="Hillingdon" />
        <iso_3166_2_entry
-               code="GB-HNS"   name="Hounslow" parent="ENG" />
+               code="GB-HNS"   name="Hounslow" />
        <iso_3166_2_entry
-               code="GB-ISL"   name="Islington"        parent="ENG" />
+               code="GB-ISL"   name="Islington" />
        <iso_3166_2_entry
-               code="GB-KEC"   name="Kensington and Chelsea"   parent="ENG" />
+               code="GB-KEC"   name="Kensington and Chelsea" />
        <iso_3166_2_entry
-               code="GB-KTT"   name="Kingston upon Thames"     parent="ENG" />
+               code="GB-KTT"   name="Kingston upon Thames" />
        <iso_3166_2_entry
-               code="GB-LBH"   name="Lambeth"  parent="ENG" />
+               code="GB-LBH"   name="Lambeth" />
        <iso_3166_2_entry
-               code="GB-LEW"   name="Lewisham" parent="ENG" />
+               code="GB-LEW"   name="Lewisham" />
        <iso_3166_2_entry
-               code="GB-MRT"   name="Merton"   parent="ENG" />
+               code="GB-MRT"   name="Merton" />
        <iso_3166_2_entry
-               code="GB-NWM"   name="Newham"   parent="ENG" />
+               code="GB-NWM"   name="Newham" />
        <iso_3166_2_entry
-               code="GB-RDB"   name="Redbridge"        parent="ENG" />
+               code="GB-RDB"   name="Redbridge" />
        <iso_3166_2_entry
-               code="GB-RIC"   name="Richmond upon Thames"     parent="ENG" />
+               code="GB-RIC"   name="Richmond upon Thames" />
        <iso_3166_2_entry
-               code="GB-SWK"   name="Southwark"        parent="ENG" />
+               code="GB-SWK"   name="Southwark" />
        <iso_3166_2_entry
-               code="GB-STN"   name="Sutton"   parent="ENG" />
+               code="GB-STN"   name="Sutton" />
        <iso_3166_2_entry
-               code="GB-TWH"   name="Tower Hamlets"    parent="ENG" />
+               code="GB-TWH"   name="Tower Hamlets" />
        <iso_3166_2_entry
-               code="GB-WFT"   name="Waltham Forest"   parent="ENG" />
+               code="GB-WFT"   name="Waltham Forest" />
        <iso_3166_2_entry
-               code="GB-WND"   name="Wandsworth"       parent="ENG" />
+               code="GB-WND"   name="Wandsworth" />
        <iso_3166_2_entry
-               code="GB-WSM"   name="Westminster"      parent="ENG" />
+               code="GB-WSM"   name="Westminster" />
 </iso_3166_subset>
 <iso_3166_subset type="Metropolitan district">
        <iso_3166_2_entry
-               code="GB-BNS"   name="Barnsley" parent="ENG" />
+               code="GB-BNS"   name="Barnsley" />
        <iso_3166_2_entry
-               code="GB-BIR"   name="Birmingham"       parent="ENG" />
+               code="GB-BIR"   name="Birmingham" />
        <iso_3166_2_entry
-               code="GB-BOL"   name="Bolton"   parent="ENG" />
+               code="GB-BOL"   name="Bolton" />
        <iso_3166_2_entry
-               code="GB-BRD"   name="Bradford" parent="ENG" />
+               code="GB-BRD"   name="Bradford" />
        <iso_3166_2_entry
-               code="GB-BUR"   name="Bury"     parent="ENG" />
+               code="GB-BUR"   name="Bury" />
        <iso_3166_2_entry
-               code="GB-CLD"   name="Calderdale"       parent="ENG" />
+               code="GB-CLD"   name="Calderdale" />
        <iso_3166_2_entry
-               code="GB-COV"   name="Coventry" parent="ENG" />
+               code="GB-COV"   name="Coventry" />
        <iso_3166_2_entry
-               code="GB-DNC"   name="Doncaster"        parent="ENG" />
+               code="GB-DNC"   name="Doncaster" />
        <iso_3166_2_entry
-               code="GB-DUD"   name="Dudley"   parent="ENG" />
+               code="GB-DUD"   name="Dudley" />
        <iso_3166_2_entry
-               code="GB-GAT"   name="Gateshead"        parent="ENG" />
+               code="GB-GAT"   name="Gateshead" />
        <iso_3166_2_entry
-               code="GB-KIR"   name="Kirklees" parent="ENG" />
+               code="GB-KIR"   name="Kirklees" />
        <iso_3166_2_entry
-               code="GB-KWL"   name="Knowsley" parent="ENG" />
+               code="GB-KWL"   name="Knowsley" />
        <iso_3166_2_entry
-               code="GB-LDS"   name="Leeds"    parent="ENG" />
+               code="GB-LDS"   name="Leeds" />
        <iso_3166_2_entry
-               code="GB-LIV"   name="Liverpool"        parent="ENG" />
+               code="GB-LIV"   name="Liverpool" />
        <iso_3166_2_entry
-               code="GB-MAN"   name="Manchester"       parent="ENG" />
+               code="GB-MAN"   name="Manchester" />
        <iso_3166_2_entry
-               code="GB-NET"   name="Newcastle upon Tyne"      parent="ENG" />
+               code="GB-NET"   name="Newcastle upon Tyne" />
        <iso_3166_2_entry
-               code="GB-NTY"   name="North Tyneside"   parent="ENG" />
+               code="GB-NTY"   name="North Tyneside" />
        <iso_3166_2_entry
-               code="GB-OLD"   name="Oldham"   parent="ENG" />
+               code="GB-OLD"   name="Oldham" />
        <iso_3166_2_entry
-               code="GB-RCH"   name="Rochdale" parent="ENG" />
+               code="GB-RCH"   name="Rochdale" />
        <iso_3166_2_entry
-               code="GB-ROT"   name="Rotherham"        parent="ENG" />
+               code="GB-ROT"   name="Rotherham" />
        <iso_3166_2_entry
-               code="GB-SLF"   name="Salford"  parent="ENG" />
+               code="GB-SHN"   name="St. Helens" />
        <iso_3166_2_entry
-               code="GB-SAW"   name="Sandwell" parent="ENG" />
+               code="GB-SLF"   name="Salford" />
        <iso_3166_2_entry
-               code="GB-SFT"   name="Sefton"   parent="ENG" />
+               code="GB-SAW"   name="Sandwell" />
        <iso_3166_2_entry
-               code="GB-SHF"   name="Sheffield"        parent="ENG" />
+               code="GB-SFT"   name="Sefton" />
        <iso_3166_2_entry
-               code="GB-SOL"   name="Solihull" parent="ENG" />
+               code="GB-SHF"   name="Sheffield" />
        <iso_3166_2_entry
-               code="GB-STY"   name="South Tyneside"   parent="ENG" />
+               code="GB-SOL"   name="Solihull" />
        <iso_3166_2_entry
-               code="GB-SHN"   name="St. Helens"       parent="ENG" />
+               code="GB-STY"   name="South Tyneside" />
        <iso_3166_2_entry
-               code="GB-SKP"   name="Stockport"        parent="ENG" />
+               code="GB-SKP"   name="Stockport" />
        <iso_3166_2_entry
-               code="GB-SND"   name="Sunderland"       parent="ENG" />
+               code="GB-SND"   name="Sunderland" />
        <iso_3166_2_entry
-               code="GB-TAM"   name="Tameside" parent="ENG" />
+               code="GB-TAM"   name="Tameside" />
        <iso_3166_2_entry
-               code="GB-TRF"   name="Trafford" parent="ENG" />
+               code="GB-TRF"   name="Trafford" />
        <iso_3166_2_entry
-               code="GB-WKF"   name="Wakefield"        parent="ENG" />
+               code="GB-WKF"   name="Wakefield" />
        <iso_3166_2_entry
-               code="GB-WLL"   name="Walsall"  parent="ENG" />
+               code="GB-WLL"   name="Walsall" />
        <iso_3166_2_entry
-               code="GB-WGN"   name="Wigan"    parent="ENG" />
+               code="GB-WGN"   name="Wigan" />
        <iso_3166_2_entry
-               code="GB-WRL"   name="Wirral"   parent="ENG" />
+               code="GB-WRL"   name="Wirral" />
        <iso_3166_2_entry
-               code="GB-WLV"   name="Wolverhampton"    parent="ENG" />
+               code="GB-WLV"   name="Wolverhampton" />
 </iso_3166_subset>
 <iso_3166_subset type="City corporation">
        <iso_3166_2_entry
-               code="GB-LND"   name="London, City of"  parent="ENG" />
+               code="GB-LND"   name="London, City of" />
 </iso_3166_subset>
-<iso_3166_subset type="Division">
-       <!-- Great Britain divisions includes English single-tier counties -->
-       <!-- and unitary authorities, Northern Ireland and Scotland council -->
-       <!-- areas and Welsh unitary authorities. -->
+<iso_3166_subset type="Council area">
        <iso_3166_2_entry
-               code="GB-ABE"   name="Aberdeen City"    parent="SCT" />
+               code="GB-ABE"   name="Aberdeen City" />
        <iso_3166_2_entry
-               code="GB-ABD"   name="Aberdeenshire"    parent="SCT" />
+               code="GB-ABD"   name="Aberdeenshire" />
        <iso_3166_2_entry
-               code="GB-ANS"   name="Angus"    parent="SCT" />
+               code="GB-ANS"   name="Angus" />
        <iso_3166_2_entry
-               code="GB-ANT"   name="Antrim"   parent="NIR" />
+               code="GB-AGB"   name="Argyll and Bute" />
        <iso_3166_2_entry
-               code="GB-ARD"   name="Ards"     parent="NIR" />
+               code="GB-CLK"   name="Clackmannanshire" />
        <iso_3166_2_entry
-               code="GB-AGB"   name="Argyll and Bute"  parent="SCT" />
+               code="GB-DGY"   name="Dumfries and Galloway" />
        <iso_3166_2_entry
-               code="GB-ARM"   name="Armagh"   parent="NIR" />
+               code="GB-DND"   name="Dundee City" />
        <iso_3166_2_entry
-               code="GB-BLA"   name="Ballymena"        parent="NIR" />
+               code="GB-EAY"   name="East Ayrshire" />
        <iso_3166_2_entry
-               code="GB-BLY"   name="Ballymoney"       parent="NIR" />
+               code="GB-EDU"   name="East Dunbartonshire" />
        <iso_3166_2_entry
-               code="GB-BNB"   name="Banbridge"        parent="NIR" />
+               code="GB-ELN"   name="East Lothian" />
        <iso_3166_2_entry
-               code="GB-BAS"   name="Bath and North East Somerset"     parent="ENG" />
+               code="GB-ERW"   name="East Renfrewshire" />
        <iso_3166_2_entry
-               code="GB-BFS"   name="Belfast"  parent="NIR" />
+               code="GB-EDH"   name="Edinburgh, City of" />
        <iso_3166_2_entry
-               code="GB-BBD"   name="Blackburn with Darwen"    parent="ENG" />
+               code="GB-ELS"   name="Eilean Siar" />
        <iso_3166_2_entry
-               code="GB-BPL"   name="Blackpool"        parent="ENG" />
+               code="GB-FAL"   name="Falkirk" />
        <iso_3166_2_entry
-               code="GB-BGW"   name="Blaenau Gwent"    parent="WLS" />
+               code="GB-FIF"   name="Fife" />
        <iso_3166_2_entry
-               code="GB-BMH"   name="Bournemouth"      parent="ENG" />
+               code="GB-GLG"   name="Glasgow City" />
        <iso_3166_2_entry
-               code="GB-BRC"   name="Bracknell Forest" parent="ENG" />
+               code="GB-HLD"   name="Highland" />
        <iso_3166_2_entry
-               code="GB-BGE"   name="Bridgend" parent="WLS" />
+               code="GB-IVC"   name="Inverclyde" />
        <iso_3166_2_entry
-               code="GB-BNH"   name="Brighton and Hove"        parent="ENG" />
+               code="GB-MLN"   name="Midlothian" />
        <iso_3166_2_entry
-               code="GB-BST"   name="Bristol, City of" parent="ENG" />
+               code="GB-MRY"   name="Moray" />
        <iso_3166_2_entry
-               code="GB-CAY"   name="Caerphilly"       parent="WLS" />
+               code="GB-NAY"   name="North Ayrshire" />
        <iso_3166_2_entry
-               code="GB-CRF"   name="Cardiff"  parent="WLS" />
+               code="GB-NLK"   name="North Lanarkshire" />
        <iso_3166_2_entry
-               code="GB-CMN"   name="Carmarthenshire"  parent="WLS" />
+               code="GB-ORK"   name="Orkney Islands" />
        <iso_3166_2_entry
-               code="GB-CKF"   name="Carrickfergus"    parent="NIR" />
+               code="GB-PKN"   name="Perth and Kinross" />
        <iso_3166_2_entry
-               code="GB-CSR"   name="Castlereagh"      parent="NIR" />
+               code="GB-RFW"   name="Renfrewshire" />
        <iso_3166_2_entry
-               code="GB-CGN"   name="Ceredigion"       parent="WLS" />
+               code="GB-SCB"   name="Scottish Borders, The" />
        <iso_3166_2_entry
-               code="GB-CLK"   name="Clackmannanshire" parent="SCT" />
+               code="GB-ZET"   name="Shetland Islands" />
        <iso_3166_2_entry
-               code="GB-CLR"   name="Coleraine"        parent="NIR" />
+               code="GB-SAY"   name="South Ayrshire" />
        <iso_3166_2_entry
-               code="GB-CWY"   name="Conwy"    parent="WLS" />
+               code="GB-SLK"   name="South Lanarkshire" />
        <iso_3166_2_entry
-               code="GB-CKT"   name="Cookstown"        parent="NIR" />
+               code="GB-STG"   name="Stirling" />
        <iso_3166_2_entry
-               code="GB-CGV"   name="Craigavon"        parent="NIR" />
+               code="GB-WDU"   name="West Dunbartonshire" />
        <iso_3166_2_entry
-               code="GB-DAL"   name="Darlington"       parent="ENG" />
+               code="GB-WLN"   name="West Lothian" />
+</iso_3166_subset>
+<iso_3166_subset type="District council area">
+       <iso_3166_2_entry
+               code="GB-ANT"   name="Antrim" />
+       <iso_3166_2_entry
+               code="GB-ARD"   name="Ards" />
        <iso_3166_2_entry
-               code="GB-DEN"   name="Denbighshire"     parent="WLS" />
+               code="GB-ARM"   name="Armagh" />
        <iso_3166_2_entry
-               code="GB-DER"   name="Derby"    parent="ENG" />
+               code="GB-BLA"   name="Ballymena" />
        <iso_3166_2_entry
-               code="GB-DRY"   name="Derry"    parent="NIR" />
+               code="GB-BLY"   name="Ballymoney" />
        <iso_3166_2_entry
-               code="GB-DOW"   name="Down"     parent="NIR" />
+               code="GB-BNB"   name="Banbridge" />
        <iso_3166_2_entry
-               code="GB-DGY"   name="Dumfries and Galloway"    parent="SCT" />
+               code="GB-BFS"   name="Belfast" />
        <iso_3166_2_entry
-               code="GB-DND"   name="Dundee City"      parent="SCT" />
+               code="GB-CKF"   name="Carrickfergus" />
        <iso_3166_2_entry
-               code="GB-DGN"   name="Dungannon"        parent="NIR" />
+               code="GB-CSR"   name="Castlereagh" />
        <iso_3166_2_entry
-               code="GB-EAY"   name="East Ayrshire"    parent="SCT" />
+               code="GB-CLR"   name="Coleraine" />
        <iso_3166_2_entry
-               code="GB-EDU"   name="East Dunbartonshire"      parent="SCT" />
+               code="GB-CKT"   name="Cookstown" />
        <iso_3166_2_entry
-               code="GB-ELN"   name="East Lothian"     parent="SCT" />
+               code="GB-CGV"   name="Craigavon" />
        <iso_3166_2_entry
-               code="GB-ERW"   name="East Renfrewshire"        parent="SCT" />
+               code="GB-DRY"   name="Derry" />
        <iso_3166_2_entry
-               code="GB-ERY"   name="East Riding of Yorkshire" parent="ENG" />
+               code="GB-DOW"   name="Down" />
        <iso_3166_2_entry
-               code="GB-EDH"   name="Edinburgh, City of"       parent="SCT" />
+               code="GB-DGN"   name="Dungannon" />
        <iso_3166_2_entry
-               code="GB-ELS"   name="Eilean Siar"      parent="SCT" />
+               code="GB-FER"   name="Fermanagh" />
        <iso_3166_2_entry
-               code="GB-FAL"   name="Falkirk"  parent="SCT" />
+               code="GB-LRN"   name="Larne" />
        <iso_3166_2_entry
-               code="GB-FER"   name="Fermanagh"        parent="NIR" />
+               code="GB-LMV"   name="Limavady" />
        <iso_3166_2_entry
-               code="GB-FIF"   name="Fife"     parent="SCT" />
+               code="GB-LSB"   name="Lisburn" />
        <iso_3166_2_entry
-               code="GB-FLN"   name="Flintshire"       parent="WLS" />
+               code="GB-MFT"   name="Magherafelt" />
        <iso_3166_2_entry
-               code="GB-GLG"   name="Glasgow City"     parent="SCT" />
+               code="GB-MYL"   name="Moyle" />
        <iso_3166_2_entry
-               code="GB-GWN"   name="Gwynedd"  parent="WLS" />
+               code="GB-NYM"   name="Newry and Mourne" />
        <iso_3166_2_entry
-               code="GB-HAL"   name="Halton"   parent="ENG" />
+               code="GB-NTA"   name="Newtownabbey" />
        <iso_3166_2_entry
-               code="GB-HPL"   name="Hartlepool"       parent="ENG" />
+               code="GB-NDN"   name="North Down" />
        <iso_3166_2_entry
-               code="GB-HEF"   name="Herefordshire, County of" parent="ENG" />
+               code="GB-OMH"   name="Omagh" />
        <iso_3166_2_entry
-               code="GB-HED"   name="Highland" parent="SCT" />
+               code="GB-STB"   name="Strabane" />
+</iso_3166_subset>
+<iso_3166_subset type="Unitary authority (England)">
+       <iso_3166_2_entry
+               code="GB-BAS"   name="Bath and North East Somerset" />
        <iso_3166_2_entry
-               code="GB-IVC"   name="Inverclyde"       parent="SCT" />
+               code="GB-BBD"   name="Blackburn with Darwen" />
        <iso_3166_2_entry
-               code="GB-AGY"   name="Isle of Anglesey" parent="WLS" />
+               code="GB-BDF"   name="Bedford" />
        <iso_3166_2_entry
-               code="GB-IOW"   name="Isle of Wight"    parent="ENG" />
+               code="GB-BPL"   name="Blackpool" />
        <iso_3166_2_entry
-               code="GB-IOS"   name="Isles of Scilly"  parent="ENG" />
+               code="GB-BMH"   name="Bournemouth" />
        <iso_3166_2_entry
-               code="GB-KHL"   name="Kingston upon Hull, City of"      parent="ENG" />
+               code="GB-BRC"   name="Bracknell Forest" />
        <iso_3166_2_entry
-               code="GB-LRN"   name="Larne"    parent="NIR" />
+               code="GB-BNH"   name="Brighton and Hove" />
        <iso_3166_2_entry
-               code="GB-LCE"   name="Leicester"        parent="ENG" />
+               code="GB-BST"   name="Bristol, City of" />
        <iso_3166_2_entry
-               code="GB-LMV"   name="Limavady" parent="NIR" />
+               code="GB-CBF"   name="Central Bedfordshire" />
        <iso_3166_2_entry
-               code="GB-LSB"   name="Lisburn"  parent="NIR" />
+               code="GB-CHE"   name="Cheshire East" />
        <iso_3166_2_entry
-               code="GB-LUT"   name="Luton"    parent="ENG" />
+               code="GB-CHW"   name="Cheshire West and Chester" />
        <iso_3166_2_entry
-               code="GB-MFT"   name="Magherafelt"      parent="NIR" />
+               code="GB-CON"   name="Cornwall" />
        <iso_3166_2_entry
-               code="GB-MDW"   name="Medway"   parent="ENG" />
+               code="GB-DAL"   name="Darlington" />
        <iso_3166_2_entry
-               code="GB-MTY"   name="Merthyr Tydfil"   parent="WLS" />
+               code="GB-DER"   name="Derby" />
        <iso_3166_2_entry
-               code="GB-MDB"   name="Middlesbrough"    parent="ENG" />
+               code="GB-DUR"   name="Durham" />
        <iso_3166_2_entry
-               code="GB-MLN"   name="Midlothian"       parent="SCT" />
+               code="GB-ERY"   name="East Riding of Yorkshire" />
        <iso_3166_2_entry
-               code="GB-MIK"   name="Milton Keynes"    parent="ENG" />
+               code="GB-HAL"   name="Halton" />
        <iso_3166_2_entry
-               code="GB-MON"   name="Monmouthshire"    parent="WLS" />
+               code="GB-HPL"   name="Hartlepool" />
        <iso_3166_2_entry
-               code="GB-MRY"   name="Moray"    parent="SCT" />
+               code="GB-HEF"   name="Herefordshire" />
        <iso_3166_2_entry
-               code="GB-MYL"   name="Moyle"    parent="NIR" />
+               code="GB-IOW"   name="Isle of Wight" />
        <iso_3166_2_entry
-               code="GB-NTL"   name="Neath Port Talbot"        parent="WLS" />
+               code="GB-KHL"   name="Kingston upon Hull" />
        <iso_3166_2_entry
-               code="GB-NWP"   name="Newport"  parent="WLS" />
+               code="GB-LCE"   name="Leicester" />
        <iso_3166_2_entry
-               code="GB-NYM"   name="Newry and Mourne" parent="NIR" />
+               code="GB-LUT"   name="Luton" />
        <iso_3166_2_entry
-               code="GB-NTA"   name="Newtownabbey"     parent="NIR" />
+               code="GB-MDW"   name="Medway" />
        <iso_3166_2_entry
-               code="GB-NAY"   name="North Ayrshire"   parent="SCT" />
+               code="GB-MDB"   name="Middlesbrough" />
        <iso_3166_2_entry
-               code="GB-NDN"   name="North Down"       parent="NIR" />
+               code="GB-MIK"   name="Milton Keynes" />
        <iso_3166_2_entry
-               code="GB-NEL"   name="North East Lincolnshire"  parent="ENG" />
+               code="GB-NEL"   name="North East Lincolnshire" />
        <iso_3166_2_entry
-               code="GB-NLK"   name="North Lanarkshire"        parent="SCT" />
+               code="GB-NLN"   name="North Lincolnshire" />
        <iso_3166_2_entry
-               code="GB-NLN"   name="North Lincolnshire"       parent="ENG" />
+               code="GB-NSM"   name="North Somerset" />
        <iso_3166_2_entry
-               code="GB-NSM"   name="North Somerset"   parent="ENG" />
+               code="GB-NBL"   name="Northumberland" />
        <iso_3166_2_entry
-               code="GB-NGM"   name="Nottingham"       parent="ENG" />
+               code="GB-NGM"   name="Nottingham" />
        <iso_3166_2_entry
-               code="GB-OMH"   name="Omagh"    parent="NIR" />
+               code="GB-PTE"   name="Peterborough" />
        <iso_3166_2_entry
-               code="GB-ORR"   name="Orkney Islands"   parent="SCT" />
+               code="GB-PLY"   name="Plymouth" />
        <iso_3166_2_entry
-               code="GB-PEM"   name="Pembrokeshire"    parent="WLS" />
+               code="GB-POL"   name="Poole" />
        <iso_3166_2_entry
-               code="GB-PKN"   name="Perth and Kinross"        parent="SCT" />
+               code="GB-POR"   name="Portsmouth" />
        <iso_3166_2_entry
-               code="GB-PTE"   name="Peterborough"     parent="ENG" />
+               code="GB-RDG"   name="Reading" />
        <iso_3166_2_entry
-               code="GB-PLY"   name="Plymouth" parent="ENG" />
+               code="GB-RCC"   name="Redcar and Cleveland" />
        <iso_3166_2_entry
-               code="GB-POL"   name="Poole"    parent="ENG" />
+               code="GB-RUT"   name="Rutland" />
        <iso_3166_2_entry
-               code="GB-POR"   name="Portsmouth"       parent="ENG" />
+               code="GB-SHR"   name="Shropshire" />
        <iso_3166_2_entry
-               code="GB-POW"   name="Powys"    parent="WLS" />
+               code="GB-SLG"   name="Slough" />
        <iso_3166_2_entry
-               code="GB-RDG"   name="Reading"  parent="ENG" />
+               code="GB-SGC"   name="South Gloucestershire" />
        <iso_3166_2_entry
-               code="GB-RCC"   name="Redcar and Cleveland"     parent="ENG" />
+               code="GB-STH"   name="Southampton" />
        <iso_3166_2_entry
-               code="GB-RFW"   name="Renfrewshire"     parent="SCT" />
+               code="GB-SOS"   name="Southend-on-Sea" />
        <iso_3166_2_entry
-               code="GB-RCT"   name="Rhondda, Cynon, Taff"     parent="WLS" />
+               code="GB-STT"   name="Stockton-on-Tees" />
        <iso_3166_2_entry
-               code="GB-RUT"   name="Rutland"  parent="ENG" />
+               code="GB-STE"   name="Stoke-on-Trent" />
        <iso_3166_2_entry
-               code="GB-SCB"   name="Scottish Borders, The"    parent="SCT" />
+               code="GB-SWD"   name="Swindon" />
        <iso_3166_2_entry
-               code="GB-ZET"   name="Shetland Islands" parent="SCT" />
+               code="GB-TFW"   name="Telford and Wrekin" />
        <iso_3166_2_entry
-               code="GB-SHR"   name="Shropshire"       parent="ENG" />
+               code="GB-THR"   name="Thurrock" />
        <iso_3166_2_entry
-               code="GB-SLG"   name="Slough"   parent="ENG" />
+               code="GB-TOB"   name="Torbay" />
        <iso_3166_2_entry
-               code="GB-SAY"   name="South Ayrshire"   parent="SCT" />
+               code="GB-WRT"   name="Warrington" />
        <iso_3166_2_entry
-               code="GB-SGC"   name="South Gloucestershire"    parent="ENG" />
+               code="GB-WBK"   name="West Berkshire" />
        <iso_3166_2_entry
-               code="GB-SLK"   name="South Lanarkshire"        parent="SCT" />
+               code="GB-WNM"   name="Windsor and Maidenhead" />
        <iso_3166_2_entry
-               code="GB-STH"   name="Southampton"      parent="ENG" />
+               code="GB-WOK"   name="Wokingham" />
        <iso_3166_2_entry
-               code="GB-SOS"   name="Southend-on-Sea"  parent="ENG" />
+               code="GB-YOR"   name="York" />
+</iso_3166_subset>
+<iso_3166_subset type="Unitary authority (Wales)">
        <iso_3166_2_entry
-               code="GB-STG"   name="Stirling" parent="SCT" />
+               code="GB-BGW"   name="Blaenau Gwent" />
        <iso_3166_2_entry
-               code="GB-STT"   name="Stockton-on-Tees" parent="ENG" />
+          code="GB-BGE"        name="Bridgend;Pen-y-bont ar Ogwr" />
        <iso_3166_2_entry
-               code="GB-STE"   name="Stoke-on-Trent"   parent="ENG" />
+               code="GB-CAY"   name="Caerphilly;Caerffili" />
        <iso_3166_2_entry
-               code="GB-STB"   name="Strabane" parent="NIR" />
+               code="GB-CRF"   name="Cardiff;Caerdydd" />
        <iso_3166_2_entry
-               code="GB-SWA"   name="Swansea"  parent="WLS" />
+               code="GB-CMN"   name="Carmarthenshire;Sir Gaerfyrddin" />
        <iso_3166_2_entry
-               code="GB-SWD"   name="Swindon"  parent="ENG" />
+               code="GB-CGN"   name="Ceredigion;Sir Ceredigion" />
        <iso_3166_2_entry
-               code="GB-TFW"   name="Telford and Wrekin"       parent="ENG" />
+               code="GB-CWY"   name="Conwy" />
        <iso_3166_2_entry
-               code="GB-THR"   name="Thurrock" parent="ENG" />
+               code="GB-DEN"   name="Denbighshire;Sir Ddinbych" />
        <iso_3166_2_entry
-               code="GB-TOB"   name="Torbay"   parent="ENG" />
+               code="GB-FLN"   name="Flintshire;Sir y Fflint" />
        <iso_3166_2_entry
-               code="GB-TOF"   name="Torfaen"  parent="WLS" />
+               code="GB-GWN"   name="Gwynedd" />
        <iso_3166_2_entry
-               code="GB-VGL"   name="Vale of Glamorgan, The"   parent="WLS" />
+               code="GB-AGY"   name="Isle of Anglesey;Sir Ynys Môn" />
        <iso_3166_2_entry
-               code="GB-WRT"   name="Warrington"       parent="ENG" />
+               code="GB-MTY"   name="Merthyr Tydfil;Merthyr Tudful" />
        <iso_3166_2_entry
-               code="GB-WAR"   name="Warwickshire"     parent="ENG" />
+               code="GB-MON"   name="Monmouthshire;Sir Fynwy" />
        <iso_3166_2_entry
-               code="GB-WBX"   name="West Berkshire"   parent="ENG" />
+               code="GB-NTL"   name="Neath Port Talbot;Castell-nedd Port Talbot" />
        <iso_3166_2_entry
-               code="GB-WDU"   name="West Dunbartonshire"      parent="SCT" />
+               code="GB-NWP"   name="Newport;Casnewydd" />
        <iso_3166_2_entry
-               code="GB-WLN"   name="West Lothian"     parent="SCT" />
+               code="GB-PEM"   name="Pembrokeshire;Sir Benfro" />
        <iso_3166_2_entry
-               code="GB-WNM"   name="Windsor and Maidenhead"   parent="ENG" />
+               code="GB-POW"   name="Powys" />
        <iso_3166_2_entry
-               code="GB-WOK"   name="Wokingham"        parent="ENG" />
+               code="GB-RCT"   name="Rhondda, Cynon, Taff;Rhondda, Cynon,Taf" />
        <iso_3166_2_entry
-               code="GB-WRX"   name="Wrexham"  parent="WLS" />
+               code="GB-SWA"   name="Swansea;Abertawe" />
        <iso_3166_2_entry
-               code="GB-YOR"   name="York"     parent="ENG" />
+               code="GB-TOF"   name="Torfaen;Tor-faen" />
+       <iso_3166_2_entry
+               code="GB-VGL"   name="Vale of Glamorgan, The;Bro Morgannwg" />
+       <iso_3166_2_entry
+               code="GB-WRX"   name="Wrexham;Wrecsam" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Grenada -->
@@ -3594,7 +3705,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Guernsey -->
-<iso_3166_country code="GG" />
+<iso_3166_country code="GG">
+</iso_3166_country>
        <!-- Ghana -->
 <iso_3166_country code="GH">
 <iso_3166_subset type="Region">
@@ -3619,6 +3731,18 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="GH-WP"    name="Western" />
 </iso_3166_subset>
+       <!-- Greenland -->
+<iso_3166_country code="GL" />
+<iso_3166_subset type="Municipality">
+       <iso_3166_2_entry
+          code="GL-KU" name="Kommune Kujalleq" />
+       <iso_3166_2_entry
+          code="GL-SM" name="Kommuneqarfik Sermersooq" />
+       <iso_3166_2_entry
+          code="GL-QA" name="Qaasuitsup Kommunia" />
+       <iso_3166_2_entry
+          code="GL-QE" name="Qeqqata Kommunia" />
+</iso_3166_subset>
 </iso_3166_country>
        <!-- Gambia -->
 <iso_3166_country code="GM">
@@ -3659,7 +3783,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 <iso_3166_subset type="Special zone">
        <iso_3166_2_entry
-               code="GN C"     name="Conakry" />
+               code="GN-C"     name="Conakry" />
 </iso_3166_subset>
 <iso_3166_subset type="Prefecture">
        <iso_3166_2_entry
@@ -3785,7 +3909,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 <iso_3166_subset type="Self-governed part">
        <iso_3166_2_entry
-               code="GR-69"    name="Ágion Óros" />
+               code="GR-69"    name="Agio Oros" />
 </iso_3166_subset>
 <iso_3166_subset type="Department">
        <iso_3166_2_entry
@@ -3825,13 +3949,13 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="GR-51"    name="Grevena"  parent="C" />
        <iso_3166_2_entry
-               code="GR-14"    name="Aleia"    parent="G" />
+               code="GR-14"    name="Ileia"    parent="G" />
        <iso_3166_2_entry
-               code="GR-53"    name="Amathia"  parent="B" />
+               code="GR-53"    name="Imathia"  parent="B" />
        <iso_3166_2_entry
-               code="GR-33"    name="Aoannina" parent="D" />
+               code="GR-33"    name="Ioannina" parent="D" />
        <iso_3166_2_entry
-               code="GR-91"    name="Arakleio" parent="M" />
+               code="GR-91"    name="Irakleio" parent="M" />
        <iso_3166_2_entry
                code="GR-41"    name="Karditsa" parent="E" />
        <iso_3166_2_entry
@@ -3839,7 +3963,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="GR-55"    name="Kavala"   parent="A" />
        <iso_3166_2_entry
-               code="GR-23"    name="Kefalonia"        parent="F" />
+               code="GR-23"    name="Kefallonia"       parent="F" />
        <iso_3166_2_entry
                code="GR-22"    name="Kerkyra"  parent="F" />
        <iso_3166_2_entry
@@ -3861,7 +3985,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="GR-83"    name="Lesvos"   parent="K" />
        <iso_3166_2_entry
-               code="GR-43"    name="Magnisias"        parent="E" />
+               code="GR-43"    name="Magnisia" parent="E" />
        <iso_3166_2_entry
                code="GR-17"    name="Messinia" parent="J" />
        <iso_3166_2_entry
@@ -3885,9 +4009,9 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="GR-44"    name="Trikala"  parent="E" />
        <iso_3166_2_entry
-               code="GR-03"    name="Eoiotia"  parent="H" />
+               code="GR-03"    name="Voiotia"  parent="H" />
        <iso_3166_2_entry
-               code="GR-72"    name="Janthi"   parent="A" />
+               code="GR-72"    name="Xanthi"   parent="A" />
        <iso_3166_2_entry
                code="GR-21"    name="Zakynthos"        parent="F" />
 </iso_3166_subset>
@@ -4164,6 +4288,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="HU-EG"    name="Eger" />
        <iso_3166_2_entry
+               code="HU-ER"    name="Érd" />
+       <iso_3166_2_entry
                code="HU-GY"    name="Győr" />
        <iso_3166_2_entry
                code="HU-HV"    name="Hódmezővásárhely" />
@@ -4741,7 +4867,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="IT-LU"    name="Lucca"    parent="52" />
        <iso_3166_2_entry
-               code="IT-SC"    name="Macerata" parent="57" />
+               code="IT-MC"    name="Macerata" parent="57" />
        <iso_3166_2_entry
                code="IT-MN"    name="Mantova"  parent="25" />
        <iso_3166_2_entry
@@ -4781,7 +4907,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="IT-PG"    name="Perugia"  parent="55" />
        <iso_3166_2_entry
-               code="IT-PS"    name="Pesaro e Urbino"  parent="57" />
+               code="IT-PU"    name="Pesaro e Urbino"  parent="57" />
        <iso_3166_2_entry
                code="IT-PE"    name="Pescara"  parent="65" />
        <iso_3166_2_entry
@@ -5174,42 +5300,42 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Comorros -->
 <iso_3166_country code="KM">
-<iso_3166_subset type="Autonomous island">
+<iso_3166_subset type="Island">
        <iso_3166_2_entry
-               code="KM-A"     name="Anjouan Ndzouani" />
+               code="KM-A"     name="Andjouân (Anjwān)" />
        <iso_3166_2_entry
-               code="KM-G"     name="Grande Comore Ngazidja" />
+               code="KM-G"     name="Andjazîdja (Anjazījah)" />
        <iso_3166_2_entry
-               code="KM-M"     name="Mohéli Moili" />
+               code="KM-M"     name="Moûhîlî (Mūhīlī)" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- North Korea -->
 <iso_3166_country code="KP">
 <iso_3166_subset type="Capital city">
        <iso_3166_2_entry
-               code="KP-01"    name="Pyongyang-si" />
+               code="KP-01"    name="P’yŏngyang" />
 </iso_3166_subset>
 <iso_3166_subset type="Special city">
        <iso_3166_2_entry
-               code="KP-13"    name="Najin Sonbong-si" />
+               code="KP-13"    name="Nasŏn (Najin-Sŏnbong)" />
 </iso_3166_subset>
 <iso_3166_subset type="Province">
        <iso_3166_2_entry
-               code="KP-02"    name="Pyongannam-do" />
+               code="KP-02"    name="P’yŏngan-namdo" />
        <iso_3166_2_entry
-               code="KP-03"    name="Pyonganbuk-do" />
+               code="KP-03"    name="P’yŏngan-bukto" />
        <iso_3166_2_entry
                code="KP-04"    name="Chagang-do" />
        <iso_3166_2_entry
-               code="KP-05"    name="Hamgyongnam-do" />
+               code="KP-05"    name="Hwanghae-namdo" />
        <iso_3166_2_entry
-               code="KP-06"    name="Hamgyongbuk-do" />
+               code="KP-06"    name="Hwanghae-bukto" />
        <iso_3166_2_entry
-               code="KP-07"    name="Kangwon-do" />
+               code="KP-07"    name="Kangwŏn-do" />
        <iso_3166_2_entry
-               code="KP-08"    name="Hwanghaenam-do" />
+               code="KP-08"    name="Hamgyŏng-namdo" />
        <iso_3166_2_entry
-               code="KP-09"    name="Hwanghaebuk-do" />
+               code="KP-09"    name="Hamgyŏng-bukto" />
        <iso_3166_2_entry
                code="KP-10"    name="Yanggang-do" />
 </iso_3166_subset>
@@ -5404,57 +5530,77 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Sri Lanka -->
 <iso_3166_country code="LK">
+<iso_3166_subset type="Province">
+       <iso_3166_2_entry
+               code="LK-1"     name="Basnāhira paḷāta"     />
+       <iso_3166_2_entry
+               code="LK-3"     name="Dakuṇu paḷāta" />
+       <iso_3166_2_entry
+               code="LK-2"     name="Madhyama paḷāta" />
+       <iso_3166_2_entry
+               code="LK-5"     name="Næ̆gĕnahira paḷāta" />
+       <iso_3166_2_entry
+               code="LK-9"     name="Sabaragamuva paḷāta" />
+       <iso_3166_2_entry
+               code="LK-7"     name="Uturumæ̆da paḷāta" />
+       <iso_3166_2_entry
+               code="LK-4"     name="Uturu paḷāta" />
+       <iso_3166_2_entry
+               code="LK-8"     name="Ūva paḷāta" />
+       <iso_3166_2_entry
+               code="LK-6"     name="Vayamba paḷāta" />
+</iso_3166_subset>
 <iso_3166_subset type="District">
        <iso_3166_2_entry
-               code="LK-52"    name="Ampara" />
+               code="LK-52"    name="Ampāara" parent="5" />
        <iso_3166_2_entry
-               code="LK-71"    name="Anuradhapura" />
+               code="LK-71"    name="Anurādhapura"    parent="7" />
        <iso_3166_2_entry
-               code="LK-81"    name="Badulla" />
+               code="LK-81"    name="Badulla"  parent="8" />
        <iso_3166_2_entry
-               code="LK-51"    name="Batticaloa" />
+               code="LK-51"    name="Maḍakalapuva"   parent="5" />
        <iso_3166_2_entry
-               code="LK-11"    name="Colombo" />
+               code="LK-11"    name="Kŏḷamba"       parent="1" />
        <iso_3166_2_entry
-               code="LK-31"    name="Galle" />
+               code="LK-31"    name="Gālla"   parent="3" />
        <iso_3166_2_entry
-               code="LK-12"    name="Gampaha" />
+               code="LK-12"    name="Gampaha"  parent="1" />
        <iso_3166_2_entry
-               code="LK-33"    name="Hambantota" />
+               code="LK-33"    name="Hambantŏṭa"    parent="3" />
        <iso_3166_2_entry
-               code="LK-41"    name="Jaffna" />
+               code="LK-41"    name="Yāpanaya"        parent="4" />
        <iso_3166_2_entry
-               code="LK-13"    name="Kalutara" />
+               code="LK-13"    name="Kaḷutara"       parent="1" />
        <iso_3166_2_entry
-               code="LK-21"    name="Kandy" />
+               code="LK-21"    name="Mahanuvara"       parent="2" />
        <iso_3166_2_entry
-               code="LK-92"    name="Kegalla" />
+               code="LK-92"    name="Kægalla" parent="9" />
        <iso_3166_2_entry
-               code="LK-42"    name="Kilinochchi" />
+               code="LK-42"    name="Kilinŏchchi"     parent="4" />
        <iso_3166_2_entry
-               code="LK-61"    name="Kurunegala" />
+               code="LK-61"    name="Kuruṇægala"    parent="6" />
        <iso_3166_2_entry
-               code="LK-43"    name="Mannar" />
+               code="LK-43"    name="Mannārama"       parent="4" />
        <iso_3166_2_entry
-               code="LK-22"    name="Matale" />
+               code="LK-22"    name="Mātale"  parent="2" />
        <iso_3166_2_entry
-               code="LK-32"    name="Matara" />
+               code="LK-32"    name="Mātara"  parent="3" />
        <iso_3166_2_entry
-               code="LK-82"    name="Monaragala" />
+               code="LK-82"    name="Mŏṇarāgala"   parent="8" />
        <iso_3166_2_entry
-               code="LK-45"    name="Mullaittivu" />
+               code="LK-45"    name="Mulativ"  parent="4" />
        <iso_3166_2_entry
-               code="LK-23"    name="Nuwara Eliya" />
+               code="LK-23"    name="Nuvara Ĕliya"    parent="2" />
        <iso_3166_2_entry
-               code="LK-72"    name="Polonnaruwa" />
+               code="LK-72"    name="Pŏḷŏnnaruva"  parent="7" />
        <iso_3166_2_entry
-               code="LK-62"    name="Puttalum" />
+               code="LK-62"    name="Puttalama"        parent="6" />
        <iso_3166_2_entry
-               code="LK-91"    name="Ratnapura" />
+               code="LK-91"    name="Ratnapura"        parent="9" />
        <iso_3166_2_entry
-               code="LK-53"    name="Trincomalee" />
+               code="LK-53"    name="Trikuṇāmalaya" parent="5" />
        <iso_3166_2_entry
-               code="LK-44"    name="Vavuniya" />
+               code="LK-44"    name="Vavuniyāva"      parent="4" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Liberia -->
@@ -5552,60 +5698,58 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <!-- Latvia -->
 <iso_3166_country code="LV">
 <iso_3166_subset type="District">
-       <!-- We should probably add a "District" suffix here, but is it "Rajon" -->
-       <!-- or "Apriņķis"? -->
        <iso_3166_2_entry
-               code="LV-AI"    name="Aizkraukle" />
+               code="LV-AI"    name="Aizkraukle Apriņķis" />
        <iso_3166_2_entry
-               code="LV-AL"    name="Alūksne" />
+               code="LV-AL"    name="Alūksne Apriņķis" />
        <iso_3166_2_entry
-               code="LV-BL"    name="Balvi" />
+               code="LV-BL"    name="Balvi Apriņķis" />
        <iso_3166_2_entry
-               code="LV-BU"    name="Bauska" />
+               code="LV-BU"    name="Bauska Apriņķis" />
        <iso_3166_2_entry
-               code="LV-CE"    name="Cēsis" />
+               code="LV-CE"    name="Cēsis Apriņķis" />
        <iso_3166_2_entry
-               code="LV-DA"    name="Daugavpils" />
+               code="LV-DA"    name="Daugavpils Apriņķis" />
        <iso_3166_2_entry
-               code="LV-DO"    name="Dobele" />
+               code="LV-DO"    name="Dobele Apriņķis" />
        <iso_3166_2_entry
-               code="LV-GU"    name="Gulbene" />
+               code="LV-GU"    name="Gulbene Apriņķis" />
        <iso_3166_2_entry
-               code="LV-JK"    name="Jēkabpils" />
+               code="LV-JK"    name="Jēkabpils Apriņķis" />
        <iso_3166_2_entry
-               code="LV-JL"    name="Jelgava" />
+               code="LV-JL"    name="Jelgava Apriņķis" />
        <iso_3166_2_entry
-               code="LV-KR"    name="Krāslava" />
+               code="LV-KR"    name="Krāslava Apriņķis" />
        <iso_3166_2_entry
-               code="LV-KU"    name="Kuldīga" />
+               code="LV-KU"    name="Kuldīga Apriņķis" />
        <iso_3166_2_entry
-               code="LV-LE"    name="Liepāja" />
+               code="LV-LE"    name="Liepāja Apriņķis" />
        <iso_3166_2_entry
-               code="LV-LM"    name="Limbaži" />
+               code="LV-LM"    name="Limbaži Apriņķis" />
        <iso_3166_2_entry
-               code="LV-LU"    name="Ludza" />
+               code="LV-LU"    name="Ludza Apriņķis" />
        <iso_3166_2_entry
-               code="LV-MA"    name="Madona" />
+               code="LV-MA"    name="Madona Apriņķis" />
        <iso_3166_2_entry
-               code="LV-OG"    name="Ogre" />
+               code="LV-OG"    name="Ogre Apriņķis" />
        <iso_3166_2_entry
-               code="LV-PR"    name="Preiļi" />
+               code="LV-PR"    name="Preiļi Apriņķis" />
        <iso_3166_2_entry
-               code="LV-RE"    name="Rēzekne" />
+               code="LV-RE"    name="Rēzekne Apriņķis" />
        <iso_3166_2_entry
-               code="LV-RI"    name="Rīga" />
+               code="LV-RI"    name="Rīga Apriņķis" />
        <iso_3166_2_entry
-               code="LV-SA"    name="Saldus" />
+               code="LV-SA"    name="Saldus Apriņķis" />
        <iso_3166_2_entry
-               code="LV-TA"    name="Talsi" />
+               code="LV-TA"    name="Talsi Apriņķis" />
        <iso_3166_2_entry
-               code="LV-TU"    name="Tukums" />
+               code="LV-TU"    name="Tukums Apriņķis" />
        <iso_3166_2_entry
-               code="LV-VK"    name="Valka" />
+               code="LV-VK"    name="Valka Apriņķis" />
        <iso_3166_2_entry
-               code="LV-VM"    name="Valmiera" />
+               code="LV-VM"    name="Valmiera Apriņķis" />
        <iso_3166_2_entry
-               code="LV-VE"    name="Ventspils" />
+               code="LV-VE"    name="Ventspils Apriņķis" />
 </iso_3166_subset>
 <iso_3166_subset type="City">
        <iso_3166_2_entry
@@ -5626,16 +5770,14 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Libya -->
 <iso_3166_country code="LY">
-<iso_3166_subset type="Municipality">
-       <iso_3166_2_entry
-               code="LY-AJ"    name="Ajdābiyā" />
+<iso_3166_subset type="Popularates">
        <iso_3166_2_entry
                code="LY-BU"    name="Al Buţnān" />
        <iso_3166_2_entry
-               code="LY-HZ"    name="Al Ḩizām al Akhḑar" />
-       <iso_3166_2_entry
                code="LY-JA"    name="Al Jabal al Akhḑar" />
        <iso_3166_2_entry
+               code="LY-JG"    name="Al Jabal al Gharbī" />
+       <iso_3166_2_entry
                code="LY-JI"    name="Al Jifārah" />
        <iso_3166_2_entry
                code="LY-JU"    name="Al Jufrah" />
@@ -5646,101 +5788,75 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="LY-MB"    name="Al Marqab" />
        <iso_3166_2_entry
-               code="LY-QT"    name="Al Qaţrūn" />
-       <iso_3166_2_entry
-               code="LY-QB"    name="Al Qubbah" />
-       <iso_3166_2_entry
-               code="LY-WA"    name="Al Wāḩah" />
+               code="LY-WA"    name="Al Wāḩāt" />
        <iso_3166_2_entry
                code="LY-NQ"    name="An Nuqaţ al Khams" />
        <iso_3166_2_entry
-               code="LY-SH"    name="Ash Shāţi'" />
-       <iso_3166_2_entry
                code="LY-ZA"    name="Az Zāwiyah" />
        <iso_3166_2_entry
                code="LY-BA"    name="Banghāzī" />
        <iso_3166_2_entry
-               code="LY-BW"    name="Banī Walīd" />
-       <iso_3166_2_entry
                code="LY-DR"    name="Darnah" />
        <iso_3166_2_entry
-               code="LY-GD"    name="Ghadāmis" />
-       <iso_3166_2_entry
-               code="LY-GR"    name="Gharyān" />
-       <iso_3166_2_entry
                code="LY-GT"    name="Ghāt" />
        <iso_3166_2_entry
                code="LY-JB"    name="Jaghbūb" />
        <iso_3166_2_entry
                code="LY-MI"    name="Mişrātah" />
        <iso_3166_2_entry
-               code="LY-MZ"    name="Mizdah" />
-       <iso_3166_2_entry
                code="LY-MQ"    name="Murzuq" />
        <iso_3166_2_entry
                code="LY-NL"    name="Nālūt" />
        <iso_3166_2_entry
                code="LY-SB"    name="Sabhā" />
        <iso_3166_2_entry
-               code="LY-SS"    name="Şabrātah Şurmān" />
-       <iso_3166_2_entry
                code="LY-SR"    name="Surt" />
        <iso_3166_2_entry
-               code="LY-TN"    name="Tājūrā' wa an Nawāḩī al Arbāʻ" />
-       <iso_3166_2_entry
                code="LY-TB"    name="Ţarābulus" />
        <iso_3166_2_entry
-               code="LY-TM"    name="Tarhūnah-Masallātah" />
-       <iso_3166_2_entry
                code="LY-WD"    name="Wādī al Ḩayāt" />
        <iso_3166_2_entry
-               code="LY-YJ"    name="Yafran-Jādū" />
+               code="LY-WS"    name="Wādī ash Shāţiʾ" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Morocco -->
 <iso_3166_country code="MA">
 <iso_3166_subset type="Economic region">
        <iso_3166_2_entry
-               code="MA 09"    name="Chaouia-Ouardigha" />
+               code="MA-09"    name="Chaouia-Ouardigha" />
        <iso_3166_2_entry
-               code="MA 10"    name="Doukhala-Abda" />
+               code="MA-10"    name="Doukhala-Abda" />
        <iso_3166_2_entry
-               code="MA 05"    name="Fès-Boulemane" />
+               code="MA-05"    name="Fès-Boulemane" />
        <iso_3166_2_entry
-               code="MA 02"    name="Gharb-Chrarda-Beni Hssen" />
+               code="MA-02"    name="Gharb-Chrarda-Beni Hssen" />
        <iso_3166_2_entry
-               code="MA 08"    name="Grand Casablanca" />
+               code="MA-08"    name="Grand Casablanca" />
        <iso_3166_2_entry
-               code="MA 14"    name="Guelmim-Es Smara" />
+               code="MA-14"    name="Guelmim-Es Smara" />
        <iso_3166_2_entry
-               code="MA 15"    name="Laâyoune-Boujdour-Sakia el Hamra" />
+               code="MA-15"    name="Laâyoune-Boujdour-Sakia el Hamra" />
        <iso_3166_2_entry
-               code="MA 04"    name="L'Oriental" />
+               code="MA-04"    name="L'Oriental" />
        <iso_3166_2_entry
-               code="MA 11"    name="Marrakech-Tensift-Al Haouz" />
+               code="MA-11"    name="Marrakech-Tensift-Al Haouz" />
        <iso_3166_2_entry
-               code="MA 06"    name="Meknès-Tafilalet" />
+               code="MA-06"    name="Meknès-Tafilalet" />
        <iso_3166_2_entry
-               code="MA 16"    name="Oued ed Dahab-Lagouira" />
+               code="MA-16"    name="Oued ed Dahab-Lagouira" />
        <iso_3166_2_entry
-               code="MA 07"    name="Rabat-Salé-Zemmour-Zaer" />
+               code="MA-07"    name="Rabat-Salé-Zemmour-Zaer" />
        <iso_3166_2_entry
-               code="MA 13"    name="Sous-Massa-Draa" />
+               code="MA-13"    name="Sous-Massa-Draa" />
        <iso_3166_2_entry
-               code="MA 12"    name="Tadla-Azilal" />
+               code="MA-12"    name="Tadla-Azilal" />
        <iso_3166_2_entry
-               code="MA 01"    name="Tanger-Tétouan" />
+               code="MA-01"    name="Tanger-Tétouan" />
        <iso_3166_2_entry
-               code="MA 03"    name="Taza-Al Hoceima-Taounate" />
+               code="MA-03"    name="Taza-Al Hoceima-Taounate" />
 </iso_3166_subset>
 <iso_3166_subset type="Province">
        <iso_3166_2_entry
-               code="MA-AGD"   name="Agadir"   parent="13" />
-       <iso_3166_2_entry
-               code="MA-BAH"   name="Aït Baha"        parent="13" />
-       <iso_3166_2_entry
-               code="MA-MEL"   name="Aït Melloul"     parent="13" />
-       <iso_3166_2_entry
                code="MA-HAO"   name="Al Haouz" parent="11" />
        <iso_3166_2_entry
                code="MA-HOC"   name="Al Hoceïma"      parent="03" />
@@ -5759,12 +5875,12 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="MA-BOM"   name="Boulemane"        parent="05" />
        <iso_3166_2_entry
-               code="MA-CAS"   name="Casablanca [Dar el Beïda]"       parent="08" />
-       <iso_3166_2_entry
-               code="MA-CHE"   name="Chefchaouene"     parent="01" />
+               code="MA-CHE"   name="Chefchaouen"      parent="01" />
        <iso_3166_2_entry
                code="MA-CHI"   name="Chichaoua"        parent="11" />
        <iso_3166_2_entry
+               code="MA-CHT"   name="Chtouka-Ait Baha" parent="13" />
+       <iso_3166_2_entry
                code="MA-HAJ"   name="El Hajeb" parent="06" />
        <iso_3166_2_entry
                code="MA-JDI"   name="El Jadida"        parent="10" />
@@ -5775,17 +5891,15 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="MA-ESM"   name="Es Smara (EH)"    parent="14" />
        <iso_3166_2_entry
-               code="MA-FES"   name="Fès"     parent="05" />
-       <iso_3166_2_entry
                code="MA-FIG"   name="Figuig"   parent="04" />
        <iso_3166_2_entry
                code="MA-GUE"   name="Guelmim"  parent="14" />
        <iso_3166_2_entry
                code="MA-IFR"   name="Ifrane"   parent="06" />
        <iso_3166_2_entry
-               code="MA-JRA"   name="Jerada"   parent="04" />
+               code="MA-JRA"   name="Jrada"    parent="04" />
        <iso_3166_2_entry
-               code="MA-KES"   name="Kelaat Sraghna"   parent="11" />
+               code="MA-KES"   name="Kelaat es Sraghna"        parent="11" />
        <iso_3166_2_entry
                code="MA-KEN"   name="Kénitra" parent="02" />
        <iso_3166_2_entry
@@ -5797,22 +5911,20 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="MA-LAA"   name="Laâyoune (EH)"   parent="15" />
        <iso_3166_2_entry
-               code="MA-LAP"   name="Larache"  parent="01" />
+               code="MA-LAR"   name="Larache"  parent="01" />
        <iso_3166_2_entry
-               code="MA-MAR"   name="Marrakech"        parent="11" />
+               code="MA-MED"   name="Médiouna"        parent="08" />
        <iso_3166_2_entry
-               code="MA-MEK"   name="Meknsès" parent="06" />
+               code="MA-MOU"   name="Moulay Yacoub"    parent="05" />
        <iso_3166_2_entry
                code="MA-NAD"   name="Nador"    parent="04" />
        <iso_3166_2_entry
+               code="MA-NOU"   name="Nouaceur" parent="08" />
+       <iso_3166_2_entry
                code="MA-OUA"   name="Ouarzazate"       parent="13" />
        <iso_3166_2_entry
                code="MA-OUD"   name="Oued ed Dahab (EH)"       parent="16" />
        <iso_3166_2_entry
-               code="MA-OUJ"   name="Oujda"    parent="04" />
-       <iso_3166_2_entry
-               code="MA-RBA"   name="Rabat-Salé"      parent="07" />
-       <iso_3166_2_entry
                code="MA-SAF"   name="Safi"     parent="10" />
        <iso_3166_2_entry
                code="MA-SEF"   name="Sefrou"   parent="05" />
@@ -5821,52 +5933,136 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="MA-SIK"   name="Sidl Kacem"       parent="02" />
        <iso_3166_2_entry
-               code="MA-TNG"   name="Tanger"   parent="01" />
-       <iso_3166_2_entry
                code="MA-TNT"   name="Tan-Tan"  parent="14" />
        <iso_3166_2_entry
                code="MA-TAO"   name="Taounate" parent="03" />
        <iso_3166_2_entry
-               code="MA-TAR"   name="Taroudannt"       parent="13" />
+               code="MA-TAI"   name="Taourirt" parent="04" />
+       <iso_3166_2_entry
+               code="MA-TAR"   name="Taroudant"        parent="13" />
        <iso_3166_2_entry
                code="MA-TAT"   name="Tata"     parent="14" />
        <iso_3166_2_entry
                code="MA-TAZ"   name="Taza"     parent="03" />
        <iso_3166_2_entry
-               code="MA-TET"   name="Tétouan" parent="01" />
-       <iso_3166_2_entry
                code="MA-TIZ"   name="Tiznit"   parent="13" />
+       <iso_3166_2_entry
+          code="MA-ZAG"        name="Zagora"   parent="13" />
+</iso_3166_subset>
+<iso_3166_subset type="Prefecture">
+       <iso_3166_2_entry
+               code="MA-AGD"   name="Agadir-Ida-Outanane"      parent="13" />
+       <iso_3166_2_entry
+               code="MA-AOU"   name="Aousserd" parent="16" />
+       <iso_3166_2_entry
+               code="MA-CAS"   name="Casablanca [Dar el Beïda]"       parent="08" />
+       <iso_3166_2_entry
+               code="MA-FAH"   name="Fahs-Beni Makada" parent="01" />
+       <iso_3166_2_entry
+               code="MA-FES"   name="Fès-Dar-Dbibegh" parent="05" />
+       <iso_3166_2_entry
+               code="MA-INE"   name="Inezgane-Ait Melloul"     parent="13" />
+       <iso_3166_2_entry
+               code="MA-MMD"   name="Marrakech-Medina" parent="11" />
+       <iso_3166_2_entry
+               code="MA-MMN"   name="Marrakech-Menara" parent="11" />
+       <iso_3166_2_entry
+               code="MA-MEK"   name="Meknès"  parent="06" />
+       <iso_3166_2_entry
+               code="MA-MOH"   name="Mohammadia"       parent="08" />
+       <iso_3166_2_entry
+               code="MA-OUJ"   name="Oujda-Angad"      parent="04" />
+       <iso_3166_2_entry
+               code="MA-RAB"   name="Rabat"    parent="07" />
+       <iso_3166_2_entry
+               code="MA-SAL"   name="Salé"    parent="07" />
+       <iso_3166_2_entry
+               code="MA-SYB"   name="Sidi Youssef Ben Ali"     parent="11" />
+       <iso_3166_2_entry
+               code="MA-SKH"   name="Skhirate-Témara" parent="07" />
+       <iso_3166_2_entry
+               code="MA-TNG"   name="Tanger-Assilah"   parent="01" />
+       <iso_3166_2_entry
+               code="MA-TET"   name="Tétouan" parent="01" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Moldova -->
 <iso_3166_country code="MD">
-<iso_3166_subset type="Autonomous territory">
+<iso_3166_subset type="Autonomous territorial unit">
        <iso_3166_2_entry
-               code="MD-GA"    name="Găgăuzia, Unitate Teritorială Autonomă" />
+               code="MD-GA"    name="Găgăuzia, Unitatea teritorială autonomă" />
 </iso_3166_subset>
 <iso_3166_subset type="City">
        <iso_3166_2_entry
-               code="MD-CU"    name="Chişinău" />
+               code="MD-BA"    name="Bălți" />
+       <iso_3166_2_entry
+               code="MD-BD"    name="Tighina" />
+       <iso_3166_2_entry
+               code="MD-CU"    name="Chișinău" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
        <iso_3166_2_entry
-               code="MD-BA"    name="Bălţi" />
+               code="MD-AN"    name="Anenii Noi" />
+       <iso_3166_2_entry
+               code="MD-BS"    name="Basarabeasca" />
+       <iso_3166_2_entry
+               code="MD-BR"    name="Briceni" />
        <iso_3166_2_entry
                code="MD-CA"    name="Cahul" />
        <iso_3166_2_entry
-               code="MD-CH"    name="Chişinău" />
+               code="MD-CT"    name="Cantemir" />
+       <iso_3166_2_entry
+               code="MD-CL"    name="Călărași" />
+       <iso_3166_2_entry
+               code="MD-CS"    name="Căușeni" />
        <iso_3166_2_entry
-               code="MD-ED"    name="Edineţ" />
+               code="MD-CM"    name="Cimișlia" />
        <iso_3166_2_entry
-               code="MD-LA"    name="Lăpuşna" />
+               code="MD-CR"    name="Criuleni" />
+       <iso_3166_2_entry
+               code="MD-DO"    name="Dondușeni" />
+       <iso_3166_2_entry
+               code="MD-DR"    name="Drochia" />
+       <iso_3166_2_entry
+               code="MD-DU"    name="Dubăsari" />
+       <iso_3166_2_entry
+               code="MD-ED"    name="Edineț" />
+       <iso_3166_2_entry
+               code="MD-FA"    name="Fălești" />
+       <iso_3166_2_entry
+               code="MD-FL"    name="Florești" />
+       <iso_3166_2_entry
+               code="MD-GL"    name="Glodeni" />
+       <iso_3166_2_entry
+               code="MD-HI"    name="Hîncești" />
+       <iso_3166_2_entry
+               code="MD-IA"    name="Ialoveni" />
+       <iso_3166_2_entry
+               code="MD-LE"    name="Leova" />
+       <iso_3166_2_entry
+               code="MD-NI"    name="Nisporeni" />
+       <iso_3166_2_entry
+               code="MD-OC"    name="Ocnița" />
        <iso_3166_2_entry
                code="MD-OR"    name="Orhei" />
        <iso_3166_2_entry
+               code="MD-RE"    name="Rezina" />
+       <iso_3166_2_entry
+               code="MD-RI"    name="Rîșcani" />
+       <iso_3166_2_entry
+               code="MD-SI"    name="Sîngerei" />
+       <iso_3166_2_entry
                code="MD-SO"    name="Soroca" />
        <iso_3166_2_entry
+               code="MD-ST"    name="Strășeni" />
+       <iso_3166_2_entry
+               code="MD-SD"    name="Șoldănești" />
+       <iso_3166_2_entry
+               code="MD-SV"    name="Ștefan Vodă" />
+       <iso_3166_2_entry
                code="MD-TA"    name="Taraclia" />
        <iso_3166_2_entry
-               code="MD-TI"    name="Tighina" />
+               code="MD-TE"    name="Telenești" />
        <iso_3166_2_entry
                code="MD-UN"    name="Ungheni" />
 </iso_3166_subset>
@@ -5943,55 +6139,61 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- Marshall Islands -->
 <iso_3166_country code="MH">
+<iso_3166_subset type="Chains (of islands)">
+       <iso_3166_2_entry
+               code="MH-L"     name="Ralik chain" />
+       <iso_3166_2_entry
+               code="MH-T"     name="Ratak chain" />
+</iso_3166_subset>
 <iso_3166_subset type="Municipality">
        <iso_3166_2_entry
-               code="MH-ALL"   name="Ailinglapalap" />
+               code="MH-ALL"   name="Ailinglaplap"     parent="L" />
        <iso_3166_2_entry
-               code="MH-ALK"   name="Ailuk" />
+               code="MH-ALK"   name="Ailuk"    parent="T" />
        <iso_3166_2_entry
-               code="MH-ARN"   name="Arno" />
+               code="MH-ARN"   name="Arno"     parent="T" />
        <iso_3166_2_entry
-               code="MH-AUR"   name="Aur" />
+               code="MH-AUR"   name="Aur"      parent="T" />
        <iso_3166_2_entry
-               code="MH-EBO"   name="Ebon" />
+               code="MH-EBO"   name="Ebon"     parent="L" />
        <iso_3166_2_entry
-               code="MH-ENI"   name="Eniwetok" />
+               code="MH-ENI"   name="Enewetak" parent="L" />
        <iso_3166_2_entry
-               code="MH-JAL"   name="Jaluit" />
+               code="MH-JAB"   name="Jabat"    parent="L" />
        <iso_3166_2_entry
-               code="MH-KIL"   name="Kili" />
+               code="MH-JAL"   name="Jaluit"   parent="L" />
        <iso_3166_2_entry
-               code="MH-KWA"   name="Kwajalein" />
+               code="MH-KIL"   name="Kili"     parent="L" />
        <iso_3166_2_entry
-               code="MH-LAE"   name="Lae" />
+               code="MH-KWA"   name="Kwajalein"        parent="L" />
        <iso_3166_2_entry
-               code="MH-LIB"   name="Lib" />
+               code="MH-LAE"   name="Lae"      parent="L" />
        <iso_3166_2_entry
-               code="MH-LIK"   name="Likiep" />
+               code="MH-LIB"   name="Lib"      parent="L" />
        <iso_3166_2_entry
-               code="MH-MAJ"   name="Majuro" />
+               code="MH-LIK"   name="Likiep"   parent="T" />
        <iso_3166_2_entry
-               code="MH-MAL"   name="Maloelap" />
+               code="MH-MAJ"   name="Majuro"   parent="T" />
        <iso_3166_2_entry
-               code="MH-MEJ"   name="Mejit" />
+               code="MH-MAL"   name="Maloelap" parent="T" />
        <iso_3166_2_entry
-               code="MH-MIL"   name="Mili" />
+               code="MH-MEJ"   name="Mejit"    parent="T" />
        <iso_3166_2_entry
-               code="MH-NMK"   name="Namorik" />
+               code="MH-MIL"   name="Mili"     parent="T" />
        <iso_3166_2_entry
-               code="MH-NMU"   name="Namu" />
+               code="MH-NMK"   name="Namdrik"  parent="L" />
        <iso_3166_2_entry
-               code="MH-RON"   name="Rongelap" />
+               code="MH-NMU"   name="Namu"     parent="L" />
        <iso_3166_2_entry
-               code="MH-UJA"   name="Ujae" />
+               code="MH-RON"   name="Rongelap" parent="L" />
        <iso_3166_2_entry
-               code="MH-UJL"   name="Ujelang" />
+               code="MH-UJA"   name="Ujae"     parent="L" />
        <iso_3166_2_entry
-               code="MH-UTI"   name="Utirik" />
+               code="MH-UTI"   name="Utirik"   parent="T" />
        <iso_3166_2_entry
-               code="MH-WTN"   name="Wotho" />
+               code="MH-WTN"   name="Wotho"    parent="L" />
        <iso_3166_2_entry
-               code="MH-WTJ"   name="Wotje" />
+               code="MH-WTJ"   name="Wotje"    parent="T" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Macedonia -->
@@ -6549,11 +6751,11 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="MW">
 <iso_3166_subset type="Region">
        <iso_3166_2_entry
-               code="MW C"     name="Central" />
+               code="MW-C"     name="Central Region" />
        <iso_3166_2_entry
-               code="MW N"     name="Northern" />
+               code="MW-N"     name="Northern Region" />
        <iso_3166_2_entry
-               code="MW S"     name="Southern (Malawi)" />
+               code="MW-S"     name="Southern Region" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
        <iso_3166_2_entry
@@ -6575,7 +6777,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="MW-KS"    name="Kasungu"  parent="C" />
        <iso_3166_2_entry
-               code="MW-LK"    name="Likoma Island"    parent="N" />
+               code="MW-LK"    name="Likoma"   parent="N" />
        <iso_3166_2_entry
                code="MW-LI"    name="Lilongwe" parent="C" />
        <iso_3166_2_entry
@@ -6591,6 +6793,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="MW-MZ"    name="Mzimba"   parent="N" />
        <iso_3166_2_entry
+               code="MW-NE"    name="Neno"     parent="N" />
+       <iso_3166_2_entry
                code="MW-NB"    name="Nkhata Bay"       parent="N" />
        <iso_3166_2_entry
                code="MW-NK"    name="Nkhotakota"       parent="C" />
@@ -7005,6 +7209,51 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
                code="NO-21"    name="Svalbard" />
 </iso_3166_subset>
 </iso_3166_country>
+       <!-- Nepal -->
+<iso_3166_country code="NP">
+<iso_3166_subset type="Development region">
+       <iso_3166_2_entry
+               code="NP-1"     name="Madhyamanchal" />
+       <iso_3166_2_entry
+               code="NP-2"     name="Madhya Pashchimanchal" />
+       <iso_3166_2_entry
+               code="NP-3"     name="Pashchimanchal" />
+       <iso_3166_2_entry
+               code="NP-4"     name="Purwanchal" />
+       <iso_3166_2_entry
+               code="NP-5"     name="Sudur Pashchimanchal" />
+</iso_3166_subset>
+<iso_3166_subset type="zone">
+       <iso_3166_2_entry
+               code="NP-BA"    name="Bagmati"  parent="1" />
+       <iso_3166_2_entry
+               code="NP-BH"    name="Bheri"    parent="2" />
+       <iso_3166_2_entry
+               code="NP-DH"    name="Dhawalagiri"      parent="3" />
+       <iso_3166_2_entry
+               code="NP-GA"    name="Gandaki"  parent="3" />
+       <iso_3166_2_entry
+               code="NP-JA"    name="Janakpur" parent="1" />
+       <iso_3166_2_entry
+               code="NP-KA"    name="Karnali"  parent="2" />
+       <iso_3166_2_entry
+               code="NP-KO"    name="Kosi"     parent="4" />
+       <iso_3166_2_entry
+               code="NP-LU"    name="Lumbini"  parent="3" />
+       <iso_3166_2_entry
+               code="NP-MA"    name="Mahakali" parent="5" />
+       <iso_3166_2_entry
+               code="NP-ME"    name="Mechi"    parent="4" />
+       <iso_3166_2_entry
+               code="NP-NA"    name="Narayani" parent="1" />
+       <iso_3166_2_entry
+               code="NP-RA"    name="Rapti"    parent="2" />
+       <iso_3166_2_entry
+               code="NP-SA"    name="Sagarmatha"       parent="4" />
+       <iso_3166_2_entry
+               code="NP-SE"    name="Seti"     parent="5" />
+</iso_3166_subset>
+</iso_3166_country>
        <!-- Nauru -->
 <iso_3166_country code="NR">
 <iso_3166_subset type="District">
@@ -7040,64 +7289,76 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_country>
        <!-- New Zealand -->
 <iso_3166_country code="NZ">
+<iso_3166_subset type="Island">
+       <iso_3166_2_entry
+               code="NZ-N"     name="North Island" />
+       <iso_3166_2_entry
+               code="NZ-S"     name="South Island" />
+</iso_3166_subset>
 <iso_3166_subset type="Regional council">
        <iso_3166_2_entry
-               code="NZ-AUK"   name="Auckland" />
+               code="NZ-AUK"   name="Auckland" parent="N" />
        <iso_3166_2_entry
-               code="NZ-BOP"   name="Bay of Plenty" />
+               code="NZ-BOP"   name="Bay of Plenty"    parent="N" />
        <iso_3166_2_entry
-               code="NZ-CAN"   name="Canterbury" />
+               code="NZ-CAN"   name="Canterbury"       parent="S" />
        <iso_3166_2_entry
-               code="NZ-HKB"   name="Hawkes Bay" />
+               code="NZ-HKB"   name="Hawke's Bay"      parent="N" />
        <iso_3166_2_entry
-               code="NZ-MWT"   name="Manawatu-Wanganui" />
+               code="NZ-MWT"   name="Manawatu-Wanganui"        parent="N" />
        <iso_3166_2_entry
-               code="NZ-NTL"   name="Northland" />
+               code="NZ-NTL"   name="Northland"        parent="N" />
        <iso_3166_2_entry
-               code="NZ-OTA"   name="Otago" />
+               code="NZ-OTA"   name="Otago"    parent="S" />
        <iso_3166_2_entry
-               code="NZ-STL"   name="Southland" />
+               code="NZ-STL"   name="Southland"        parent="S" />
        <iso_3166_2_entry
-               code="NZ-TKI"   name="Taranaki" />
+               code="NZ-TKI"   name="Taranaki" parent="N" />
        <iso_3166_2_entry
-               code="NZ-WKO"   name="Waikato" />
+               code="NZ-WKO"   name="Waikato"  parent="N" />
        <iso_3166_2_entry
-               code="NZ-WGN"   name="Wellington" />
+               code="NZ-WGN"   name="Wellington"       parent="N" />
        <iso_3166_2_entry
-               code="NZ-WTC"   name="West Coast" />
+               code="NZ-WTC"   name="West Coast"       parent="S" />
 </iso_3166_subset>
 <iso_3166_subset type="Unitary authority">
        <iso_3166_2_entry
-               code="NZ-GIS"   name="Gisborne" />
+               code="NZ-GIS"   name="Gisborne District"        parent="N" />
        <iso_3166_2_entry
-               code="NZ-MBH"   name="Marlborough" />
+               code="NZ-MBH"   name="Marlborough District"     parent="S" />
        <iso_3166_2_entry
-               code="NZ-NSN"   name="Nelson" />
+               code="NZ-NSN"   name="Nelson City"      parent="S" />
        <iso_3166_2_entry
-               code="NZ-TAS"   name="Tasman" />
+               code="NZ-TAS"   name="Tasman District"  parent="S" />
+</iso_3166_subset>
+<iso_3166_subset type="Special island authority">
+       <iso_3166_2_entry
+               code="NZ-CIT"   name="Chatham Islands Territory" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Oman -->
 <iso_3166_country code="OM">
 <iso_3166_subset type="Region">
        <iso_3166_2_entry
-               code="OM-DA"    name="Ad Dakhillyah" />
+               code="OM-DA"    name="Ad Dākhilīya" />
        <iso_3166_2_entry
-               code="OM-BA"    name="Al Batinah" />
+               code="OM-BA"    name="Al Bāţinah" />
        <iso_3166_2_entry
-               code="OM-WU"    name="Al Wusta" />
+               code="OM-WU"    name="Al Wusţá" />
        <iso_3166_2_entry
-               code="OM-SH"    name="Ash Sharqlyah" />
+               code="OM-SH"    name="Ash Sharqīyah" />
        <iso_3166_2_entry
-               code="OM-ZA"    name="Az Zahirah" />
+               code="OM-ZA"    name="Az̧ Z̧āhirah" />
 </iso_3166_subset>
 <iso_3166_subset type="Governorate">
        <iso_3166_2_entry
-               code="OM-JA"    name="Al Janblyah" />
+               code="OM-BU"    name="Al Buraymī" />
        <iso_3166_2_entry
-               code="OM-MA"    name="Masqat" />
+               code="OM-MA"    name="Masqaţ" />
        <iso_3166_2_entry
                code="OM-MU"    name="Musandam" />
+       <iso_3166_2_entry
+               code="OM-ZU"    name="Z̧ufār" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Panama -->
@@ -7106,12 +7367,12 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PA-1"     name="Bocas del Toro" />
        <iso_3166_2_entry
+               code="PA-4"     name="Chiriquí" />
+       <iso_3166_2_entry
                code="PA-2"     name="Coclé" />
        <iso_3166_2_entry
                code="PA-3"     name="Colón" />
        <iso_3166_2_entry
-               code="PA-4"     name="Chiriquí" />
-       <iso_3166_2_entry
                code="PA-5"     name="Darién" />
        <iso_3166_2_entry
                code="PA-6"     name="Herrera" />
@@ -7121,15 +7382,27 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
                code="PA-8"     name="Panamá" />
        <iso_3166_2_entry
                code="PA-9"     name="Veraguas" />
+</iso_3166_subset>
+<iso_3166_subset type="Indigenous region">
+       <iso_3166_2_entry
+               code="PA-EM"    name="Emberá" />
        <iso_3166_2_entry
-               code="PA-0"     name="Kuna Yala" />
+               code="PA-KY"    name="Kuna Yala" />
+       <iso_3166_2_entry
+               code="PA-NB"    name="Ngöbe-Buglé" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Peru -->
 <iso_3166_country code="PE">
-<iso_3166_subset type="Region">
+<iso_3166_subset type="Constitutional province">
        <iso_3166_2_entry
                code="PE-CAL"   name="El Callao" />
+</iso_3166_subset>
+<iso_3166_subset type="Municipality">
+       <iso_3166_2_entry
+               code="PE-LMA"   name="Municipalidad Metropolitana de Lima" />
+</iso_3166_subset>
+<iso_3166_subset type="Region">
        <iso_3166_2_entry
                code="PE-AMA"   name="Amazonas" />
        <iso_3166_2_entry
@@ -7143,7 +7416,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PE-CAJ"   name="Cajamarca" />
        <iso_3166_2_entry
-               code="PE-CUS"   name="Cusco" />
+               code="PE-CUS"   name="Cusco [Cuzco]" />
        <iso_3166_2_entry
                code="PE-HUV"   name="Huancavelica" />
        <iso_3166_2_entry
@@ -7231,37 +7504,39 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="PH">
 <iso_3166_subset type="Region">
        <iso_3166_2_entry
-               code="PH 14"    name="Autonomous Region in Muslim Mindanao (ARMM)" />
+               code="PH-14"    name="Autonomous Region in Muslim Mindanao (ARMM)" />
        <iso_3166_2_entry
-               code="PH 05"    name="Bicol" />
+               code="PH-05"    name="Bicol (Region V)" />
        <iso_3166_2_entry
-               code="PH 02"    name="Cagayan Valley" />
+               code="PH-02"    name="Cagayan Valley (Region II)" />
        <iso_3166_2_entry
-               code="PH 13"    name="CARAGA" />
+               code="PH-40"    name="CALABARZON (Region IV-A)" />
        <iso_3166_2_entry
-               code="PH 03"    name="Central Luzon" />
+               code="PH-13"    name="Caraga (Region XIII)" />
        <iso_3166_2_entry
-               code="PH 12"    name="Central Mindanao" />
+               code="PH-03"    name="Central Luzon (Region III)" />
        <iso_3166_2_entry
-               code="PH 07"    name="Central Visayas" />
+               code="PH-07"    name="Central Visayas (Region VII)" />
        <iso_3166_2_entry
-               code="PH 15"    name="Cordillera Administrative Region (CAR)" />
+               code="PH-15"    name="Cordillera Administrative Region (CAR)" />
        <iso_3166_2_entry
-               code="PH 08"    name="Eastern Visayas" />
+               code="PH-08"    name="Eastern Visayas (Region VIII)" />
        <iso_3166_2_entry
-               code="PH 01"    name="Ilocos" />
+               code="PH-01"    name="Ilocos (Region I)" />
        <iso_3166_2_entry
-               code="PH 00"    name="National Capital Region (Manila)" />
+               code="PH-41"    name="MIMAROPA (Region IV-B)" />
        <iso_3166_2_entry
-               code="PH 10"    name="Northern Mindanao" />
+               code="PH-00"    name="National Capital Region" />
        <iso_3166_2_entry
-               code="PH 11"    name="Southern Mindanao" />
+               code="PH-10"    name="Northern Mindanao (Region X)" />
        <iso_3166_2_entry
-               code="PH 04"    name="Southern Tagalog" />
+               code="PH-11"    name="Davao (Region XI)" />
        <iso_3166_2_entry
-               code="PH 09"    name="Western Mindanao" />
+               code="PH-12"    name="Soccsksargen (Region XII)" />
        <iso_3166_2_entry
-               code="PH 06"    name="Western Visayas" />
+               code="PH-06"    name="Western Visayas (Region VI)" />
+       <iso_3166_2_entry
+               code="PH-09"    name="Zamboanga Peninsula (Region IX)" />
 </iso_3166_subset>
 <iso_3166_subset type="Province">
        <iso_3166_2_entry
@@ -7279,7 +7554,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-APA"   name="Apayao"   parent="15" />
        <iso_3166_2_entry
-               code="PH-AUR"   name="Aurora"   parent="04" />
+               code="PH-AUR"   name="Aurora"   parent="03" />
        <iso_3166_2_entry
                code="PH-BAS"   name="Basilan"  parent="09" />
        <iso_3166_2_entry
@@ -7287,7 +7562,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-BTN"   name="Batanes"  parent="02" />
        <iso_3166_2_entry
-               code="PH-BTG"   name="Batangas" parent="04" />
+               code="PH-BTG"   name="Batangas" parent="40" />
        <iso_3166_2_entry
                code="PH-BEN"   name="Benguet"  parent="15" />
        <iso_3166_2_entry
@@ -7311,7 +7586,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-CAT"   name="Catanduanes"      parent="05" />
        <iso_3166_2_entry
-               code="PH-CAV"   name="Cavite"   parent="04" />
+               code="PH-CAV"   name="Cavite"   parent="40" />
        <iso_3166_2_entry
                code="PH-CEB"   name="Cebu"     parent="07" />
        <iso_3166_2_entry
@@ -7323,6 +7598,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-DAO"   name="Davao Oriental"   parent="11" />
        <iso_3166_2_entry
+               code="PH-DIN"   name="Dinagat Islands"  parent="13" />
+       <iso_3166_2_entry
                code="PH-EAS"   name="Eastern Samar"    parent="08" />
        <iso_3166_2_entry
                code="PH-GUI"   name="Guimaras" parent="06" />
@@ -7339,7 +7616,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-KAL"   name="Kalinga-Apayso"   parent="15" />
        <iso_3166_2_entry
-               code="PH-LAG"   name="Laguna"   parent="04" />
+               code="PH-LAG"   name="Laguna"   parent="40" />
        <iso_3166_2_entry
                code="PH-LAN"   name="Lanao del Norte"  parent="12" />
        <iso_3166_2_entry
@@ -7351,13 +7628,13 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-MAG"   name="Maguindanao"      parent="14" />
        <iso_3166_2_entry
-               code="PH-MAD"   name="Marinduque"       parent="04" />
+               code="PH-MAD"   name="Marinduque"       parent="41" />
        <iso_3166_2_entry
                code="PH-MAS"   name="Masbate"  parent="05" />
        <iso_3166_2_entry
-               code="PH-MDC"   name="Mindoro Occidental"       parent="04" />
+               code="PH-MDC"   name="Mindoro Occidental"       parent="41" />
        <iso_3166_2_entry
-               code="PH-MDR"   name="Mindoro Oriental" parent="04" />
+               code="PH-MDR"   name="Mindoro Oriental" parent="41" />
        <iso_3166_2_entry
                code="PH-MSC"   name="Misamis Occidental"       parent="10" />
        <iso_3166_2_entry
@@ -7377,19 +7654,19 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-NUV"   name="Nueva Vizcaya"    parent="02" />
        <iso_3166_2_entry
-               code="PH-PLW"   name="Palawan"  parent="04" />
+               code="PH-PLW"   name="Palawan"  parent="41" />
        <iso_3166_2_entry
                code="PH-PAM"   name="Pampanga" parent="03" />
        <iso_3166_2_entry
                code="PH-PAN"   name="Pangasinan"       parent="01" />
        <iso_3166_2_entry
-               code="PH-QUE"   name="Quezon"   parent="04" />
+               code="PH-QUE"   name="Quezon"   parent="40" />
        <iso_3166_2_entry
                code="PH-QUI"   name="Quirino"  parent="02" />
        <iso_3166_2_entry
-               code="PH-RIZ"   name="Rizal"    parent="04" />
+               code="PH-RIZ"   name="Rizal"    parent="40" />
        <iso_3166_2_entry
-               code="PH-ROM"   name="Romblon"  parent="04" />
+               code="PH-ROM"   name="Romblon"  parent="41" />
        <iso_3166_2_entry
                code="PH-SAR"   name="Sarangani"        parent="11" />
        <iso_3166_2_entry
@@ -7421,7 +7698,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="PH-ZAS"   name="Zamboanga del Sur"        parent="09" />
        <iso_3166_2_entry
-               code="PH-ZSI"   name="Zamboanga Sibiguey"       parent="09" />
+               code="PH-ZSI"   name="Zamboanga Sibugay"        parent="09" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Pakistan -->
@@ -7646,37 +7923,37 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="RO-AR"    name="Arad" />
        <iso_3166_2_entry
-               code="RO-AG"    name="Argeş" />
+               code="RO-AG"    name="Argeș" />
        <iso_3166_2_entry
                code="RO-BC"    name="Bacău" />
        <iso_3166_2_entry
                code="RO-BH"    name="Bihor" />
        <iso_3166_2_entry
-               code="RO-BN"    name="Bistriţa-Năsăud" />
+               code="RO-BN"    name="Bistrița-Năsăud" />
        <iso_3166_2_entry
-               code="RO-BT"    name="Botoşani" />
+               code="RO-BT"    name="Botoșani" />
        <iso_3166_2_entry
-               code="RO-BV"    name="Braşov" />
+               code="RO-BV"    name="Brașov" />
        <iso_3166_2_entry
                code="RO-BR"    name="Brăila" />
        <iso_3166_2_entry
                code="RO-BZ"    name="Buzău" />
        <iso_3166_2_entry
-               code="RO-CS"    name="Caraş-Severin" />
+               code="RO-CS"    name="Caraș-Severin" />
        <iso_3166_2_entry
-               code="RO-CL"    name="Călăraşi" />
+               code="RO-CL"    name="Călărași" />
        <iso_3166_2_entry
                code="RO-CJ"    name="Cluj" />
        <iso_3166_2_entry
-               code="RO-CT"    name="Constanţa" />
+               code="RO-CT"    name="Constanța" />
        <iso_3166_2_entry
                code="RO-CV"    name="Covasna" />
        <iso_3166_2_entry
-               code="RO-DB"    name="Dâmboviţa" />
+               code="RO-DB"    name="Dâmbovița" />
        <iso_3166_2_entry
                code="RO-DJ"    name="Dolj" />
        <iso_3166_2_entry
-               code="RO-GL"    name="Galaţi" />
+               code="RO-GL"    name="Galați" />
        <iso_3166_2_entry
                code="RO-GR"    name="Giurgiu" />
        <iso_3166_2_entry
@@ -7686,19 +7963,19 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="RO-HD"    name="Hunedoara" />
        <iso_3166_2_entry
-               code="RO-IL"    name="Ialomiţa" />
+               code="RO-IL"    name="Ialomița" />
        <iso_3166_2_entry
-               code="RO-IS"    name="Iaşi" />
+               code="RO-IS"    name="Iași" />
        <iso_3166_2_entry
                code="RO-IF"    name="Ilfov" />
        <iso_3166_2_entry
-               code="RO-MM"    name="Maramureş" />
+               code="RO-MM"    name="Maramureș" />
        <iso_3166_2_entry
-               code="RO-MH"    name="Mehedinţi" />
+               code="RO-MH"    name="Mehedinți" />
        <iso_3166_2_entry
-               code="RO-MS"    name="Mureş" />
+               code="RO-MS"    name="Mureș" />
        <iso_3166_2_entry
-               code="RO-NT"    name="Neamţ" />
+               code="RO-NT"    name="Neamț" />
        <iso_3166_2_entry
                code="RO-OT"    name="Olt" />
        <iso_3166_2_entry
@@ -7714,7 +7991,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="RO-TR"    name="Teleorman" />
        <iso_3166_2_entry
-               code="RO-TM"    name="Timiş" />
+               code="RO-TM"    name="Timiș" />
        <iso_3166_2_entry
                code="RO-TL"    name="Tulcea" />
        <iso_3166_2_entry
@@ -7726,7 +8003,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 <iso_3166_subset type="Municipality">
        <iso_3166_2_entry
-               code="RO-B"     name="Bucureşti" />
+               code="RO-B"     name="București" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Serbia -->
@@ -7737,69 +8014,69 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 <iso_3166_subset type="Autonomous province">
        <iso_3166_2_entry
-               code="RS KM"    name="Kosovo-Metohija" />
+               code="RS-KM"    name="Kosovo-Metohija" />
        <iso_3166_2_entry
-               code="RS VO"    name="Vojvodina" />
+               code="RS-VO"    name="Vojvodina" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
        <iso_3166_2_entry
-               code="RS-01"    name="Severna Bačka"   parent="VO" />
+               code="RS-14"    name="Borski okrug" />
        <iso_3166_2_entry
-               code="RS-06"    name="Južna Bačka"    parent="VO" />
+               code="RS-11"    name="Braničevski okrug" />
        <iso_3166_2_entry
-               code="RS-05"    name="Zapadna Bačka"   parent="VO" />
+               code="RS-23"    name="Jablanički okrug" />
        <iso_3166_2_entry
-               code="RS-03"    name="Severni Banat"    parent="VO" />
+               code="RS-06"    name="Južnobački okrug"       parent="VO" />
        <iso_3166_2_entry
-               code="RS-02"    name="Srednji Banat"    parent="VO" />
+               code="RS-04"    name="Južnobanatski okrug"     parent="VO" />
        <iso_3166_2_entry
-               code="RS-04"    name="Južni Banat"     parent="VO" />
+               code="RS-09"    name="Kolubarski okrug" />
        <iso_3166_2_entry
-               code="RS-14"    name="Bor" />
+               code="RS-25"    name="Kosovski okrug"   parent="KM" />
        <iso_3166_2_entry
-               code="RS-11"    name="Braničevo" />
+               code="RS-28"    name="Kosovsko-Mitrovački okrug"       parent="KM" />
        <iso_3166_2_entry
-               code="RS-23"    name="Jablanica" />
+               code="RS-29"    name="Kosovsko-Pomoravski okrug"        parent="KM" />
        <iso_3166_2_entry
-               code="RS-09"    name="Kolubara" />
+               code="RS-08"    name="Mačvanski okrug" />
        <iso_3166_2_entry
-               code="RS-25"    name="Kosovo"   parent="KM" />
+               code="RS-17"    name="Moravički okrug" />
        <iso_3166_2_entry
-               code="RS-28"    name="Kosovska Mitrovica"       parent="KM" />
+               code="RS-20"    name="Nišavski okrug" />
        <iso_3166_2_entry
-               code="RS-29"    name="Kosovo-Pomoravlje"        parent="KM" />
+               code="RS-24"    name="Pčinjski okrug" />
        <iso_3166_2_entry
-               code="RS-08"    name="Mačva" />
+               code="RS-26"    name="Pećki okrug"     parent="KM" />
        <iso_3166_2_entry
-               code="RS-17"    name="Moravica" />
+               code="RS-22"    name="Pirotski okrug" />
        <iso_3166_2_entry
-               code="RS-20"    name="Nišava" />
+               code="RS-10"    name="Podunavski okrug" />
        <iso_3166_2_entry
-               code="RS-24"    name="Pčinja" />
+               code="RS-13"    name="Pomoravski okrug" />
        <iso_3166_2_entry
-               code="RS-26"    name="Peć"     parent="KM" />
+               code="RS-27"    name="Prizrenski okrug" parent="KM" />
        <iso_3166_2_entry
-               code="RS-22"    name="Pirot" />
+               code="RS-19"    name="Rasinski okrug" />
        <iso_3166_2_entry
-               code="RS-10"    name="Podunavlje" />
+               code="RS-18"    name="Raški okrug" />
        <iso_3166_2_entry
-               code="RS-13"    name="Pomoravlje" />
+               code="RS-01"    name="Severnobački okrug"      parent="VO" />
        <iso_3166_2_entry
-               code="RS-27"    name="Prizren"  parent="KM" />
+               code="RS-03"    name="Severnobanatski okrug"    parent="VO" />
        <iso_3166_2_entry
-               code="RS-19"    name="Rasina" />
+               code="RS-02"    name="Srednjebanatski okrug"    parent="VO" />
        <iso_3166_2_entry
-               code="RS-18"    name="Raška" />
+               code="RS-07"    name="Sremski okrug"    parent="VO" />
        <iso_3166_2_entry
-               code="RS-07"    name="Srem"     parent="VO" />
+               code="RS-12"    name="Šumadijski okrug" />
        <iso_3166_2_entry
-               code="RS-12"    name="Šumadija" />
+               code="RS-21"    name="Toplički okrug" />
        <iso_3166_2_entry
-               code="RS-21"    name="Toplica" />
+               code="RS-15"    name="Zaječarski okrug" />
        <iso_3166_2_entry
-               code="RS-15"    name="Zaječar" />
+               code="RS-05"    name="Zapadnobački okrug"      parent="VO" />
        <iso_3166_2_entry
-               code="RS-16"    name="Zlatibor" />
+               code="RS-16"    name="Zlatiborski okrug" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Russia -->
@@ -7869,6 +8146,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
                code="RU-PRI"   name="Primorskiy kray" />
        <iso_3166_2_entry
                code="RU-STA"   name="Stavropol'skiy kray" />
+       <iso_3166_2_entry
+               code="RU-ZAB"   name="Zabajkal'skij kraj" />
 </iso_3166_subset>
 <iso_3166_subset type="Administrative Region">
        <iso_3166_2_entry
@@ -7884,8 +8163,6 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="RU-CHE"   name="Chelyabinskaya oblast'" />
        <iso_3166_2_entry
-               code="RU-CHI"   name="Chitinskaya oblast'" />
-       <iso_3166_2_entry
                code="RU-IRK"   name="Irkutiskaya oblast'" />
        <iso_3166_2_entry
                code="RU-IVA"   name="Ivanovskaya oblast'" />
@@ -7978,16 +8255,12 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 <iso_3166_subset type="Autonomous District">
        <iso_3166_2_entry
-               code="RU-AGB"   name="Aginsky Buryatskiy avtonomnyy okrug" />
-       <iso_3166_2_entry
                code="RU-CHU"   name="Chukotskiy avtonomnyy okrug" />
        <iso_3166_2_entry
                code="RU-KHM"   name="Khanty-Mansiysky avtonomnyy okrug-Yugra" />
        <iso_3166_2_entry
                code="RU-NEN"   name="Nenetskiy avtonomnyy okrug" />
        <iso_3166_2_entry
-               code="RU-UOB"   name="Ust'-Ordynskiy Buryatskiy avtonomnyy okrug" />
-       <iso_3166_2_entry
                code="RU-YAN"   name="Yamalo-Nenetskiy avtonomnyy okrug" />
 </iso_3166_subset>
 </iso_3166_country>
@@ -8074,7 +8347,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SC-02"    name="Anse Boileau" />
        <iso_3166_2_entry
-               code="SC-03"    name="Anse Étoile" />
+               code="SC-03"    name="Anse Etoile" />
        <iso_3166_2_entry
                code="SC-04"    name="Anse Louis" />
        <iso_3166_2_entry
@@ -8094,13 +8367,15 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SC-12"    name="Glacis" />
        <iso_3166_2_entry
-               code="SC-13"    name="Grand' Anse (Mahé)" />
+               code="SC-13"    name="Grand Anse Mahe" />
        <iso_3166_2_entry
-               code="SC-14"    name="Grand' Anse (Praslin)" />
+               code="SC-14"    name="Grand Anse Praslin" />
        <iso_3166_2_entry
                code="SC-15"    name="La Digue" />
        <iso_3166_2_entry
-               code="SC-16"    name="La Rivière Anglaise" />
+               code="SC-16"    name="English River" />
+       <iso_3166_2_entry
+               code="SC-24"    name="Les Mamelles" />
        <iso_3166_2_entry
                code="SC-17"    name="Mont Buxton" />
        <iso_3166_2_entry
@@ -8108,10 +8383,12 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SC-19"    name="Plaisance" />
        <iso_3166_2_entry
-               code="SC-20"    name="Pointe La Rue" />
+               code="SC-20"    name="Pointe Larue" />
        <iso_3166_2_entry
                code="SC-21"    name="Port Glaud" />
        <iso_3166_2_entry
+               code="SC-25"    name="Roche Caiman" />
+       <iso_3166_2_entry
                code="SC-22"    name="Saint Louis" />
        <iso_3166_2_entry
                code="SC-23"    name="Takamaka" />
@@ -8212,7 +8489,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SE-U"     name="Västmanlands län" />
        <iso_3166_2_entry
-               code="SE-Q"     name="Västra Götalands län" />
+               code="SE-O"     name="Västra Götalands län" />
        <iso_3166_2_entry
                code="SE-T"     name="Örebro län" />
        <iso_3166_2_entry
@@ -8234,18 +8511,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
                code="SG-05"    name="South West" />
 </iso_3166_subset>
 </iso_3166_country>
-       <!-- Saint Helena -->
+       <!-- Saint Helena, Ascension and Tristan da Cunha -->
 <iso_3166_country code="SH">
-<iso_3166_subset type="Dependency">
-       <iso_3166_2_entry
-               code="SH-SH"    name="Saint Helena" />
-       <iso_3166_2_entry
-               code="SH-TA"    name="Tristan da Cunha" />
-</iso_3166_subset>
-<iso_3166_subset type="Administrative area">
-       <iso_3166_2_entry
-               code="SH-AC"    name="Ascension" />
-</iso_3166_subset>
 </iso_3166_country>
        <!-- Slovenia -->
 <iso_3166_country code="SI">
@@ -8253,6 +8520,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-001"   name="Ajdovščina" />
        <iso_3166_2_entry
+               code="SI-195"   name="Apače" />
+       <iso_3166_2_entry
                code="SI-002"   name="Beltinci" />
        <iso_3166_2_entry
                code="SI-148"   name="Benedikt" />
@@ -8273,10 +8542,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-007"   name="Brda" />
        <iso_3166_2_entry
-               code="SI-009"   name="Brežice" />
-       <iso_3166_2_entry
                code="SI-008"   name="Brezovica" />
        <iso_3166_2_entry
+               code="SI-009"   name="Brežice" />
+       <iso_3166_2_entry
                code="SI-152"   name="Cankova" />
        <iso_3166_2_entry
                code="SI-011"   name="Celje" />
@@ -8289,6 +8558,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-153"   name="Cerkvenjak" />
        <iso_3166_2_entry
+               code="SI-196"   name="Cirkulane" />
+       <iso_3166_2_entry
                code="SI-015"   name="Črenšovci" />
        <iso_3166_2_entry
                code="SI-016"   name="Črna na Koroškem" />
@@ -8325,6 +8596,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-028"   name="Gorišnica" />
        <iso_3166_2_entry
+               code="SI-207"   name="Gorje" />
+       <iso_3166_2_entry
                code="SI-029"   name="Gornja Radgona" />
        <iso_3166_2_entry
                code="SI-030"   name="Gornji Grad" />
@@ -8381,6 +8654,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-050"   name="Koper/Capodistria" />
        <iso_3166_2_entry
+               code="SI-197"   name="Kosanjevica na Krki" />
+       <iso_3166_2_entry
                code="SI-165"   name="Kostel" />
        <iso_3166_2_entry
                code="SI-051"   name="Kozje" />
@@ -8411,6 +8686,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-063"   name="Ljutomer" />
        <iso_3166_2_entry
+               code="SI-208"   name="Log-Dragomer" />
+       <iso_3166_2_entry
                code="SI-064"   name="Logatec" />
        <iso_3166_2_entry
                code="SI-065"   name="Loška dolina" />
@@ -8425,6 +8702,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-069"   name="Majšperk" />
        <iso_3166_2_entry
+               code="SI-198"   name="Makole" />
+       <iso_3166_2_entry
                code="SI-070"   name="Maribor" />
        <iso_3166_2_entry
                code="SI-168"   name="Markovci" />
@@ -8445,6 +8724,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-076"   name="Mislinja" />
        <iso_3166_2_entry
+               code="SI-199"   name="Mokronog-Trebelno" />
+       <iso_3166_2_entry
                code="SI-077"   name="Moravče" />
        <iso_3166_2_entry
                code="SI-078"   name="Moravske Toplice" />
@@ -8483,6 +8764,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-093"   name="Podvelka" />
        <iso_3166_2_entry
+               code="SI-200"   name="Poljčane" />
+       <iso_3166_2_entry
                code="SI-173"   name="Polzela" />
        <iso_3166_2_entry
                code="SI-094"   name="Postojna" />
@@ -8511,6 +8794,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-176"   name="Razkrižje" />
        <iso_3166_2_entry
+               code="SI-209"   name="Rečica ob Savinji" />
+       <iso_3166_2_entry
+               code="SI-201"   name="Renče-Vogrsko" />
+       <iso_3166_2_entry
                code="SI-104"   name="Ribnica" />
        <iso_3166_2_entry
                code="SI-177"   name="Ribnica na Pohorju" />
@@ -8523,12 +8810,44 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-108"   name="Ruše" />
        <iso_3166_2_entry
-               code="SI-033"   name="Šalovci" />
-       <iso_3166_2_entry
                code="SI-178"   name="Selnica ob Dravi" />
        <iso_3166_2_entry
                code="SI-109"   name="Semič" />
        <iso_3166_2_entry
+               code="SI-110"   name="Sevnica" />
+       <iso_3166_2_entry
+               code="SI-111"   name="Sežana" />
+       <iso_3166_2_entry
+               code="SI-112"   name="Slovenj Gradec" />
+       <iso_3166_2_entry
+               code="SI-113"   name="Slovenska Bistrica" />
+       <iso_3166_2_entry
+               code="SI-114"   name="Slovenske Konjice" />
+       <iso_3166_2_entry
+               code="SI-179"   name="Sodražica" />
+       <iso_3166_2_entry
+               code="SI-180"   name="Solčava" />
+       <iso_3166_2_entry
+               code="SI-202"   name="Središče ob Dravi" />
+       <iso_3166_2_entry
+               code="SI-115"   name="Starče" />
+       <iso_3166_2_entry
+               code="SI-203"   name="Straža" />
+       <iso_3166_2_entry
+               code="SI-181"   name="Sveta Ana" />
+       <iso_3166_2_entry
+               code="SI-204"   name="Sveta Trojica v Slovenskih Goricah" />
+       <iso_3166_2_entry
+               code="SI-182"   name="Sveta Andraž v Slovenskih Goricah" />
+       <iso_3166_2_entry
+               code="SI-116"   name="Sveti Jurij" />
+       <iso_3166_2_entry
+               code="SI-210"   name="Sveti Jurij v Slovenskih Goricah" />
+       <iso_3166_2_entry
+               code="SI-205"   name="Sveti Tomaž" />
+       <iso_3166_2_entry
+               code="SI-033"   name="Šalovci" />
+       <iso_3166_2_entry
                code="SI-183"   name="Šempeter-Vrtojba" />
        <iso_3166_2_entry
                code="SI-117"   name="Šenčur" />
@@ -8537,11 +8856,9 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-119"   name="Šentjernej" />
        <iso_3166_2_entry
-               code="SI-120"   name="Šentjur pri Celju" />
+               code="SI-120"   name="Šentjur" />
        <iso_3166_2_entry
-               code="SI-110"   name="Sevnica" />
-       <iso_3166_2_entry
-               code="SI-111"   name="Sežana" />
+               code="SI-211"   name="Šentrupert" />
        <iso_3166_2_entry
                code="SI-121"   name="Škocjan" />
        <iso_3166_2_entry
@@ -8549,34 +8866,18 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-123"   name="Škofljica" />
        <iso_3166_2_entry
-               code="SI-112"   name="Slovenj Gradec" />
-       <iso_3166_2_entry
-               code="SI-113"   name="Slovenska Bistrica" />
-       <iso_3166_2_entry
-               code="SI-114"   name="Slovenske Konjice" />
-       <iso_3166_2_entry
                code="SI-124"   name="Šmarje pri Jelšah" />
        <iso_3166_2_entry
+               code="SI-206"   name="Šmarjeske Topliče" />
+       <iso_3166_2_entry
                code="SI-125"   name="Šmartno ob Paki" />
        <iso_3166_2_entry
                code="SI-194"   name="Šmartno pri Litiji" />
        <iso_3166_2_entry
-               code="SI-179"   name="Sodražica" />
-       <iso_3166_2_entry
-               code="SI-180"   name="Solčava" />
-       <iso_3166_2_entry
                code="SI-126"   name="Šoštanj" />
        <iso_3166_2_entry
-               code="SI-115"   name="Starše" />
-       <iso_3166_2_entry
                code="SI-127"   name="Štore" />
        <iso_3166_2_entry
-               code="SI-181"   name="Sveta Ana" />
-       <iso_3166_2_entry
-               code="SI-182"   name="Sveti Andraž v Slovenskih goricah" />
-       <iso_3166_2_entry
-               code="SI-116"   name="Sveti Jurij" />
-       <iso_3166_2_entry
                code="SI-184"   name="Tabor" />
        <iso_3166_2_entry
                code="SI-010"   name="Tišina" />
@@ -8589,10 +8890,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-185"   name="Trnovska vas" />
        <iso_3166_2_entry
-               code="SI-131"   name="Tržič" />
-       <iso_3166_2_entry
                code="SI-186"   name="Trzin" />
        <iso_3166_2_entry
+               code="SI-131"   name="Tržič" />
+       <iso_3166_2_entry
                code="SI-132"   name="Turnišče" />
        <iso_3166_2_entry
                code="SI-133"   name="Velenje" />
@@ -8621,10 +8922,12 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-142"   name="Zagorje ob Savi" />
        <iso_3166_2_entry
-               code="SI-190"   name="Žalec" />
-       <iso_3166_2_entry
                code="SI-143"   name="Zavrč" />
        <iso_3166_2_entry
+               code="SI-144"   name="Zreče" />
+       <iso_3166_2_entry
+               code="SI-190"   name="Žalec" />
+       <iso_3166_2_entry
                code="SI-146"   name="Železniki" />
        <iso_3166_2_entry
                code="SI-191"   name="Žetale" />
@@ -8633,8 +8936,6 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SI-192"   name="Žirovnica" />
        <iso_3166_2_entry
-               code="SI-144"   name="Zreče" />
-       <iso_3166_2_entry
                code="SI-193"   name="Žužemberk" />
 </iso_3166_subset>
 </iso_3166_country>
@@ -8648,7 +8949,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SK-KI"    name="Košický kraj" />
        <iso_3166_2_entry
-               code="SK-NJ"    name="Nitriansky kraj" />
+               code="SK-NI"    name="Nitriansky kraj" />
        <iso_3166_2_entry
                code="SK-PV"    name="Prešovský kraj" />
        <iso_3166_2_entry
@@ -8707,8 +9008,12 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SN-FK"    name="Fatick" />
        <iso_3166_2_entry
+               code="SN-KA"    name="Kaffrine" />
+       <iso_3166_2_entry
                code="SN-KL"    name="Kaolack" />
        <iso_3166_2_entry
+               code="SN-KE"    name="Kédougou" />
+       <iso_3166_2_entry
                code="SN-KD"    name="Kolda" />
        <iso_3166_2_entry
                code="SN-LG"    name="Louga" />
@@ -8717,6 +9022,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="SN-SL"    name="Saint-Louis" />
        <iso_3166_2_entry
+               code="SN-SE"    name="Sédhiou" />
+       <iso_3166_2_entry
                code="SN-TC"    name="Tambacounda" />
        <iso_3166_2_entry
                code="SN-TH"    name="Thiès" />
@@ -8882,41 +9189,49 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="TD">
 <iso_3166_subset type="Region">
        <iso_3166_2_entry
-               code="TD-BA"    name="Batha" />
+               code="TD-BA"    name="Al Baṭḩah" />
+       <iso_3166_2_entry
+               code="TD-LC"    name="Al Buḩayrah" />
        <iso_3166_2_entry
-               code="TD-BET"   name="Borkou-Ennedi-Tibesti" />
+               code="TD-BG"    name="Baḩr al Ghazāl" />
        <iso_3166_2_entry
-               code="TD-CB"    name="Chari-Baguirmi" />
+               code="TD-BO"    name="Būrkū" />
        <iso_3166_2_entry
-               code="TD-GR"    name="Guéra" />
+               code="TD-HL"    name="Ḥajjar Lamīs" />
        <iso_3166_2_entry
-               code="TD-HL"    name="Hadjer Lamis" />
+               code="TD-EN"    name="Innīdī" />
        <iso_3166_2_entry
-               code="TD-KA"    name="Kanem" />
+               code="TD-KA"    name="Kānim" />
        <iso_3166_2_entry
-               code="TD-LC"    name="Lac" />
+               code="TD-LO"    name="Lūqūn al Gharbī" />
        <iso_3166_2_entry
-               code="TD-LO"    name="Logone-Occidental" />
+               code="TD-LR"    name="Lūqūn ash Sharqī" />
        <iso_3166_2_entry
-               code="TD-LR"    name="Logone-Oriental" />
+               code="TD-ND"    name="Madīnat Injamīnā" />
        <iso_3166_2_entry
-               code="TD-MA"    name="Mandoul" />
+               code="TD-MA"    name="Māndūl" />
        <iso_3166_2_entry
-               code="TD-ME"    name="Mayo-Kébbi-Est" />
+               code="TD-MO"    name="Māyū Kībbī al Gharbī" />
        <iso_3166_2_entry
-               code="TD-MO"    name="Mayo-Kébbi-Ouest" />
+               code="TD-ME"    name="Māyū Kībbī ash Sharqī" />
        <iso_3166_2_entry
-               code="TD-MC"    name="Moyen-Chari" />
+               code="TD-GR"    name="Qīrā" />
        <iso_3166_2_entry
-               code="TD-ND"    name="Ndjamena" />
+               code="TD-SA"    name="Salāmāt" />
        <iso_3166_2_entry
-               code="TD-OD"    name="Ouaddaï" />
+               code="TD-MC"    name="Shārī al Awsaṭ" />
        <iso_3166_2_entry
-               code="TD-SA"    name="Salamat" />
+               code="TD-CB"    name="Shārī Bāqirmī" />
        <iso_3166_2_entry
-               code="TD-TA"    name="Tandjilé" />
+               code="TD-SI"    name="Sīlā" />
        <iso_3166_2_entry
-               code="TD-WF"    name="Wadi Fira" />
+               code="TD-TA"    name="Tānjilī" />
+       <iso_3166_2_entry
+               code="TD-TI"    name="Tibastī" />
+       <iso_3166_2_entry
+               code="TD-OD"    name="Waddāy" />
+       <iso_3166_2_entry
+               code="TD-WF"    name="Wādī Fīrā" />
 </iso_3166_subset>
 </iso_3166_country>
        <!-- Togo -->
@@ -9153,6 +9468,10 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="TM-M"     name="Mary" />
 </iso_3166_subset>
+<iso_3166_subset type="City">
+       <iso_3166_2_entry
+               code="TM-S"     name="Aşgabat" />
+</iso_3166_subset>
 </iso_3166_country>
        <!-- Tunisia -->
 <iso_3166_country code="TN">
@@ -9632,13 +9951,13 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 <iso_3166_country code="UG">
 <iso_3166_subset type="Geographical region">
        <iso_3166_2_entry
-               code="UG C"     name="Central" />
+               code="UG-C"     name="Central" />
        <iso_3166_2_entry
-               code="UG E"     name="Eastern" />
+               code="UG-E"     name="Eastern" />
        <iso_3166_2_entry
-               code="UG N"     name="Northern" />
+               code="UG-N"     name="Northern" />
        <iso_3166_2_entry
-               code="UG W"     name="Western" />
+               code="UG-W"     name="Western" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
        <iso_3166_2_entry
@@ -9658,11 +9977,15 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="UG-217"   name="Budaka"   parent="E" />
        <iso_3166_2_entry
+               code="UG-223"   name="Bududa"   parent="E" />
+       <iso_3166_2_entry
                code="UG-201"   name="Bugiri"   parent="E" />
        <iso_3166_2_entry
+               code="UG-224"   name="Bukedea"  parent="E" />
+       <iso_3166_2_entry
                code="UG-218"   name="Bukwa"    parent="E" />
        <iso_3166_2_entry
-               code="UG-419"   name="Bulisa"   parent="W" />
+               code="UG-419"   name="Buliisa"  parent="W" />
        <iso_3166_2_entry
                code="UG-401"   name="Bundibugyo"       parent="W" />
        <iso_3166_2_entry
@@ -9736,6 +10059,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="UG-104"   name="Luwero"   parent="C" />
        <iso_3166_2_entry
+               code="UG-116"   name="Lyantonde"        parent="C" />
+       <iso_3166_2_entry
                code="UG-221"   name="Manafwa"  parent="E" />
        <iso_3166_2_entry
                code="UG-320"   name="Maracha"  parent="N" />
@@ -10287,7 +10612,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="YE-AD"    name="'Adan" />
        <iso_3166_2_entry
-               code="YE-DA"    name="Aḑ Ḑāli'" />
+               code="YE-DA"    name="Aḑ Ḑāli‘" />
        <iso_3166_2_entry
                code="YE-BA"    name="Al Bayḑā'" />
        <iso_3166_2_entry
@@ -10313,6 +10638,8 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
        <iso_3166_2_entry
                code="YE-MA"    name="Ma'rib" />
        <iso_3166_2_entry
+               code="YE-RA"    name="Raymah" />
+       <iso_3166_2_entry
                code="YE-SD"    name="Şa'dah" />
        <iso_3166_2_entry
                code="YE-SN"    name="Şan'ā'" />