[Pkg-isocodes-devel] r832 - in trunk/iso-codes: debian iso_3166/iso_3166_2

LI Daobing lidaobing-guest at alioth.debian.org
Mon Mar 5 19:26:21 CET 2007


Author: lidaobing-guest
Date: 2007-03-05 18:26:20 +0000 (Mon, 05 Mar 2007)
New Revision: 832

Modified:
   trunk/iso-codes/debian/changelog
   trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot
   trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml
Log:
iso_3166_2: fix most of the duplicate entry.


Modified: trunk/iso-codes/debian/changelog
===================================================================
--- trunk/iso-codes/debian/changelog	2007-03-05 17:09:12 UTC (rev 831)
+++ trunk/iso-codes/debian/changelog	2007-03-05 18:26:20 UTC (rev 832)
@@ -15,6 +15,7 @@
     - add "City" suffix to the proper place of TW section to avoid the
       duplicate name between County and City.
     - add en.po
+    - fix most of the duplicate entry.
 
   * Changes to ISO-639 list
     (http://www.loc.gov/standards/iso639-2/php/code_changes.php):
@@ -53,7 +54,7 @@
   [ LI Daobing ]
   * update iso2pot.py to keep duplicate information in pot file.
 
- -- LI Daobing <lidaobing at gmail.com>  Tue,  6 Mar 2007 01:08:11 +0800
+ -- LI Daobing <lidaobing at gmail.com>  Tue,  6 Mar 2007 02:23:54 +0800
 
 iso-codes (1.0a-1) unstable; urgency=low
 

Modified: trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot
===================================================================
--- trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot	2007-03-05 17:09:12 UTC (rev 831)
+++ trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot	2007-03-05 18:26:20 UTC (rev 832)
@@ -10,7 +10,7 @@
 "Project-Id-Version: iso-codes 1.0\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2007-03-06 00:38+0800\n"
+"POT-Creation-Date: 2007-03-06 02:22+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -406,8 +406,8 @@
 msgid "Huambo"
 msgstr ""
 
-#. name for AO-HUI, name for CO-HUI
-msgid "Huila"
+#. name for AO-HUI
+msgid "Huila (Angola)"
 msgstr ""
 
 #. name for AO-LUA
@@ -498,24 +498,24 @@
 msgid "Neuquen"
 msgstr ""
 
-#. name for AR-R, name for UY-RN
-msgid "Rio Negro"
+#. name for AR-R
+msgid "Rio Negro (Argentina)"
 msgstr ""
 
 #. name for AR-A
 msgid "Salta"
 msgstr ""
 
-#. name for AR-J, name for DO-22
-msgid "San Juan"
+#. name for AR-J
+msgid "San Juan (Argentina)"
 msgstr ""
 
 #. name for AR-D
 msgid "San Luis"
 msgstr ""
 
-#. name for AR-Z, name for BO-S, name for CV-CR
-msgid "Santa Cruz"
+#. name for AR-Z
+msgid "Santa Cruz (Argentina)"
 msgstr ""
 
 #. name for AR-S
@@ -622,8 +622,8 @@
 msgid "Ganca"
 msgstr ""
 
-#. name for AZ-LA, name for AZ-LAN
-msgid "Lankaran"
+#. name for AZ-LA
+msgid "Lankaran (city)"
 msgstr ""
 
 #. name for AZ-MI
@@ -634,24 +634,24 @@
 msgid "Naftalan"
 msgstr ""
 
-#. name for AZ-SA, name for AZ-SAK
-msgid "Saki"
+#. name for AZ-SA
+msgid "Saki (city)"
 msgstr ""
 
 #. name for AZ-SM
 msgid "Sumqayit"
 msgstr ""
 
-#. name for AZ-SS, name for AZ-SUS
-msgid "Susa"
+#. name for AZ-SS
+msgid "Susa (city)"
 msgstr ""
 
 #. name for AZ-XA
 msgid "Xankandi"
 msgstr ""
 
-#. name for AZ-YE, name for AZ-YEV
-msgid "Yevlax"
+#. name for AZ-YE
+msgid "Yevlax (city)"
 msgstr ""
 
 #. name for AZ-ABS
@@ -762,6 +762,10 @@
 msgid "Lacin"
 msgstr ""
 
+#. name for AZ-LAN
+msgid "Lankaran"
+msgstr ""
+
 #. name for AZ-LER
 msgid "Lerik"
 msgstr ""
@@ -826,6 +830,10 @@
 msgid "Sahbuz"
 msgstr ""
 
+#. name for AZ-SAK
+msgid "Saki"
+msgstr ""
+
 #. name for AZ-SAL
 msgid "Salyan"
 msgstr ""
@@ -850,6 +858,10 @@
 msgid "Siyazan"
 msgstr ""
 
+#. name for AZ-SUS
+msgid "Susa"
+msgstr ""
+
 #. name for AZ-TAR
 msgid "Tartar"
 msgstr ""
@@ -886,6 +898,10 @@
 msgid "Yardimli"
 msgstr ""
 
+#. name for AZ-YEV
+msgid "Yevlax"
+msgstr ""
+
 #. name for AZ-ZAN
 msgid "Zangilan"
 msgstr ""
@@ -1178,12 +1194,12 @@
 msgid "Liege"
 msgstr ""
 
-#. name for BE-VLI, name for NL-LB
-msgid "Limburg"
+#. name for BE-VLI
+msgid "Limburg (Belgium)"
 msgstr ""
 
-#. name for BE-WLX, name for LU-L
-msgid "Luxembourg"
+#. name for BE-WLX
+msgid "Luxembourg (Belgium)"
 msgstr ""
 
 #. name for BE-WNA
@@ -1418,8 +1434,8 @@
 msgid "Lovech"
 msgstr ""
 
-#. name for BG-12, name for US-MT
-msgid "Montana"
+#. name for BG-12
+msgid "Montana (Bulgaria)"
 msgstr ""
 
 #. name for BG-13
@@ -1622,8 +1638,8 @@
 msgid "Kouffo"
 msgstr ""
 
-#. name for BJ-LI, name for CM-LT
-msgid "Littoral"
+#. name for BJ-LI
+msgid "Littoral (Benin)"
 msgstr ""
 
 #. name for BJ-MO
@@ -1634,8 +1650,8 @@
 msgid "Oueme"
 msgstr ""
 
-#. name for BJ-PL, name for NG-PL
-msgid "Plateau"
+#. name for BJ-PL
+msgid "Plateau (Benin)"
 msgstr ""
 
 #. name for BJ-ZO
@@ -1670,8 +1686,8 @@
 msgid "El Beni"
 msgstr ""
 
-#. name for BO-L, name for HN-LP, name for SV-PA
-msgid "La Paz"
+#. name for BO-L
+msgid "La Paz (Bolivia)"
 msgstr ""
 
 #. name for BO-O
@@ -1686,6 +1702,10 @@
 msgid "Potosi"
 msgstr ""
 
+#. name for BO-S
+msgid "Santa Cruz (Bolivia)"
+msgstr ""
+
 #. name for BO-T
 msgid "Tarija"
 msgstr ""
@@ -1698,8 +1718,8 @@
 msgid "Alagoas"
 msgstr ""
 
-#. name for BR-AM, name for PE-AMA, name for VE-Z
-msgid "Amazonas"
+#. name for BR-AM
+msgid "Amazonas (Brazil)"
 msgstr ""
 
 #. name for BR-AP
@@ -1714,8 +1734,8 @@
 msgid "Ceara"
 msgstr ""
 
-#. name for BR-DF, name for MX-DIF
-msgid "Distrito Federal"
+#. name for BR-DF
+msgid "Distrito Federal (Brazil)"
 msgstr ""
 
 #. name for BR-ES
@@ -1746,8 +1766,8 @@
 msgid "Mato Grosso"
 msgstr ""
 
-#. name for BR-PA, name for SR-PR
-msgid "Para"
+#. name for BR-PA
+msgid "Para (Brazil)"
 msgstr ""
 
 #. name for BR-PB
@@ -1786,8 +1806,8 @@
 msgid "Rio Grande do Sul"
 msgstr ""
 
-#. name for BR-SC, name for CV-CA
-msgid "Santa Catarina"
+#. name for BR-SC
+msgid "Santa Catarina (Brazil)"
 msgstr ""
 
 #. name for BR-SE
@@ -1966,8 +1986,8 @@
 msgid "Zhemgang"
 msgstr ""
 
-#. name for BW-CE, name for FJ-C, name for CENT, name for GH-CP, name for KE-200, name for PG-CPM, name for PY-11, name for SB-CE, name for ZM-02
-msgid "Central"
+#. name for BW-CE
+msgid "Central (Botswana)"
 msgstr ""
 
 #. name for BW-GH
@@ -1994,16 +2014,16 @@
 msgid "North-East"
 msgstr ""
 
-#. name for BW-NW, name for CM-NW, name for ZA-NW
-msgid "North-West"
+#. name for BW-NW
+msgid "North-West (Botswana)"
 msgstr ""
 
 #. name for BW-SE
 msgid "South-East"
 msgstr ""
 
-#. name for BW-SO, name for SL-S, name for ZM-07
-msgid "Southern"
+#. name for BW-SO
+msgid "Southern (Botswana)"
 msgstr ""
 
 #. name for BY-BR
@@ -2050,8 +2070,8 @@
 msgid "Stann Creek"
 msgstr ""
 
-#. name for BZ-TOL, name for ES-TO
-msgid "Toledo"
+#. name for BZ-TOL
+msgid "Toledo (Belize)"
 msgstr ""
 
 #. name for CA-AB
@@ -2254,8 +2274,8 @@
 msgid "Niari"
 msgstr ""
 
-#. name for CG-14, name for TG-P
-msgid "Plateaux"
+#. name for CG-14
+msgid "Plateaux (Congo)"
 msgstr ""
 
 #. name for CG-12
@@ -2306,8 +2326,8 @@
 msgid "Graubunden"
 msgstr ""
 
-#. name for CH-JU, name for FR-39
-msgid "Jura"
+#. name for CH-JU
+msgid "Jura (Switzerland)"
 msgstr ""
 
 #. name for CH-LU
@@ -2490,8 +2510,8 @@
 msgid "Adamaoua"
 msgstr ""
 
-#. name for CM-CE, name for HT-CE, name for TG-C
-msgid "Centre"
+#. name for CM-CE
+msgid "Centre (Cameroon)"
 msgstr ""
 
 #. name for CM-ES
@@ -2502,10 +2522,18 @@
 msgid "Far North"
 msgstr ""
 
+#. name for CM-LT
+msgid "Littoral (Cameroon)"
+msgstr ""
+
 #. name for CM-NO
 msgid "North"
 msgstr ""
 
+#. name for CM-NW
+msgid "North-West (Cameroon)"
+msgstr ""
+
 #. name for CM-SU
 msgid "South"
 msgstr ""
@@ -2702,8 +2730,8 @@
 msgid "Cesar"
 msgstr ""
 
-#. name for CO-COR, name for ES-CO
-msgid "Córdoba"
+#. name for CO-COR
+msgid "Córdoba (Colombia)"
 msgstr ""
 
 #. name for CO-CUN
@@ -2722,6 +2750,10 @@
 msgid "Guaviare"
 msgstr ""
 
+#. name for CO-HUI
+msgid "Huila (Colombia)"
+msgstr ""
+
 #. name for CO-LAG
 msgid "La Guajira"
 msgstr ""
@@ -2762,8 +2794,8 @@
 msgid "Santander"
 msgstr ""
 
-#. name for CO-SUC, name for VE-R
-msgid "Sucre"
+#. name for CO-SUC
+msgid "Sucre (Colombia)"
 msgstr ""
 
 #. name for CO-TOL
@@ -2806,8 +2838,8 @@
 msgid "Puntarenas"
 msgstr ""
 
-#. name for CR-SJ, name for UY-SJ
-msgid "San Jose"
+#. name for CR-SJ
+msgid "San Jose (Costa Rica)"
 msgstr ""
 
 #. name for CU-09
@@ -2938,6 +2970,14 @@
 msgid "Sal"
 msgstr ""
 
+#. name for CV-CA
+msgid "Santa Catarina (Cape Verde)"
+msgstr ""
+
+#. name for CV-CR
+msgid "Santa Cruz (Cape Verde)"
+msgstr ""
+
 #. name for CV-SD
 msgid "Sao Domingos"
 msgstr ""
@@ -3106,8 +3146,8 @@
 msgid "Ali Sabieh"
 msgstr ""
 
-#. name for DJ-AR, name for GR-31
-msgid "Arta"
+#. name for DJ-AR
+msgid "Arta (Djibouti)"
 msgstr ""
 
 #. name for DJ-DI
@@ -3286,6 +3326,10 @@
 msgid "San Cristóbal"
 msgstr ""
 
+#. name for DO-22
+msgid "San Juan (Dominican)"
+msgstr ""
+
 #. name for DO-23
 msgid "San Pedro de Macorís"
 msgstr ""
@@ -3306,8 +3350,8 @@
 msgid "Valverde"
 msgstr ""
 
-#. name for DZ-01, name for MR-07
-msgid "Adrar"
+#. name for DZ-01
+msgid "Adrar (Algeria)"
 msgstr ""
 
 #. name for DZ-44
@@ -3502,8 +3546,8 @@
 msgid "Azuay"
 msgstr ""
 
-#. name for EC-B, name for VE-F
-msgid "Bolivar"
+#. name for EC-B
+msgid "Bolivar (Ecuador)"
 msgstr ""
 
 #. name for EC-F
@@ -3834,6 +3878,10 @@
 msgid "Ciudad Real"
 msgstr ""
 
+#. name for ES-CO
+msgid "Córdoba (Spain)"
+msgstr ""
+
 #. name for ES-CU
 msgid "Cuenca"
 msgstr ""
@@ -3842,8 +3890,8 @@
 msgid "Girona [Gerona]"
 msgstr ""
 
-#. name for ES-GR, name for NI-GR
-msgid "Granada"
+#. name for ES-GR
+msgid "Granada (Spain)"
 msgstr ""
 
 #. name for ES-GU
@@ -3946,6 +3994,10 @@
 msgid "Teruel"
 msgstr ""
 
+#. name for ES-TO
+msgid "Toledo (Spain)"
+msgstr ""
+
 #. name for ES-V
 msgid "Valencia"
 msgstr ""
@@ -4102,18 +4154,22 @@
 msgid "Oulun lääni"
 msgstr ""
 
-#. name for FJ-E, name for GH-EP, name for KE-400, name for SL-E, name for ZM-03
-msgid "Eastern"
+#. name for FJ-C
+msgid "Central (Fiji)"
 msgstr ""
 
-#. name for FJ-N, name for GH-NP, name for PG-NPP, name for SL-N, name for ZM-05
-msgid "Northern"
+#. name for FJ-E
+msgid "Eastern (Fiji)"
 msgstr ""
 
-#. name for FJ-W, name for GH-WP, name for PG-WPD, name for SB-WE, name for ZM-01
-msgid "Western"
+#. name for FJ-N
+msgid "Northern (Fiji)"
 msgstr ""
 
+#. name for FJ-W
+msgid "Western (Fiji)"
+msgstr ""
+
 #. name for FJ-R
 msgid "Rotuma"
 msgstr ""
@@ -4330,6 +4386,10 @@
 msgid "Isère"
 msgstr ""
 
+#. name for FR-39
+msgid "Jura (France)"
+msgstr ""
+
 #. name for FR-40
 msgid "Landes"
 msgstr ""
@@ -4398,8 +4458,8 @@
 msgid "Nièvre"
 msgstr ""
 
-#. name for FR-59, name for HT-ND
-msgid "Nord"
+#. name for FR-59
+msgid "Nord (France)"
 msgstr ""
 
 #. name for FR-60
@@ -5014,8 +5074,8 @@
 msgid "Magherafelt"
 msgstr ""
 
-#. name for GB-MAN, name for JM-12
-msgid "Manchester"
+#. name for GB-MAN
+msgid "Manchester (Great Britain)"
 msgstr ""
 
 #. name for GB-MDW
@@ -5454,6 +5514,10 @@
 msgid "Borders"
 msgstr ""
 
+#. name for CENT
+msgid "Central (Great Britain)"
+msgstr ""
+
 #. name for CI
 msgid "Channel Islands"
 msgstr ""
@@ -5586,10 +5650,22 @@
 msgid "Brong-Ahafo"
 msgstr ""
 
+#. name for GH-CP
+msgid "Central (Ghana)"
+msgstr ""
+
+#. name for GH-EP
+msgid "Eastern (Ghana)"
+msgstr ""
+
 #. name for GH-AA
 msgid "Greater Accra"
 msgstr ""
 
+#. name for GH-NP
+msgid "Northern (Ghana)"
+msgstr ""
+
 #. name for GH-UE
 msgid "Upper East"
 msgstr ""
@@ -5602,6 +5678,10 @@
 msgid "Volta"
 msgstr ""
 
+#. name for GH-WP
+msgid "Western (Ghana)"
+msgstr ""
+
 #. name for GM-B
 msgid "Banjul"
 msgstr ""
@@ -5806,6 +5886,10 @@
 msgid "Arkadia"
 msgstr ""
 
+#. name for GR-31
+msgid "Arta (Greece)"
+msgstr ""
+
 #. name for GR-A1
 msgid "Attiki"
 msgstr ""
@@ -6158,8 +6242,8 @@
 msgid "Atlantida"
 msgstr ""
 
-#. name for HN-CL, name for PA-3
-msgid "Colon"
+#. name for HN-CL
+msgid "Colon (Honduras)"
 msgstr ""
 
 #. name for HN-CM
@@ -6198,6 +6282,10 @@
 msgid "Islas de la Bahia"
 msgstr ""
 
+#. name for HN-LP
+msgid "La Paz (Honduras)"
+msgstr ""
+
 #. name for HN-LE
 msgid "Lempira"
 msgstr ""
@@ -6302,10 +6390,18 @@
 msgid "Zagrebacka zupanija"
 msgstr ""
 
+#. name for HT-CE
+msgid "Centre (Haiti)"
+msgstr ""
+
 #. name for HT-GA
 msgid "Grande-Anse"
 msgstr ""
 
+#. name for HT-ND
+msgid "Nord (Haiti)"
+msgstr ""
+
 #. name for HT-NE
 msgid "Nord-Est"
 msgstr ""
@@ -6398,8 +6494,8 @@
 msgid "Vas"
 msgstr ""
 
-#. name for HU-VE, name for HU-VM
-msgid "Veszprém"
+#. name for HU-VE
+msgid "Veszprém (county)"
 msgstr ""
 
 #. name for HU-ZA
@@ -6486,6 +6582,10 @@
 msgid "Tatabánya"
 msgstr ""
 
+#. name for HU-VM
+msgid "Veszprém"
+msgstr ""
+
 #. name for HU-ZE
 msgid "Zalaegerszeg"
 msgstr ""
@@ -6534,14 +6634,18 @@
 msgid "Kalimantan Barat"
 msgstr ""
 
-#. name for ID-KT, name for ID-KI
-msgid "Kalimantan Timur"
+#. name for ID-KT
+msgid "Kalimantan Tengah"
 msgstr ""
 
 #. name for ID-KS
 msgid "Kalimantan Selatan"
 msgstr ""
 
+#. name for ID-KI
+msgid "Kalimantan Timur"
+msgstr ""
+
 #. name for ID-KR
 msgid "Kepulauan Riau"
 msgstr ""
@@ -6862,8 +6966,8 @@
 msgid "Orissa"
 msgstr ""
 
-#. name for IN-PB, name for PK-PB
-msgid "Punjab"
+#. name for IN-PB
+msgid "Punjab (India)"
 msgstr ""
 
 #. name for IN-RJ
@@ -7170,8 +7274,8 @@
 msgid "Avellino"
 msgstr ""
 
-#. name for IT-BA, name for SO-BR
-msgid "Bari"
+#. name for IT-BA
+msgid "Bari (Italy)"
 msgstr ""
 
 #. name for IT-BL
@@ -7642,6 +7746,10 @@
 msgid "Kingston"
 msgstr ""
 
+#. name for JM-12
+msgid "Manchester (Jamaica)"
+msgstr ""
+
 #. name for JM-04
 msgid "Portland"
 msgstr ""
@@ -7922,10 +8030,18 @@
 msgid "Nairobi Municipality"
 msgstr ""
 
+#. name for KE-200
+msgid "Central (Kenya)"
+msgstr ""
+
 #. name for KE-300
 msgid "Coast"
 msgstr ""
 
+#. name for KE-400
+msgid "Eastern (Kenya)"
+msgstr ""
+
 #. name for KE-500
 msgid "North-Eastern Kaskazini Mashariki"
 msgstr ""
@@ -8290,8 +8406,8 @@
 msgid "Zhambyl oblysy Zhambylskaya oblast'"
 msgstr ""
 
-#. name for LA-VT, name for LA-VI
-msgid "Vientiane"
+#. name for LA-VT
+msgid "Vientiane (prefecture)"
 msgstr ""
 
 #. name for LA-AT
@@ -8342,6 +8458,10 @@
 msgid "Savannakhet"
 msgstr ""
 
+#. name for LA-VI
+msgid "Vientiane"
+msgstr ""
+
 #. name for LA-XA
 msgid "Xaignabouli"
 msgstr ""
@@ -8514,8 +8634,8 @@
 msgid "Margibi"
 msgstr ""
 
-#. name for LR-MY, name for US-MD
-msgid "Maryland"
+#. name for LR-MY
+msgid "Maryland (Liberia)"
 msgstr ""
 
 #. name for LR-MO
@@ -8622,6 +8742,10 @@
 msgid "GreveNmacher"
 msgstr ""
 
+#. name for LU-L
+msgid "Luxembourg (Luxembourg)"
+msgstr ""
+
 #. name for LV-AI
 msgid "Aizkraukles Apripkis"
 msgstr ""
@@ -9098,7 +9222,7 @@
 msgid "Gagauzia, Unitate Teritoriala Autonoma"
 msgstr ""
 
-#. name for MD-CU, name for MD-CH
+#. name for MD-CU
 msgid "Chisinau"
 msgstr ""
 
@@ -9110,7 +9234,7 @@
 msgid "Balti"
 msgstr ""
 
-#. name for MD-CA
+#. name for MD-CA, name for MD-CH
 msgid "Cahul"
 msgstr ""
 
@@ -9450,6 +9574,10 @@
 msgid "Nouakchott"
 msgstr ""
 
+#. name for MR-07
+msgid "Adrar (Mauritania)"
+msgstr ""
+
 #. name for MR-03
 msgid "Assaba"
 msgstr ""
@@ -9502,7 +9630,7 @@
 msgid "Curepipe"
 msgstr ""
 
-#. name for MU-PU, name for MU-PL
+#. name for MU-PU
 msgid "Port Louis"
 msgstr ""
 
@@ -9538,6 +9666,10 @@
 msgid "Plaines Wilhems"
 msgstr ""
 
+#. name for MU-PL
+msgid "Port Louis (district)"
+msgstr ""
+
 #. name for MU-RP
 msgid "Riviere du Rempart"
 msgstr ""
@@ -9698,8 +9830,8 @@
 msgid "Mulanje"
 msgstr ""
 
-#. name for MW-MW, name for TZ-18
-msgid "Mwanza"
+#. name for MW-MW
+msgid "Mwanza (Malawi)"
 msgstr ""
 
 #. name for MW-MZ
@@ -9746,6 +9878,10 @@
 msgid "Zomba"
 msgstr ""
 
+#. name for MX-DIF
+msgid "Distrito Federal (Mexico)"
+msgstr ""
+
 #. name for MX-AGU
 msgid "Aguascalientes"
 msgstr ""
@@ -9934,8 +10070,8 @@
 msgid "Terengganu"
 msgstr ""
 
-#. name for MZ-MPM, name for MZ-L
-msgid "Maputo"
+#. name for MZ-MPM
+msgid "Maputo (city)"
 msgstr ""
 
 #. name for MZ-P
@@ -9954,6 +10090,10 @@
 msgid "Manica"
 msgstr ""
 
+#. name for MZ-L
+msgid "Maputo"
+msgstr ""
+
 #. name for MZ-N
 msgid "Numpula"
 msgstr ""
@@ -10182,6 +10322,10 @@
 msgid "Oyo"
 msgstr ""
 
+#. name for NG-PL
+msgid "Plateau (Nigeria)"
+msgstr ""
+
 #. name for NG-RI
 msgid "Rivers"
 msgstr ""
@@ -10222,6 +10366,10 @@
 msgid "Esteli"
 msgstr ""
 
+#. name for NI-GR
+msgid "Granada (Nigeria)"
+msgstr ""
+
 #. name for NI-JI
 msgid "Jinotega"
 msgstr ""
@@ -10286,6 +10434,10 @@
 msgid "Groningen"
 msgstr ""
 
+#. name for NL-LB
+msgid "Limburg (Netherlands)"
+msgstr ""
+
 #. name for NL-NB
 msgid "Noord-Brabant"
 msgstr ""
@@ -10474,8 +10626,8 @@
 msgid "Al Wusta"
 msgstr ""
 
-#. name for OM-SH, name for SA-04
-msgid "Ash Sharqlyah"
+#. name for OM-SH
+msgid "Ash Sharqlyah (Oman)"
 msgstr ""
 
 #. name for OM-ZA
@@ -10498,6 +10650,10 @@
 msgid "Cocle"
 msgstr ""
 
+#. name for PA-3
+msgid "Colon (Panama)"
+msgstr ""
+
 #. name for PA-4
 msgid "Chiriqui"
 msgstr ""
@@ -10530,6 +10686,10 @@
 msgid "El Callao"
 msgstr ""
 
+#. name for PE-AMA
+msgid "Amazonas (Peru)"
+msgstr ""
+
 #. name for PE-ANC
 msgid "Ancash"
 msgstr ""
@@ -10570,8 +10730,8 @@
 msgid "Junin"
 msgstr ""
 
-#. name for PE-LAL, name for SV-LI
-msgid "La Libertad"
+#. name for PE-LAL
+msgid "La Libertad (Peru)"
 msgstr ""
 
 #. name for PE-LAM
@@ -10626,6 +10786,10 @@
 msgid "National Capital District (Port Moresby)"
 msgstr ""
 
+#. name for PG-CPM
+msgid "Central (Papua New Guinea)"
+msgstr ""
+
 #. name for PG-CPK
 msgid "Chimbu"
 msgstr ""
@@ -10670,6 +10834,10 @@
 msgid "New Ireland"
 msgstr ""
 
+#. name for PG-NPP
+msgid "Northern (Papua New Guinea)"
+msgstr ""
+
 #. name for PG-NSA
 msgid "North Solomons"
 msgstr ""
@@ -10682,6 +10850,10 @@
 msgid "Southern Highlands"
 msgstr ""
 
+#. name for PG-WPD
+msgid "Western (Papua New Guinea)"
+msgstr ""
+
 #. name for PG-WHM
 msgid "Western Highlands"
 msgstr ""
@@ -10850,8 +11022,8 @@
 msgid "Lanao del Sur"
 msgstr ""
 
-#. name for PH-LUN, name for SV-UN
-msgid "La Union"
+#. name for PH-LUN
+msgid "La Union (Phillipines)"
 msgstr ""
 
 #. name for PH-LEY
@@ -11018,6 +11190,10 @@
 msgid "North-West Frontier"
 msgstr ""
 
+#. name for PK-PB
+msgid "Punjab (Pakistan)"
+msgstr ""
+
 #. name for PK-SD
 msgid "Sind (en)"
 msgstr ""
@@ -11214,6 +11390,10 @@
 msgid "Canindeyu"
 msgstr ""
 
+#. name for PY-11
+msgid "Central (Paraguay)"
+msgstr ""
+
 #. name for PY-1
 msgid "Concepcion"
 msgstr ""
@@ -11866,8 +12046,8 @@
 msgid "Al H,udd ash Shamallyah"
 msgstr ""
 
-#. name for SA-12, name for YE-JA
-msgid "Al Jawf"
+#. name for SA-12
+msgid "Al Jawf (Saudi Arabia)"
 msgstr ""
 
 #. name for SA-03
@@ -11882,6 +12062,10 @@
 msgid "Ar Riyad"
 msgstr ""
 
+#. name for SA-04
+msgid "Ash Sharqlyah (Saudi Arabia)"
+msgstr ""
+
 #. name for SA-14
 msgid "Asir"
 msgstr ""
@@ -11910,6 +12094,10 @@
 msgid "Capital Territory (Honiara)"
 msgstr ""
 
+#. name for SB-CE
+msgid "Central (Solomon Islands)"
+msgstr ""
+
 #. name for SB-GU
 msgid "Guadalcanal"
 msgstr ""
@@ -11930,6 +12118,10 @@
 msgid "Temotu"
 msgstr ""
 
+#. name for SB-WE
+msgid "Western (Solomon Islands)"
+msgstr ""
+
 #. name for SD-23
 msgid "A'ali an Nil"
 msgstr ""
@@ -12774,6 +12966,18 @@
 msgid "Western Area (Freetown)"
 msgstr ""
 
+#. name for SL-E
+msgid "Eastern (Sierra Leone)"
+msgstr ""
+
+#. name for SL-N
+msgid "Northern (Sierra Leone)"
+msgstr ""
+
+#. name for SL-S
+msgid "Southern (Sierra Leone)"
+msgstr ""
+
 #. name for SN-DK
 msgid "Dakar"
 msgstr ""
@@ -12830,6 +13034,10 @@
 msgid "Banaadir"
 msgstr ""
 
+#. name for SO-BR
+msgid "Bari (Somalia)"
+msgstr ""
+
 #. name for SO-BY
 msgid "Bay"
 msgstr ""
@@ -12906,6 +13114,10 @@
 msgid "Nickerie"
 msgstr ""
 
+#. name for SR-PR
+msgid "Para (Suriname)"
+msgstr ""
+
 #. name for SR-PM
 msgid "Paramaribo"
 msgstr ""
@@ -12946,6 +13158,18 @@
 msgid "Chalatenango"
 msgstr ""
 
+#. name for SV-LI
+msgid "La Libertad (El Salvador)"
+msgstr ""
+
+#. name for SV-PA
+msgid "La Paz (El Salvador)"
+msgstr ""
+
+#. name for SV-UN
+msgid "La Union (El Salvador)"
+msgstr ""
+
 #. name for SV-MO
 msgid "Morazan"
 msgstr ""
@@ -13102,6 +13326,10 @@
 msgid "Tandjile"
 msgstr ""
 
+#. name for TG-C
+msgid "Centre (Togo)"
+msgstr ""
+
 #. name for TG-K
 msgid "Kara"
 msgstr ""
@@ -13110,6 +13338,10 @@
 msgid "Maritime (Region)"
 msgstr ""
 
+#. name for TG-P
+msgid "Plateaux (Togo)"
+msgstr ""
+
 #. name for TG-S
 msgid "Savannes"
 msgstr ""
@@ -14150,6 +14382,10 @@
 msgid "Mtwara"
 msgstr ""
 
+#. name for TZ-18
+msgid "Mwanza (Tanzania)"
+msgstr ""
+
 #. name for TZ-19
 msgid "Pwani"
 msgstr ""
@@ -14586,8 +14822,8 @@
 msgid "District of Columbia"
 msgstr ""
 
-#. name for US-FL, name for UY-FD
-msgid "Florida"
+#. name for US-FL
+msgid "Florida (USA)"
 msgstr ""
 
 #. name for US-GA
@@ -14634,6 +14870,10 @@
 msgid "Maine"
 msgstr ""
 
+#. name for US-MD
+msgid "Maryland (USA)"
+msgstr ""
+
 #. name for US-MA
 msgid "Massachusetts"
 msgstr ""
@@ -14654,6 +14894,10 @@
 msgid "Missouri"
 msgstr ""
 
+#. name for US-MT
+msgid "Montana (USA)"
+msgstr ""
+
 #. name for US-NE
 msgid "Nebraska"
 msgstr ""
@@ -14802,6 +15046,10 @@
 msgid "Flores"
 msgstr ""
 
+#. name for UY-FD
+msgid "Florida (Uruguay)"
+msgstr ""
+
 #. name for UY-LA
 msgid "Lavalleja"
 msgstr ""
@@ -14818,6 +15066,10 @@
 msgid "Paysandu"
 msgstr ""
 
+#. name for UY-RN
+msgid "Rio Negro (Uruguay)"
+msgstr ""
+
 #. name for UY-RV
 msgid "Rivera"
 msgstr ""
@@ -14830,6 +15082,10 @@
 msgid "Salto"
 msgstr ""
 
+#. name for UY-SJ
+msgid "San Jose (Uruguay)"
+msgstr ""
+
 #. name for UY-SO
 msgid "Soriano"
 msgstr ""
@@ -14922,6 +15178,10 @@
 msgid "Barinas"
 msgstr ""
 
+#. name for VE-F
+msgid "Bolivar (Venezuela)"
+msgstr ""
+
 #. name for VE-G
 msgid "Carabobo"
 msgstr ""
@@ -14962,6 +15222,10 @@
 msgid "Portuguesa"
 msgstr ""
 
+#. name for VE-R
+msgid "Sucre (Venezuela)"
+msgstr ""
+
 #. name for VE-S
 msgid "Tachira"
 msgstr ""
@@ -14982,6 +15246,10 @@
 msgid "Zulia"
 msgstr ""
 
+#. name for VE-Z
+msgid "Amazonas (Venezuela)"
+msgstr ""
+
 #. name for VE-Y
 msgid "Delta Amacuro"
 msgstr ""
@@ -15350,6 +15618,10 @@
 msgid "Al Hudaydah"
 msgstr ""
 
+#. name for YE-JA
+msgid "Al Jawf (Yemen)"
+msgstr ""
+
 #. name for YE-MR
 msgid "Al Mahrah"
 msgstr ""
@@ -15430,14 +15702,26 @@
 msgid "Limpopo"
 msgstr ""
 
+#. name for ZA-NW
+msgid "North-West (South Africa)"
+msgstr ""
+
 #. name for ZA-WC
 msgid "Western Cape"
 msgstr ""
 
+#. name for ZM-02
+msgid "Central (Zambia)"
+msgstr ""
+
 #. name for ZM-08
 msgid "Copperbelt"
 msgstr ""
 
+#. name for ZM-03
+msgid "Eastern (Zambia)"
+msgstr ""
+
 #. name for ZM-04
 msgid "Luapula"
 msgstr ""
@@ -15446,10 +15730,22 @@
 msgid "Lusaka"
 msgstr ""
 
+#. name for ZM-05
+msgid "Northern (Zambia)"
+msgstr ""
+
 #. name for ZM-06
 msgid "North-Western"
 msgstr ""
 
+#. name for ZM-07
+msgid "Southern (Zambia)"
+msgstr ""
+
+#. name for ZM-01
+msgid "Western (Zambia)"
+msgstr ""
+
 #. name for ZW-BU
 msgid "Bulawayo"
 msgstr ""

Modified: trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml
===================================================================
--- trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml	2007-03-05 17:09:12 UTC (rev 831)
+++ trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml	2007-03-05 18:26:20 UTC (rev 832)
@@ -263,14 +263,14 @@
 		code="AO-CCU"	name="Cuando-Cubango" />
 	<iso_3166_2_entry
 		code="AO-CNO"	name="Cuanza Norte" />
-		<iso_3166_2_entry
+	<iso_3166_2_entry
 		code="AO-CUS"	name="Cuanza Sul" />
 	<iso_3166_2_entry
 		code="AO-CNN"	name="Cunene" />
 	<iso_3166_2_entry
 		code="AO-HUA"	name="Huambo" />
 	<iso_3166_2_entry
-		code="AO-HUI"	name="Huila" />
+		code="AO-HUI"	name="Huila (Angola)" />
 	<iso_3166_2_entry
 		code="AO-LUA"	name="Luanda" />
 	<iso_3166_2_entry
@@ -319,15 +319,15 @@
 	<iso_3166_2_entry
 		code="AR-Q"	name="Neuquen" />
 	<iso_3166_2_entry
-		code="AR-R"	name="Rio Negro" />
+		code="AR-R"	name="Rio Negro (Argentina)" />
 	<iso_3166_2_entry
 		code="AR-A"	name="Salta" />
 	<iso_3166_2_entry
-		code="AR-J"	name="San Juan" />
+		code="AR-J"	name="San Juan (Argentina)" />
 	<iso_3166_2_entry
 		code="AR-D"	name="San Luis" />
 	<iso_3166_2_entry
-		code="AR-Z"	name="Santa Cruz" />
+		code="AR-Z"	name="Santa Cruz (Argentina)" />
 	<iso_3166_2_entry
 		code="AR-S"	name="Santa Fe" />
 	<iso_3166_2_entry
@@ -390,21 +390,21 @@
 	<iso_3166_2_entry
 		code="AZ-GA"	name="Ganca" />
 	<iso_3166_2_entry
-		code="AZ-LA"	name="Lankaran" />
+		code="AZ-LA"	name="Lankaran (city)" />
 	<iso_3166_2_entry
 		code="AZ-MI"	name="Mingacevir" />
 	<iso_3166_2_entry
 		code="AZ-NA"	name="Naftalan" />
 	<iso_3166_2_entry
-		code="AZ-SA"	name="Saki" />
+		code="AZ-SA"	name="Saki (city)" />
 	<iso_3166_2_entry
 		code="AZ-SM"	name="Sumqayit" />
 	<iso_3166_2_entry
-		code="AZ-SS"	name="Susa" />
+		code="AZ-SS"	name="Susa (city)" />
 	<iso_3166_2_entry
 		code="AZ-XA"	name="Xankandi" />
 	<iso_3166_2_entry
-		code="AZ-YE"	name="Yevlax" />
+		code="AZ-YE"	name="Yevlax (city)" />
 	<iso_3166_2_entry
 		code="AZ-ABS"	name="Abseron" />
 	<iso_3166_2_entry
@@ -685,9 +685,9 @@
 	<iso_3166_2_entry
 		code="BE-WLG"	name="Liege" />
 	<iso_3166_2_entry
-		code="BE-VLI"	name="Limburg" />
+		code="BE-VLI"	name="Limburg (Belgium)" />
 	<iso_3166_2_entry
-		code="BE-WLX"	name="Luxembourg" />
+		code="BE-WLX"	name="Luxembourg (Belgium)" />
 	<iso_3166_2_entry
 		code="BE-WNA"	name="Namur" />
 	<iso_3166_2_entry
@@ -811,7 +811,7 @@
 	<iso_3166_2_entry
 		code="BG-11"	name="Lovech" />
 	<iso_3166_2_entry
-		code="BG-12"	name="Montana" />
+		code="BG-12"	name="Montana (Bulgaria)" />
 	<iso_3166_2_entry
 		code="BG-13"	name="Pazardzik" />
 	<iso_3166_2_entry
@@ -922,13 +922,13 @@
 	<iso_3166_2_entry
 		code="BJ-KO"	name="Kouffo" />
 	<iso_3166_2_entry
-		code="BJ-LI"	name="Littoral" />
+		code="BJ-LI"	name="Littoral (Benin)" />
 	<iso_3166_2_entry
 		code="BJ-MO"	name="Mono" />
 	<iso_3166_2_entry
 		code="BJ-OU"	name="Oueme" />
 	<iso_3166_2_entry
-		code="BJ-PL"	name="Plateau" />
+		code="BJ-PL"	name="Plateau (Benin)" />
 	<iso_3166_2_entry
 		code="BJ-ZO"	name="Zou" />
 </iso_3166_country>
@@ -952,7 +952,7 @@
 	<iso_3166_2_entry
 		code="BO-B"	name="El Beni" />
 	<iso_3166_2_entry
-		code="BO-L"	name="La Paz" />
+		code="BO-L"	name="La Paz (Bolivia)" />
 	<iso_3166_2_entry
 		code="BO-O"	name="Oruro" />
 	<iso_3166_2_entry
@@ -960,7 +960,7 @@
 	<iso_3166_2_entry
 		code="BO-P"	name="Potosi" />
 	<iso_3166_2_entry
-		code="BO-S"	name="Santa Cruz" />
+		code="BO-S"	name="Santa Cruz (Bolivia)" />
 	<iso_3166_2_entry
 		code="BO-T"	name="Tarija" />
 </iso_3166_country>
@@ -971,7 +971,7 @@
 	<iso_3166_2_entry
 		code="BR-AL"	name="Alagoas" />
 	<iso_3166_2_entry
-		code="BR-AM"	name="Amazonas" />
+		code="BR-AM"	name="Amazonas (Brazil)" />
 	<iso_3166_2_entry
 		code="BR-AP"	name="Amapa" />
 	<iso_3166_2_entry
@@ -979,7 +979,7 @@
 	<iso_3166_2_entry
 		code="BR-CE"	name="Ceara" />
 	<iso_3166_2_entry
-		code="BR-DF"	name="Distrito Federal" />
+		code="BR-DF"	name="Distrito Federal (Brazil)" />
 	<iso_3166_2_entry
 		code="BR-ES"	name="Espirito Santo" />
 	<iso_3166_2_entry
@@ -995,7 +995,7 @@
 	<iso_3166_2_entry
 		code="BR-MT"	name="Mato Grosso" />
 	<iso_3166_2_entry
-		code="BR-PA"	name="Para" />
+		code="BR-PA"	name="Para (Brazil)" />
 	<iso_3166_2_entry
 		code="BR-PB"	name="Paraiba" />
 	<iso_3166_2_entry
@@ -1015,7 +1015,7 @@
 	<iso_3166_2_entry
 		code="BR-RS"	name="Rio Grande do Sul" />
 	<iso_3166_2_entry
-		code="BR-SC"	name="Santa Catarina" />
+		code="BR-SC"	name="Santa Catarina (Brazil)" />
 	<iso_3166_2_entry
 		code="BR-SE"	name="Sergipe" />
 	<iso_3166_2_entry
@@ -1114,7 +1114,7 @@
 	<!-- Botswana -->
 <iso_3166_country code="BW">
 	<iso_3166_2_entry
-		code="BW-CE"	name="Central" />
+		code="BW-CE"	name="Central (Botswana)" />
 	<iso_3166_2_entry
 		code="BW-GH"	name="Ghanzi" />
 	<iso_3166_2_entry
@@ -1128,11 +1128,11 @@
 	<iso_3166_2_entry
 		code="BW-NE"	name="North-East" />
 	<iso_3166_2_entry
-		code="BW-NW"	name="North-West" />
+		code="BW-NW"	name="North-West (Botswana)" />
 	<iso_3166_2_entry
 		code="BW-SE"	name="South-East" />
 	<iso_3166_2_entry
-		code="BW-SO"	name="Southern" />
+		code="BW-SO"	name="Southern (Botswana)" />
 </iso_3166_country>
 	<!-- Belarus -->
 <iso_3166_country code="BY-BR">
@@ -1163,7 +1163,7 @@
 	<iso_3166_2_entry
 		code="BZ-SC"	name="Stann Creek" />
 	<iso_3166_2_entry
-		code="BZ-TOL"	name="Toledo" />
+		code="BZ-TOL"	name="Toledo (Belize)" />
 </iso_3166_country>
 	<!-- Canada -->
 <iso_3166_country code="CA">
@@ -1282,7 +1282,7 @@
 	<iso_3166_2_entry
 		code="CG-9"	name="Niari" />
 	<iso_3166_2_entry
-		code="CG-14"	name="Plateaux" />
+		code="CG-14"	name="Plateaux (Congo)" />
 	<iso_3166_2_entry
 		code="CG-12"	name="Pool" />
 	<iso_3166_2_entry
@@ -1311,7 +1311,7 @@
 	<iso_3166_2_entry
 		code="CH-GR"	name="Graubunden" />
 	<iso_3166_2_entry
-		code="CH-JU"	name="Jura" />
+		code="CH-JU"	name="Jura (Switzerland)" />
 	<iso_3166_2_entry
 		code="CH-LU"	name="Luzern" />
 	<iso_3166_2_entry
@@ -1412,17 +1412,17 @@
 	<iso_3166_2_entry
 		code="CM-AD"	name="Adamaoua" />
 	<iso_3166_2_entry
-		code="CM-CE"	name="Centre" />
+		code="CM-CE"	name="Centre (Cameroon)" />
 	<iso_3166_2_entry
 		code="CM-ES"	name="East" />
 	<iso_3166_2_entry
 		code="CM-EN"	name="Far North" />
 	<iso_3166_2_entry
-		code="CM-LT"	name="Littoral" />
+		code="CM-LT"	name="Littoral (Cameroon)" />
 	<iso_3166_2_entry
 		code="CM-NO"	name="North" />
 	<iso_3166_2_entry
-		code="CM-NW"	name="North-West" />
+		code="CM-NW"	name="North-West (Cameroon)" />
 	<iso_3166_2_entry
 		code="CM-SU"	name="South" />
 	<iso_3166_2_entry
@@ -1529,7 +1529,7 @@
 	<iso_3166_2_entry
 		code="CO-CES"	name="Cesar" />
 	<iso_3166_2_entry
-		code="CO-COR"	name="Córdoba" />
+		code="CO-COR"	name="Córdoba (Colombia)" />
 	<iso_3166_2_entry
 		code="CO-CUN"	name="Cundinamarca" />
 	<iso_3166_2_entry
@@ -1539,7 +1539,7 @@
 	<iso_3166_2_entry
 		code="CO-GUV"	name="Guaviare" />
 	<iso_3166_2_entry
-		code="CO-HUI"	name="Huila" />
+		code="CO-HUI"	name="Huila (Colombia)" />
 	<iso_3166_2_entry
 		code="CO-LAG"	name="La Guajira" />
 	<iso_3166_2_entry
@@ -1561,7 +1561,7 @@
 	<iso_3166_2_entry
 		code="CO-SAN"	name="Santander" />
 	<iso_3166_2_entry
-		code="CO-SUC"	name="Sucre" />
+		code="CO-SUC"	name="Sucre (Colombia)" />
 	<iso_3166_2_entry
 		code="CO-TOL"	name="Tolima" />
 	<iso_3166_2_entry
@@ -1586,7 +1586,7 @@
 	<iso_3166_2_entry
 		code="CR-P"	name="Puntarenas" />
 	<iso_3166_2_entry
-		code="CR-SJ"	name="San Jose" />
+		code="CR-SJ"	name="San Jose (Costa Rica)" />
 </iso_3166_country>
 	<!-- Cuba -->
 <iso_3166_country code="CU">
@@ -1667,9 +1667,9 @@
 	<iso_3166_2_entry
 		code="CV-SL"	name="Sal" />
 	<iso_3166_2_entry
-		code="CV-CA"	name="Santa Catarina" />
+		code="CV-CA"	name="Santa Catarina (Cape Verde)" />
 	<iso_3166_2_entry
-		code="CV-CR"	name="Santa Cruz" />
+		code="CV-CR"	name="Santa Cruz (Cape Verde)" />
 	<iso_3166_2_entry
 		code="CV-SD"	name="Sao Domingos" />
 	<iso_3166_2_entry
@@ -1768,7 +1768,7 @@
 	<iso_3166_2_entry
 		code="DJ-AS"	name="Ali Sabieh" />
 	<iso_3166_2_entry
-		code="DJ-AR"	name="Arta" />
+		code="DJ-AR"	name="Arta (Djibouti)" />
 	<iso_3166_2_entry
 		code="DJ-DI"	name="Dikhil" />
 	<iso_3166_2_entry
@@ -1872,7 +1872,7 @@
 	<iso_3166_2_entry
 		code="DO-21"	name="San Cristóbal" />
 	<iso_3166_2_entry
-		code="DO-22"	name="San Juan" />
+		code="DO-22"	name="San Juan (Dominican)" />
 	<iso_3166_2_entry
 		code="DO-23"	name="San Pedro de Macorís" />
 	<iso_3166_2_entry
@@ -1888,7 +1888,7 @@
 	<!-- Algeria -->
 <iso_3166_country code="DZ">
 	<iso_3166_2_entry
-		code="DZ-01"	name="Adrar" />
+		code="DZ-01"	name="Adrar (Algeria)" />
 	<iso_3166_2_entry
 		code="DZ-44"	name="Ain Defla" />
 	<iso_3166_2_entry
@@ -1989,7 +1989,7 @@
 	<iso_3166_2_entry
 		code="EC-A"	name="Azuay" />
 	<iso_3166_2_entry
-		code="EC-B"	name="Bolivar" />
+		code="EC-B"	name="Bolivar (Ecuador)" />
 	<iso_3166_2_entry
 		code="EC-F"	name="Canar" />
 	<iso_3166_2_entry
@@ -2169,13 +2169,13 @@
 	<iso_3166_2_entry
 		code="ES-CR"	name="Ciudad Real" />
 	<iso_3166_2_entry
-		code="ES-CO"	name="Córdoba" />
+		code="ES-CO"	name="Córdoba (Spain)" />
 	<iso_3166_2_entry
 		code="ES-CU"	name="Cuenca" />
 	<iso_3166_2_entry
 		code="ES-GE"	name="Girona [Gerona]" />
 	<iso_3166_2_entry
-		code="ES-GR"	name="Granada" />
+		code="ES-GR"	name="Granada (Spain)" />
 	<iso_3166_2_entry
 		code="ES-GU"	name="Guadalajara" />
 	<iso_3166_2_entry
@@ -2227,7 +2227,7 @@
 	<iso_3166_2_entry
 		code="ES-TE"	name="Teruel" />
 	<iso_3166_2_entry
-		code="ES-TO"	name="Toledo" />
+		code="ES-TO"	name="Toledo (Spain)" />
 	<iso_3166_2_entry
 		code="ES-V"	name="Valencia" />
 	<iso_3166_2_entry
@@ -2307,13 +2307,13 @@
 	<!-- Fiji -->
 <iso_3166_country code="FJ">
 	<iso_3166_2_entry
-		code="FJ-C"	name="Central" />
+		code="FJ-C"	name="Central (Fiji)" />
 	<iso_3166_2_entry
-		code="FJ-E"	name="Eastern" />
+		code="FJ-E"	name="Eastern (Fiji)" />
 	<iso_3166_2_entry
-		code="FJ-N"	name="Northern" />
+		code="FJ-N"	name="Northern (Fiji)" />
 	<iso_3166_2_entry
-		code="FJ-W"	name="Western" />
+		code="FJ-W"	name="Western (Fiji)" />
 	<iso_3166_2_entry
 		code="FJ-R"	name="Rotuma" />
 </iso_3166_country>
@@ -2430,7 +2430,7 @@
 	<iso_3166_2_entry
 		code="FR-38"	name="Isère" />
 	<iso_3166_2_entry
-		code="FR-39"	name="Jura" />
+		code="FR-39"	name="Jura (France)" />
 	<iso_3166_2_entry
 		code="FR-40"	name="Landes" />
 	<iso_3166_2_entry
@@ -2466,7 +2466,7 @@
 	<iso_3166_2_entry
 		code="FR-58"	name="Nièvre" />
 	<iso_3166_2_entry
-		code="FR-59"	name="Nord" />
+		code="FR-59"	name="Nord (France)" />
 	<iso_3166_2_entry
 		code="FR-60"	name="Oise" />
 	<iso_3166_2_entry
@@ -2777,7 +2777,7 @@
 	<iso_3166_2_entry
 		code="GB-MFT"	name="Magherafelt" />
 	<iso_3166_2_entry
-		code="GB-MAN"	name="Manchester" />
+		code="GB-MAN"	name="Manchester (Great Britain)" />
 	<iso_3166_2_entry
 		code="GB-MDW"	name="Medway" />
 	<iso_3166_2_entry
@@ -2999,7 +2999,7 @@
 	<region	code="BORDER"	name="Borders" />
 	<region	code="BUCKS"	name="Buckinghamshire" />
 	<region	code="CAMBS"	name="Cambridgeshire" />
-	<region	code="CENT"	name="Central" />
+	<region	code="CENT"	name="Central (Great Britain)" />
 	<region	code="CI"	name="Channel Islands" />
 	<region	code="CHESH"	name="Cheshire" />
 	<region	code="CLEV"	name="Cleveland" />
@@ -3065,13 +3065,13 @@
 	<iso_3166_2_entry
 		code="GH-BA"	name="Brong-Ahafo" />
 	<iso_3166_2_entry
-		code="GH-CP"	name="Central" />
+		code="GH-CP"	name="Central (Ghana)" />
 	<iso_3166_2_entry
-		code="GH-EP"	name="Eastern" />
+		code="GH-EP"	name="Eastern (Ghana)" />
 	<iso_3166_2_entry
 		code="GH-AA"	name="Greater Accra" />
 	<iso_3166_2_entry
-		code="GH-NP"	name="Northern" />
+		code="GH-NP"	name="Northern (Ghana)" />
 	<iso_3166_2_entry
 		code="GH-UE"	name="Upper East" />
 	<iso_3166_2_entry
@@ -3079,7 +3079,7 @@
 	<iso_3166_2_entry
 		code="GH-TV"	name="Volta" />
 	<iso_3166_2_entry
-		code="GH-WP"	name="Western" />
+		code="GH-WP"	name="Western (Ghana)" />
 </iso_3166_country>
 	<!-- Gambia -->
 <iso_3166_country code="GM">
@@ -3195,7 +3195,7 @@
 	<iso_3166_2_entry
 		code="GR-12"	name="Arkadia" />
 	<iso_3166_2_entry
-		code="GR-31"	name="Arta" />
+		code="GR-31"	name="Arta (Greece)" />
 	<iso_3166_2_entry
 		code="GR-A1"	name="Attiki" />
 	<iso_3166_2_entry
@@ -3385,7 +3385,7 @@
 	<iso_3166_2_entry
 		code="HN-AT"	name="Atlantida" />
 	<iso_3166_2_entry
-		code="HN-CL"	name="Colon" />
+		code="HN-CL"	name="Colon (Honduras)" />
 	<iso_3166_2_entry
 		code="HN-CM"	name="Comayagua" />
 	<iso_3166_2_entry
@@ -3405,7 +3405,7 @@
 	<iso_3166_2_entry
 		code="HN-IB"	name="Islas de la Bahia" />
 	<iso_3166_2_entry
-		code="HN-LP"	name="La Paz" />
+		code="HN-LP"	name="La Paz (Honduras)" />
 	<iso_3166_2_entry
 		code="HN-LE"	name="Lempira" />
 	<iso_3166_2_entry
@@ -3465,11 +3465,11 @@
 	<!-- Haiti -->
 <iso_3166_country code="HT">
 	<iso_3166_2_entry
-		code="HT-CE"	name="Centre" />
+		code="HT-CE"	name="Centre (Haiti)" />
 	<iso_3166_2_entry
 		code="HT-GA"	name="Grande-Anse" />
 	<iso_3166_2_entry
-		code="HT-ND"	name="Nord" />
+		code="HT-ND"	name="Nord (Haiti)" />
 	<iso_3166_2_entry
 		code="HT-NE"	name="Nord-Est" />
 	<iso_3166_2_entry
@@ -3521,7 +3521,7 @@
 	<iso_3166_2_entry
 		code="HU-VA"	name="Vas" />
 	<iso_3166_2_entry
-		code="HU-VE"	name="Veszprém" />
+		code="HU-VE"	name="Veszprém (county)" />
 	<iso_3166_2_entry
 		code="HU-ZA"	name="Zala" />
 	<iso_3166_2_entry
@@ -3597,7 +3597,7 @@
 	<iso_3166_2_entry
 		code="ID-KB"	name="Kalimantan Barat" />
 	<iso_3166_2_entry
-		code="ID-KT"	name="Kalimantan Timur" />
+		code="ID-KT"	name="Kalimantan Tengah" />
 	<iso_3166_2_entry
 		code="ID-KS"	name="Kalimantan Selatan" />
 	<iso_3166_2_entry
@@ -3777,7 +3777,7 @@
 	<iso_3166_2_entry
 		code="IN-OR"	name="Orissa" />
 	<iso_3166_2_entry
-		code="IN-PB"	name="Punjab" />
+		code="IN-PB"	name="Punjab (India)" />
 	<iso_3166_2_entry
 		code="IN-RJ"	name="Rajasthan" />
 	<iso_3166_2_entry
@@ -3945,7 +3945,7 @@
 	<iso_3166_2_entry
 		code="IT-AV"	name="Avellino" />
 	<iso_3166_2_entry
-		code="IT-BA"	name="Bari" />
+		code="IT-BA"	name="Bari (Italy)" />
 	<iso_3166_2_entry
 		code="IT-BL"	name="Belluno" />
 	<iso_3166_2_entry
@@ -4167,7 +4167,7 @@
 	<iso_3166_2_entry
 		code="JM-01"	name="Kingston" />
 	<iso_3166_2_entry
-		code="JM-12"	name="Manchester" />
+		code="JM-12"	name="Manchester (Jamaica)" />
 	<iso_3166_2_entry
 		code="JM-04"	name="Portland" />
 	<iso_3166_2_entry
@@ -4320,11 +4320,11 @@
 	<iso_3166_2_entry
 		code="KE-110"	name="Nairobi Municipality" />
 	<iso_3166_2_entry
-		code="KE-200"	name="Central" />
+		code="KE-200"	name="Central (Kenya)" />
 	<iso_3166_2_entry
 		code="KE-300"	name="Coast" />
 	<iso_3166_2_entry
-		code="KE-400"	name="Eastern" />
+		code="KE-400"	name="Eastern (Kenya)" />
 	<iso_3166_2_entry
 		code="KE-500"	name="North-Eastern Kaskazini Mashariki" />
 	<iso_3166_2_entry
@@ -4545,7 +4545,7 @@
 	<!-- Laos -->
 <iso_3166_country code="LA">
 	<iso_3166_2_entry
-		code="LA-VT"	name="Vientiane" />
+		code="LA-VT"	name="Vientiane (prefecture)" />
 	<iso_3166_2_entry
 		code="LA-AT"	name="Attapu" />
 	<iso_3166_2_entry
@@ -4668,7 +4668,7 @@
 	<iso_3166_2_entry
 		code="LR-MG"	name="Margibi" />
 	<iso_3166_2_entry
-		code="LR-MY"	name="Maryland" />
+		code="LR-MY"	name="Maryland (Liberia)" />
 	<iso_3166_2_entry
 		code="LR-MO"	name="Montserrado" />
 	<iso_3166_2_entry
@@ -4731,7 +4731,7 @@
 	<iso_3166_2_entry
 		code="LU-G"	name="GreveNmacher" />
 	<iso_3166_2_entry
-		code="LU-L"	name="Luxembourg" />
+		code="LU-L"	name="Luxembourg (Luxembourg)" />
 </iso_3166_country>
 	<!-- Latvia -->
 <iso_3166_country code="LV">
@@ -4991,7 +4991,7 @@
 	<iso_3166_2_entry
 		code="MD-CA"	name="Cahul" />
 	<iso_3166_2_entry
-		code="MD-CH"	name="Chisinau" />
+		code="MD-CH"	name="Cahul" />
 	<iso_3166_2_entry
 		code="MD-ED"	name="Edinet" />
 	<iso_3166_2_entry
@@ -5182,7 +5182,7 @@
 	<iso_3166_2_entry
 		code="MR-NKC"	name="Nouakchott" />
 	<iso_3166_2_entry
-		code="MR-07"	name="Adrar" />
+		code="MR-07"	name="Adrar (Mauritania)" />
 	<iso_3166_2_entry
 		code="MR-03"	name="Assaba" />
 	<iso_3166_2_entry
@@ -5234,7 +5234,7 @@
 	<iso_3166_2_entry
 		code="MU-PW"	name="Plaines Wilhems" />
 	<iso_3166_2_entry
-		code="MU-PL"	name="Port Louis" />
+		code="MU-PL"	name="Port Louis (district)" />
 	<iso_3166_2_entry
 		code="MU-RP"	name="Riviere du Rempart" />
 	<iso_3166_2_entry
@@ -5325,7 +5325,7 @@
 	<iso_3166_2_entry
 		code="MW-MU"	name="Mulanje" />
 	<iso_3166_2_entry
-		code="MW-MW"	name="Mwanza" />
+		code="MW-MW"	name="Mwanza (Malawi)" />
 	<iso_3166_2_entry
 		code="MW-MZ"	name="Mzimba" />
 	<iso_3166_2_entry
@@ -5352,7 +5352,7 @@
 	<!-- Mexico -->
 <iso_3166_country code="MX">
 	<iso_3166_2_entry
-		code="MX-DIF"	name="Distrito Federal" />
+		code="MX-DIF"	name="Distrito Federal (Mexico)" />
 	<iso_3166_2_entry
 		code="MX-AGU"	name="Aguascalientes" />
 	<iso_3166_2_entry
@@ -5459,7 +5459,7 @@
 	<!-- Mozambique -->
 <iso_3166_country code="MZ">
 	<iso_3166_2_entry
-		code="MZ-MPM"	name="Maputo" />
+		code="MZ-MPM"	name="Maputo (city)" />
 	<iso_3166_2_entry
 		code="MZ-P"	name="Cabo Delgado" />
 	<iso_3166_2_entry
@@ -5597,7 +5597,7 @@
 	<iso_3166_2_entry
 		code="NG-OY"	name="Oyo" />
 	<iso_3166_2_entry
-		code="NG-PL"	name="Plateau" />
+		code="NG-PL"	name="Plateau (Nigeria)" />
 	<iso_3166_2_entry
 		code="NG-RI"	name="Rivers" />
 	<iso_3166_2_entry
@@ -5624,7 +5624,7 @@
 	<iso_3166_2_entry
 		code="NI-ES"	name="Esteli" />
 	<iso_3166_2_entry
-		code="NI-GR"	name="Granada" />
+		code="NI-GR"	name="Granada (Nigeria)" />
 	<iso_3166_2_entry
 		code="NI-JI"	name="Jinotega" />
 	<iso_3166_2_entry
@@ -5664,7 +5664,7 @@
 	<iso_3166_2_entry
 		code="NL-GR"	name="Groningen" />
 	<iso_3166_2_entry
-		code="NL-LB"	name="Limburg" />
+		code="NL-LB"	name="Limburg (Netherlands)" />
 	<iso_3166_2_entry
 		code="NL-NB"	name="Noord-Brabant" />
 	<iso_3166_2_entry
@@ -5771,7 +5771,7 @@
 	<iso_3166_2_entry
 		code="OM-WU"	name="Al Wusta" />
 	<iso_3166_2_entry
-		code="OM-SH"	name="Ash Sharqlyah" />
+		code="OM-SH"	name="Ash Sharqlyah (Oman)" />
 	<iso_3166_2_entry
 		code="OM-ZA"	name="Az Zahirah" />
 	<iso_3166_2_entry
@@ -5786,7 +5786,7 @@
 	<iso_3166_2_entry
 		code="PA-2"	name="Cocle" />
 	<iso_3166_2_entry
-		code="PA-3"	name="Colon" />
+		code="PA-3"	name="Colon (Panama)" />
 	<iso_3166_2_entry
 		code="PA-4"	name="Chiriqui" />
 	<iso_3166_2_entry
@@ -5807,7 +5807,7 @@
 	<iso_3166_2_entry
 		code="PE-CAL"	name="El Callao" />
 	<iso_3166_2_entry
-		code="PE-AMA"	name="Amazonas" />
+		code="PE-AMA"	name="Amazonas (Peru)" />
 	<iso_3166_2_entry
 		code="PE-ANC"	name="Ancash" />
 	<iso_3166_2_entry
@@ -5829,7 +5829,7 @@
 	<iso_3166_2_entry
 		code="PE-JUN"	name="Junin" />
 	<iso_3166_2_entry
-		code="PE-LAL"	name="La Libertad" />
+		code="PE-LAL"	name="La Libertad (Peru)" />
 	<iso_3166_2_entry
 		code="PE-LAM"	name="Lambayeque" />
 	<iso_3166_2_entry
@@ -5860,7 +5860,7 @@
 	<iso_3166_2_entry
 		code="PG-NCD"	name="National Capital District (Port Moresby)" />
 	<iso_3166_2_entry
-		code="PG-CPM"	name="Central" />
+		code="PG-CPM"	name="Central (Papua New Guinea)" />
 	<iso_3166_2_entry
 		code="PG-CPK"	name="Chimbu" />
 	<iso_3166_2_entry
@@ -5884,7 +5884,7 @@
 	<iso_3166_2_entry
 		code="PG-NIK"	name="New Ireland" />
 	<iso_3166_2_entry
-		code="PG-NPP"	name="Northern" />
+		code="PG-NPP"	name="Northern (Papua New Guinea)" />
 	<iso_3166_2_entry
 		code="PG-NSA"	name="North Solomons" />
 	<iso_3166_2_entry
@@ -5892,7 +5892,7 @@
 	<iso_3166_2_entry
 		code="PG-SHM"	name="Southern Highlands" />
 	<iso_3166_2_entry
-		code="PG-WPD"	name="Western" />
+		code="PG-WPD"	name="Western (Papua New Guinea)" />
 	<iso_3166_2_entry
 		code="PG-WHM"	name="Western Highlands" />
 	<iso_3166_2_entry
@@ -5981,7 +5981,7 @@
 	<iso_3166_2_entry
 		code="PH-LAS"	name="Lanao del Sur" />
 	<iso_3166_2_entry
-		code="PH-LUN"	name="La Union" />
+		code="PH-LUN"	name="La Union (Phillipines)" />
 	<iso_3166_2_entry
 		code="PH-LEY"	name="Leyte" />
 	<iso_3166_2_entry
@@ -6068,7 +6068,7 @@
 	<iso_3166_2_entry
 		code="PK-NW"	name="North-West Frontier" />
 	<iso_3166_2_entry
-		code="PK-PB"	name="Punjab" />
+		code="PK-PB"	name="Punjab (Pakistan)" />
 	<iso_3166_2_entry
 		code="PK-SD"	name="Sind (en)" />
 	<iso_3166_2_entry
@@ -6180,7 +6180,7 @@
 	<iso_3166_2_entry
 		code="PY-14"	name="Canindeyu" />
 	<iso_3166_2_entry
-		code="PY-11"	name="Central" />
+		code="PY-11"	name="Central (Paraguay)" />
 	<iso_3166_2_entry
 		code="PY-1"	name="Concepcion" />
 	<iso_3166_2_entry
@@ -6543,7 +6543,7 @@
 	<iso_3166_2_entry
 		code="SA-08"	name="Al H,udd ash Shamallyah" />
 	<iso_3166_2_entry
-		code="SA-12"	name="Al Jawf" />
+		code="SA-12"	name="Al Jawf (Saudi Arabia)" />
 	<iso_3166_2_entry
 		code="SA-03"	name="Al Madinah" />
 	<iso_3166_2_entry
@@ -6551,7 +6551,7 @@
 	<iso_3166_2_entry
 		code="SA-01"	name="Ar Riyad" />
 	<iso_3166_2_entry
-		code="SA-04"	name="Ash Sharqlyah" />
+		code="SA-04"	name="Ash Sharqlyah (Saudi Arabia)" />
 	<iso_3166_2_entry
 		code="SA-14"	name="Asir" />
 	<iso_3166_2_entry
@@ -6570,7 +6570,7 @@
 	<iso_3166_2_entry
 		code="SB-CT"	name="Capital Territory (Honiara)" />
 	<iso_3166_2_entry
-		code="SB-CE"	name="Central" />
+		code="SB-CE"	name="Central (Solomon Islands)" />
 	<iso_3166_2_entry
 		code="SB-GU"	name="Guadalcanal" />
 	<iso_3166_2_entry
@@ -6582,7 +6582,7 @@
 	<iso_3166_2_entry
 		code="SB-TE"	name="Temotu" />
 	<iso_3166_2_entry
-		code="SB-WE"	name="Western" />
+		code="SB-WE"	name="Western (Solomon Islands)" />
 </iso_3166_country>
 	<!-- Sudan -->
 <iso_3166_country code="SD">
@@ -7024,11 +7024,11 @@
 	<iso_3166_2_entry
 		code="SL-W"	name="Western Area (Freetown)" />
 	<iso_3166_2_entry
-		code="SL-E"	name="Eastern" />
+		code="SL-E"	name="Eastern (Sierra Leone)" />
 	<iso_3166_2_entry
-		code="SL-N"	name="Northern" />
+		code="SL-N"	name="Northern (Sierra Leone)" />
 	<iso_3166_2_entry
-		code="SL-S"	name="Southern" />
+		code="SL-S"	name="Southern (Sierra Leone)" />
 </iso_3166_country>
 	<!-- Senegal -->
 <iso_3166_country code="SN">
@@ -7064,7 +7064,7 @@
 	<iso_3166_2_entry
 		code="SO-BN"	name="Banaadir" />
 	<iso_3166_2_entry
-		code="SO-BR"	name="Bari" />
+		code="SO-BR"	name="Bari (Somalia)" />
 	<iso_3166_2_entry
 		code="SO-BY"	name="Bay" />
 	<iso_3166_2_entry
@@ -7107,7 +7107,7 @@
 	<iso_3166_2_entry
 		code="SR-NI"	name="Nickerie" />
 	<iso_3166_2_entry
-		code="SR-PR"	name="Para" />
+		code="SR-PR"	name="Para (Suriname)" />
 	<iso_3166_2_entry
 		code="SR-PM"	name="Paramaribo" />
 	<iso_3166_2_entry
@@ -7135,11 +7135,11 @@
 	<iso_3166_2_entry
 		code="SV-CH"	name="Chalatenango" />
 	<iso_3166_2_entry
-		code="SV-LI"	name="La Libertad" />
+		code="SV-LI"	name="La Libertad (El Salvador)" />
 	<iso_3166_2_entry
-		code="SV-PA"	name="La Paz" />
+		code="SV-PA"	name="La Paz (El Salvador)" />
 	<iso_3166_2_entry
-		code="SV-UN"	name="La Union" />
+		code="SV-UN"	name="La Union (El Salvador)" />
 	<iso_3166_2_entry
 		code="SV-MO"	name="Morazan" />
 	<iso_3166_2_entry
@@ -7231,13 +7231,13 @@
 	<!-- Togo -->
 <iso_3166_country code="TG">
 	<iso_3166_2_entry
-		code="TG-C"	name="Centre" />
+		code="TG-C"	name="Centre (Togo)" />
 	<iso_3166_2_entry
 		code="TG-K"	name="Kara" />
 	<iso_3166_2_entry
 		code="TG-M"	name="Maritime (Region)" />
 	<iso_3166_2_entry
-		code="TG-P"	name="Plateaux" />
+		code="TG-P"	name="Plateaux (Togo)" />
 	<iso_3166_2_entry
 		code="TG-S"	name="Savannes" />
 </iso_3166_country>
@@ -7792,7 +7792,7 @@
 	<iso_3166_2_entry
 		code="TZ-17"	name="Mtwara" />
 	<iso_3166_2_entry
-		code="TZ-18"	name="Mwanza" />
+		code="TZ-18"	name="Mwanza (Tanzania)" />
 	<iso_3166_2_entry
 		code="TZ-19"	name="Pwani" />
 	<iso_3166_2_entry
@@ -8027,7 +8027,7 @@
 	<iso_3166_2_entry
 		code="US-DC"	name="District of Columbia" />
 	<iso_3166_2_entry
-		code="US-FL"	name="Florida" />
+		code="US-FL"	name="Florida (USA)" />
 	<iso_3166_2_entry
 		code="US-GA"	name="Georgia" />
 	<iso_3166_2_entry
@@ -8051,7 +8051,7 @@
 	<iso_3166_2_entry
 		code="US-ME"	name="Maine" />
 	<iso_3166_2_entry
-		code="US-MD"	name="Maryland" />
+		code="US-MD"	name="Maryland (USA)" />
 	<iso_3166_2_entry
 		code="US-MA"	name="Massachusetts" />
 	<iso_3166_2_entry
@@ -8063,7 +8063,7 @@
 	<iso_3166_2_entry
 		code="US-MO"	name="Missouri" />
 	<iso_3166_2_entry
-		code="US-MT"	name="Montana" />
+		code="US-MT"	name="Montana (USA)" />
 	<iso_3166_2_entry
 		code="US-NE"	name="Nebraska" />
 	<iso_3166_2_entry
@@ -8144,7 +8144,7 @@
 	<iso_3166_2_entry
 		code="UY-FS"	name="Flores" />
 	<iso_3166_2_entry
-		code="UY-FD"	name="Florida" />
+		code="UY-FD"	name="Florida (Uruguay)" />
 	<iso_3166_2_entry
 		code="UY-LA"	name="Lavalleja" />
 	<iso_3166_2_entry
@@ -8154,7 +8154,7 @@
 	<iso_3166_2_entry
 		code="UY-PA"	name="Paysandu" />
 	<iso_3166_2_entry
-		code="UY-RN"	name="Rio Negro" />
+		code="UY-RN"	name="Rio Negro (Uruguay)" />
 	<iso_3166_2_entry
 		code="UY-RV"	name="Rivera" />
 	<iso_3166_2_entry
@@ -8162,7 +8162,7 @@
 	<iso_3166_2_entry
 		code="UY-SA"	name="Salto" />
 	<iso_3166_2_entry
-		code="UY-SJ"	name="San Jose" />
+		code="UY-SJ"	name="San Jose (Uruguay)" />
 	<iso_3166_2_entry
 		code="UY-SO"	name="Soriano" />
 	<iso_3166_2_entry
@@ -8219,7 +8219,7 @@
 	<iso_3166_2_entry
 		code="VE-E"	name="Barinas" />
 	<iso_3166_2_entry
-		code="VE-F"	name="Bolivar" />
+		code="VE-F"	name="Bolivar (Venezuela)" />
 	<iso_3166_2_entry
 		code="VE-G"	name="Carabobo" />
 	<iso_3166_2_entry
@@ -8241,7 +8241,7 @@
 	<iso_3166_2_entry
 		code="VE-P"	name="Portuguesa" />
 	<iso_3166_2_entry
-		code="VE-R"	name="Sucre" />
+		code="VE-R"	name="Sucre (Venezuela)" />
 	<iso_3166_2_entry
 		code="VE-S"	name="Tachira" />
 	<iso_3166_2_entry
@@ -8253,7 +8253,7 @@
 	<iso_3166_2_entry
 		code="VE-V"	name="Zulia" />
 	<iso_3166_2_entry
-		code="VE-Z"	name="Amazonas" />
+		code="VE-Z"	name="Amazonas (Venezuela)" />
 	<iso_3166_2_entry
 		code="VE-Y"	name="Delta Amacuro" />
 	<iso_3166_2_entry
@@ -8459,7 +8459,7 @@
 	<iso_3166_2_entry
 		code="YE-MU"	name="Al Hudaydah" />
 	<iso_3166_2_entry
-		code="YE-JA"	name="Al Jawf" />
+		code="YE-JA"	name="Al Jawf (Yemen)" />
 	<iso_3166_2_entry
 		code="YE-MR"	name="Al Mahrah" />
 	<iso_3166_2_entry
@@ -8504,30 +8504,30 @@
 	<iso_3166_2_entry
 		code="ZA-NP"	name="Limpopo" />
 	<iso_3166_2_entry
-		code="ZA-NW"	name="North-West" />
+		code="ZA-NW"	name="North-West (South Africa)" />
 	<iso_3166_2_entry
 		code="ZA-WC"	name="Western Cape" />
 </iso_3166_country>
 	<!-- Zambia -->
 <iso_3166_country code="ZM">
 	<iso_3166_2_entry
-		code="ZM-02"	name="Central" />
+		code="ZM-02"	name="Central (Zambia)" />
 	<iso_3166_2_entry
 		code="ZM-08"	name="Copperbelt" />
 	<iso_3166_2_entry
-		code="ZM-03"	name="Eastern" />
+		code="ZM-03"	name="Eastern (Zambia)" />
 	<iso_3166_2_entry
 		code="ZM-04"	name="Luapula" />
 	<iso_3166_2_entry
 		code="ZM-09"	name="Lusaka" />
 	<iso_3166_2_entry
-		code="ZM-05"	name="Northern" />
+		code="ZM-05"	name="Northern (Zambia)" />
 	<iso_3166_2_entry
 		code="ZM-06"	name="North-Western" />
 	<iso_3166_2_entry
-		code="ZM-07"	name="Southern" />
+		code="ZM-07"	name="Southern (Zambia)" />
 	<iso_3166_2_entry
-		code="ZM-01"	name="Western" />
+		code="ZM-01"	name="Western (Zambia)" />
 </iso_3166_country>
 	<!-- Zimbabwe -->
 <iso_3166_country code="ZW">




More information about the Pkg-isocodes-devel mailing list