[Pkg-isocodes-devel] r1111 - in trunk/iso-codes: . iso_3166/iso_3166_2

alexisd-guest at alioth.debian.org alexisd-guest at alioth.debian.org
Mon Oct 22 02:10:05 UTC 2007


Author: alexisd-guest
Date: 2007-10-22 02:10:05 +0000 (Mon, 22 Oct 2007)
New Revision: 1111

Modified:
   trunk/iso-codes/ChangeLog
   trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml
Log:
Enforce conventions on ISO 3166-2, part I

Replaced 'XX-YYYY' or 'YYYY' codes by 'XX YYYY' for second level of regional
divisions, replaced geographical_region by iso_3166_subset
Affected countries: AZ, BD, CV, ES, FR, GB, GN, GR, ID, IE, IT, KN, MA, MW,
PH, RS and UG


Modified: trunk/iso-codes/ChangeLog
===================================================================
--- trunk/iso-codes/ChangeLog	2007-10-21 23:28:47 UTC (rev 1110)
+++ trunk/iso-codes/ChangeLog	2007-10-22 02:10:05 UTC (rev 1111)
@@ -76,6 +76,8 @@
   * Add accents for BF, BO, BR, CF, CG, CL, CR, CU, CY, DE, DZ, EG, GQ, GW
     HN, HU, IS, JO, KM, KW, LT, LV, MN, MX, NE, NO, PA, PE, PT, PY, SA, SE,
     SV, UA, UY, VU
+  * Use codes of the form 'XX YYYY' for second level of regional divisions for
+    AZ, BD, CV, ES, FR, GB, GN, GR, ID, IE, IT, KN, MA, MW, PH, RS and UG
 	
 iso-codes 1.5
 -------------

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-10-21 23:28:47 UTC (rev 1110)
+++ trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml	2007-10-22 02:10:05 UTC (rev 1111)
@@ -459,7 +459,7 @@
 <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
@@ -656,17 +656,17 @@
 <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
@@ -1798,9 +1798,9 @@
 <iso_3166_country code="CV">
 <iso_3166_subset type="District">   
 	<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
@@ -2331,6 +2331,42 @@
 </iso_3166_country>
 	<!-- Spain -->
 <iso_3166_country code="ES">
+<iso_3166_subset type="Autonomous communities">
+	<iso_3166_2_entry
+		code="ES AN"	name="Andalucía" />
+	<iso_3166_2_entry
+		code="ES AR"	name="Aragón" />
+	<iso_3166_2_entry
+		code="ES O"	name="Asturias, Principado de" />
+	<iso_3166_2_entry
+		code="ES CN"	name="Canarias" />
+	<iso_3166_2_entry
+		code="ES S"	name="Cantabria" />
+	<iso_3166_2_entry
+		code="ES CM"	name="Castilla-La Mancha" />
+	<iso_3166_2_entry
+		code="ES CL"	name="Castilla y León" />
+	<iso_3166_2_entry
+		code="ES CT"	name="Cataluña" />
+	<iso_3166_2_entry
+		code="ES EX"	name="Extremadura" />
+	<iso_3166_2_entry
+		code="ES GA"	name="Galicia" />
+	<iso_3166_2_entry
+		code="ES IB"	name="Illes Balears" />
+	<iso_3166_2_entry
+		code="ES LO"	name="La Rioja" />
+	<iso_3166_2_entry
+		code="ES M"	name="Madrid, Comunidad de" />
+	<iso_3166_2_entry
+		code="ES MU"	name="Murcia, Región de" />
+	<iso_3166_2_entry
+		code="ES NA"	name="Navarra, Comunidad Foral de" />
+	<iso_3166_2_entry
+		code="ES PV"	name="País Vasco" />
+	<iso_3166_2_entry
+		code="ES VC"	name="Valenciana, Comunidad" />
+</iso_3166_subset>
 <iso_3166_subset type="Province">
 	<iso_3166_2_entry
 		code="ES-VI"	name="Álava" />
@@ -2439,42 +2475,6 @@
 	<iso_3166_2_entry
 		code="ES-ML"	name="Melilla" />
 </iso_3166_subset>
-<iso_3166_subset type="Autonomous communities">
-	<iso_3166_2_entry
-		code="AN"	name="Andalucía" />
-	<iso_3166_2_entry
-		code="AR"	name="Aragón" />
-	<iso_3166_2_entry
-		code="O"	name="Asturias, Principado de" />
-	<iso_3166_2_entry
-		code="CN"	name="Canarias" />
-	<iso_3166_2_entry
-		code="S"	name="Cantabria" />
-	<iso_3166_2_entry
-		code="CM"	name="Castilla-La Mancha" />
-	<iso_3166_2_entry
-		code="CL"	name="Castilla y León" />
-	<iso_3166_2_entry
-		code="CT"	name="Cataluña" />
-	<iso_3166_2_entry
-		code="EX"	name="Extremadura" />
-	<iso_3166_2_entry
-		code="GA"	name="Galicia" />
-	<iso_3166_2_entry
-		code="IB"	name="Illes Balears" />
-	<iso_3166_2_entry
-		code="LO"	name="La Rioja" />
-	<iso_3166_2_entry
-		code="M"	name="Madrid, Comunidad de" />
-	<iso_3166_2_entry
-		code="MU"	name="Murcia, Región de" />
-	<iso_3166_2_entry
-		code="NA"	name="Navarra, Comunidad Foral de" />
-	<iso_3166_2_entry
-		code="PV"	name="País Vasco" />
-	<iso_3166_2_entry
-		code="VC"	name="Valenciana, Comunidad" />
-</iso_3166_subset>
 </iso_3166_country>
 	<!-- Ethiopia -->
 <iso_3166_country code="ET">
@@ -2548,49 +2548,49 @@
 <iso_3166_country code="FR">
 <iso_3166_subset type="Region">
 	<iso_3166_2_entry
-		code="FR-A"	name="Alsace" />
+		code="FR A"	name="Alsace" />
 	<iso_3166_2_entry
-		code="FR-B"	name="Aquitaine" />
+		code="FR B"	name="Aquitaine" />
 	<iso_3166_2_entry
-		code="FR-C"	name="Auvergne" />
+		code="FR C"	name="Auvergne" />
 	<iso_3166_2_entry
-		code="FR-P"	name="Basse-Normandie" />
+		code="FR P"	name="Basse-Normandie" />
 	<iso_3166_2_entry
-		code="FR-D"	name="Bourgogne" />
+		code="FR D"	name="Bourgogne" />
 	<iso_3166_2_entry
-		code="FR-E"	name="Bretagne" />
+		code="FR E"	name="Bretagne" />
 	<iso_3166_2_entry
-		code="FR-F"	name="Centre" />
+		code="FR F"	name="Centre" />
 	<iso_3166_2_entry
-		code="FR-G"	name="Champagne-Ardenne" />
+		code="FR G"	name="Champagne-Ardenne" />
 	<iso_3166_2_entry
-		code="FR-H"	name="Corse" />
+		code="FR H"	name="Corse" />
 	<iso_3166_2_entry
-		code="FR-I"	name="Franche-Comté" />
+		code="FR I"	name="Franche-Comté" />
 	<iso_3166_2_entry
-		code="FR-Q"	name="Haute-Normandie" />
+		code="FR Q"	name="Haute-Normandie" />
 	<iso_3166_2_entry
-		code="FR-J"	name="Île-de-France" />
+		code="FR J"	name="Île-de-France" />
 	<iso_3166_2_entry
-		code="FR-K"	name="Languedoc-Roussillon" />
+		code="FR K"	name="Languedoc-Roussillon" />
 	<iso_3166_2_entry
-		code="FR-L"	name="Limousin" />
+		code="FR L"	name="Limousin" />
 	<iso_3166_2_entry
-		code="FR-M"	name="Lorraine" />
+		code="FR M"	name="Lorraine" />
 	<iso_3166_2_entry
-		code="FR-N"	name="Midi-Pyrénées" />
+		code="FR N"	name="Midi-Pyrénées" />
 	<iso_3166_2_entry
-		code="FR-O"	name="Nord - Pas-de-Calais" />
+		code="FR O"	name="Nord - Pas-de-Calais" />
 	<iso_3166_2_entry
-		code="FR-R"	name="Pays de la Loire" />
+		code="FR R"	name="Pays de la Loire" />
 	<iso_3166_2_entry
-		code="FR-S"	name="Picardie" />
+		code="FR S"	name="Picardie" />
 	<iso_3166_2_entry
-		code="FR-T"	name="Poitou-Charentes" />
+		code="FR T"	name="Poitou-Charentes" />
 	<iso_3166_2_entry
-		code="FR-U"	name="Provence-Alpes-Côte d'Azur" />
+		code="FR U"	name="Provence-Alpes-Côte d'Azur" />
 	<iso_3166_2_entry
-		code="FR-V"	name="Rhône-Alpes" />
+		code="FR V"	name="Rhône-Alpes" />
 </iso_3166_subset>
 <iso_3166_subset type="Overseas department">
 	<iso_3166_2_entry
@@ -2816,13 +2816,13 @@
 <iso_3166_subset type="First-level divisions">
        <!-- These are listed in ISO-3166-2 -->
 	<iso_3166_2_entry
-		code="GB-ENG"	name="England" />
+		code="GB ENG"	name="England" />
 	<iso_3166_2_entry
-		code="GB-NIR"	name="Northern Ireland" />
+		code="GB NIR"	name="Northern Ireland" />
 	<iso_3166_2_entry
-		code="GB-SCT"	name="Scotland" />
+		code="GB SCT"	name="Scotland" />
 	<iso_3166_2_entry
-		code="GB-WLS"	name="Wales" />
+		code="GB WLS"	name="Wales" />
 </iso_3166_subset>
 <iso_3166_subset type="Division">
 	<!-- Great Britain divisions includes counties, London boroughs, metropolitan districts
@@ -3459,23 +3459,23 @@
 <iso_3166_country code="GN">
 <iso_3166_subset type="Governorate">
 	<iso_3166_2_entry
-		code="GN-B"	name="Boké, Gouvernorat de" />
+		code="GN B"	name="Boké, Gouvernorat de" />
 	<iso_3166_2_entry
-		code="GN-F"	name="Faranah, Gouvernorat de" />
+		code="GN F"	name="Faranah, Gouvernorat de" />
 	<iso_3166_2_entry
-		code="GN-K"	name="Kankan, Gouvernorat de" />
+		code="GN K"	name="Kankan, Gouvernorat de" />
 	<iso_3166_2_entry
-		code="GN-D"	name="Kindia, Gouvernorat de" />
+		code="GN D"	name="Kindia, Gouvernorat de" />
 	<iso_3166_2_entry
-		code="GN-L"	name="Labé, Gouvernorat de" />
+		code="GN L"	name="Labé, Gouvernorat de" />
 	<iso_3166_2_entry
-		code="GN-M"	name="Mamou, Gouvernorat de" />
+		code="GN M"	name="Mamou, Gouvernorat de" />
 	<iso_3166_2_entry
-		code="GN-N"	name="Nzérékoré, Gouvernorat de" />
+		code="GN N"	name="Nzérékoré, Gouvernorat de" />
 </iso_3166_subset>
 <iso_3166_subset type="City">
 	<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
@@ -3574,31 +3574,31 @@
 	<!-- Names mostly as in http://www.enae.gr/nomarxies_list.asp -->
 <iso_3166_subset type="Region">
 	<iso_3166_2_entry
-		code="GR-I"	name="Periféreia Anatolikís Makedonías kai Thrákis" />
+		code="GR I"	name="Periféreia Anatolikís Makedonías kai Thrákis" />
 	<iso_3166_2_entry
-		code="GR-II"	name="Periféreia Kentrikís Makedonías" />
+		code="GR II"	name="Periféreia Kentrikís Makedonías" />
 	<iso_3166_2_entry
-		code="GR-III"	name="Periféreia Dytikís Makedonías" />
+		code="GR III"	name="Periféreia Dytikís Makedonías" />
 	<iso_3166_2_entry
-		code="GR-IV"	name="Periféreia Ipeírou" />
+		code="GR IV"	name="Periféreia Ipeírou" />
 	<iso_3166_2_entry
-		code="GR-V"	name="Periféreia Thessalías" />
+		code="GR V"	name="Periféreia Thessalías" />
 	<iso_3166_2_entry
-		code="GR-VI"	name="Periféreia Ioníon Níson" />
+		code="GR VI"	name="Periféreia Ioníon Níson" />
 	<iso_3166_2_entry
-		code="GR-VII"	name="Periféreia Dytikís Elládas" />
+		code="GR VII"	name="Periféreia Dytikís Elládas" />
 	<iso_3166_2_entry
-		code="GR-VIII"	name="Periféreia Stereás Elládas" />
+		code="GR VIII"	name="Periféreia Stereás Elládas" />
 	<iso_3166_2_entry
-		code="GR-IX"	name="Periféreia Attikís" />
+		code="GR IX"	name="Periféreia Attikís" />
 	<iso_3166_2_entry
-		code="GR-X"	name="Periféreia Peloponnísou" />
+		code="GR X"	name="Periféreia Peloponnísou" />
 	<iso_3166_2_entry
-		code="GR-XI"	name="Periféreia Voreíou Aigaíou" />
+		code="GR XI"	name="Periféreia Voreíou Aigaíou" />
 	<iso_3166_2_entry
-		code="GR-XII"	name="Periféreia Notíou Aigaíou" />
+		code="GR XII"	name="Periféreia Notíou Aigaíou" />
 	<iso_3166_2_entry
-		code="GR-XIII"	name="Periféreia Krítis" />
+		code="GR XIII"	name="Periféreia Krítis" />
 </iso_3166_subset>
 <iso_3166_subset type="Autonomous monastic state">
 	<iso_3166_2_entry
@@ -4009,19 +4009,19 @@
 <iso_3166_country code="ID">
 <iso_3166_subset type="Geographical unit">
 	<iso_3166_2_entry
-		code="IJ"	name="Papua" />
+		code="ID IJ"	name="Papua" />
 	<iso_3166_2_entry
-		code="JW"	name="Jawa" />
+		code="ID JW"	name="Jawa" />
 	<iso_3166_2_entry
-		code="KA"	name="Kalimantan" />
+		code="ID KA"	name="Kalimantan" />
 	<iso_3166_2_entry
-		code="MA"	name="Maluku" />
+		code="ID MA"	name="Maluku" />
 	<iso_3166_2_entry
-		code="NU"	name="Nusa Tenggara" />
+		code="ID NU"	name="Nusa Tenggara" />
 	<iso_3166_2_entry
-		code="SL"	name="Sulawesi" />
+		code="ID SL"	name="Sulawesi" />
 	<iso_3166_2_entry
-		code="SM"	name="Sumatera" />
+		code="ID SM"	name="Sumatera" />
 </iso_3166_subset>
 <iso_3166_subset type="Autonomous Province">
 	<iso_3166_2_entry
@@ -4098,6 +4098,17 @@
 </iso_3166_country>
 	<!-- Ireland -->
 <iso_3166_country code="IE">
+<iso_3166_sudset type="Province">
+  <iso_3166_2_entry
+    code="IE C" name="Connacht"/>
+  <iso_3166_2_entry
+    code="IE L"	name="Leinster" />
+  <iso_3166_2_entry
+    code="IE M"	name="Munster" />
+  <iso_3166_2_entry
+    code="IE U"	name="Ulster" />
+</iso_3166_subset>
+<iso_3166_subset type="County">
 	<!-- Ireland uses Car Registration codes for Counties as ISO 3166-2 regions -->
 	<iso_3166_2_entry
 		code="IE-C"	name="Cork" />
@@ -4151,12 +4162,7 @@
 		code="IE-WW"	name="Wicklow" />
 	<iso_3166_2_entry
 		code="IE-WX"	name="Wexford" />
-<geographical_region type="Province">
-	<region code="C"	name="Connacht"/>
-	<region code="L"	name="Leinster" />
-	<region code="M"	name="Munster" />
-	<region code="U"	name="Ulster" />
-</geographical_region>
+</iso_3166_subset>
 </iso_3166_country>
 <iso_3166_country code="IL">
 	<!-- Israel -->
@@ -4380,6 +4386,48 @@
 </iso_3166_country>
 	<!-- Italy -->
 <iso_3166_country code="IT">
+<iso_3166_subset type="Region">
+	<iso_3166_2_entry
+		code="IT 65"	name="Abruzzo"	/>
+	<iso_3166_2_entry
+		code="IT 77"	name="Basilicata" />
+	<iso_3166_2_entry
+		code="IT 78"	name="Calabria" />
+	<iso_3166_2_entry
+		code="IT 72"	name="Campania" />
+	<iso_3166_2_entry
+		code="IT 45"	name="Emilia-Romagna" />
+	<iso_3166_2_entry
+		code="IT 36"	name="Friuli-Venezia Giulia" />
+	<iso_3166_2_entry
+		code="IT 62"	name="Lazio" />
+	<iso_3166_2_entry
+		code="IT 42"	name="Liguria" />
+	<iso_3166_2_entry
+		code="IT 25"	name="Lombardia" />
+	<iso_3166_2_entry
+		code="IT 57"	name="Marche" />
+	<iso_3166_2_entry
+		code="IT 67"	name="Molise" />
+	<iso_3166_2_entry
+		code="IT 21"	name="Piemonte" />
+	<iso_3166_2_entry
+		code="IT 75"	name="Puglia" />
+	<iso_3166_2_entry
+		code="IT 88"	name="Sardegna" />
+	<iso_3166_2_entry
+		code="IT 82"	name="Sicilia" />
+	<iso_3166_2_entry
+		code="IT 52"	name="Toscana" />
+	<iso_3166_2_entry
+		code="IT 32"	name="Trentino-Alto Adige" />
+	<iso_3166_2_entry
+		code="IT 55"	name="Umbria" />
+	<iso_3166_2_entry
+		code="IT 23"	name="Valle d'Aosta" />
+	<iso_3166_2_entry
+		code="IT 34"	name="Veneto" />
+</iso_3166_subset>
 <iso_3166_subset type="Province">
 	<iso_3166_2_entry
 		code="IT-AG"	name="Agrigento" />
@@ -4596,28 +4644,6 @@
 	<iso_3166_2_entry
 		code="IT-VT"	name="Viterbo" />
 </iso_3166_subset>
-<geographical_region>
-	<region	code="65"	name="Abruzzo"	/>
-	<region	code="77"	name="Basilicata" />
-	<region	code="78"	name="Calabria" />
-	<region	code="72"	name="Campania" />
-	<region	code="45"	name="Emilia-Romagna" />
-	<region	code="36"	name="Friuli-Venezia Giulia" />
-	<region	code="62"	name="Lazio" />
-	<region	code="42"	name="Liguria" />
-	<region	code="25"	name="Lombardia" />
-	<region	code="57"	name="Marche" />
-	<region	code="67"	name="Molise" />
-	<region	code="21"	name="Piemonte" />
-	<region	code="75"	name="Puglia" />
-	<region	code="88"	name="Sardegna" />
-	<region	code="82"	name="Sicilia" />
-	<region	code="52"	name="Toscana" />
-	<region	code="32"	name="Trentino-Alto Adige" />
-	<region	code="55"	name="Umbria" />
-	<region	code="23"	name="Valle d'Aosta" />
-	<region	code="34"	name="Veneto" />
-</geographical_region>
 </iso_3166_country>
 	<!-- Jamaica -->
 <iso_3166_country code="JM">
@@ -4887,9 +4913,9 @@
 <iso_3166_country code="KN">
 <iso_3166_subset type="State">   
 	<iso_3166_2_entry
-		code="K"	name="Saint Kitts" />
+		code="KN K"	name="Saint Kitts" />
 	<iso_3166_2_entry
-		code="N"	name="Nevis" />
+		code="KN N"	name="Nevis" />
 </iso_3166_subset>   
 <iso_3166_subset type="Parish">   
 	<iso_3166_2_entry
@@ -5338,8 +5364,8 @@
 		code="LV-VM"	name="Valmiera" />
 	<iso_3166_2_entry
 		code="LV-VE"	name="Ventspils" />
-</iso_3166_2_subset>
-<iso_3166_2_subset type="City">
+</iso_3166_subset>
+<iso_3166_subset type="City">
 	<iso_3166_2_entry
 		code="LV-DGV"	name="Daugavpils" />
 	<iso_3166_2_entry
@@ -5354,7 +5380,7 @@
 		code="LV-RIX"	name="Rīga" />
 	<iso_3166_2_entry
 		code="LV-VEN"	name="Ventspils" />
-</iso_3166_2_subset>
+</iso_3166_subset>
 </iso_3166_country>
 	<!-- Libya -->
 <iso_3166_country code="LY">
@@ -5433,37 +5459,37 @@
 <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
@@ -6117,11 +6143,11 @@
 <iso_3166_country code="MW">
 <iso_3166_subset type="Region">
 	<iso_3166_2_entry
-		code="MW-C"	name="Central" />
+		code="MW C"	name="Central" />
 	<iso_3166_2_entry
-		code="MW-N"	name="Northern" />
+		code="MW N"	name="Northern" />
 	<iso_3166_2_entry
-		code="MW-S"	name="Southern" />
+		code="MW S"	name="Southern" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
 	<iso_3166_2_entry
@@ -6765,37 +6791,37 @@
 <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" />
 	<iso_3166_2_entry
-		code="PH-02"	name="Cagayan Valley" />
+		code="PH 02"	name="Cagayan Valley" />
 	<iso_3166_2_entry
-		code="PH-13"	name="CARAGA" />
+		code="PH 13"	name="CARAGA" />
 	<iso_3166_2_entry
-		code="PH-03"	name="Central Luzon" />
+		code="PH 03"	name="Central Luzon" />
 	<iso_3166_2_entry
-		code="PH-12"	name="Central Mindanao" />
+		code="PH 12"	name="Central Mindanao" />
 	<iso_3166_2_entry
-		code="PH-07"	name="Central Visayas" />
+		code="PH 07"	name="Central Visayas" />
 	<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" />
 	<iso_3166_2_entry
-		code="PH-01"	name="Ilocos" />
+		code="PH 01"	name="Ilocos" />
 	<iso_3166_2_entry
-		code="PH-00"	name="National Capital Region (Manila)" />
+		code="PH 00"	name="National Capital Region (Manila)" />
 	<iso_3166_2_entry
-		code="PH-10"	name="Northern Mindanao" />
+		code="PH 10"	name="Northern Mindanao" />
 	<iso_3166_2_entry
-		code="PH-11"	name="Southern Mindanao" />
+		code="PH 11"	name="Southern Mindanao" />
 	<iso_3166_2_entry
-		code="PH-04"	name="Southern Tagalog" />
+		code="PH 04"	name="Southern Tagalog" />
 	<iso_3166_2_entry
-		code="PH-09"	name="Western Mindanao" />
+		code="PH 09"	name="Western Mindanao" />
 	<iso_3166_2_entry
-		code="PH-06"	name="Western Visayas" />
+		code="PH 06"	name="Western Visayas" />
 </iso_3166_subset> 
 <iso_3166_subset type="Province"> 
 	<iso_3166_2_entry
@@ -7258,9 +7284,9 @@
 </iso_3166_subset>
 <iso_3166_subset type="Autonomous province">
 	<iso_3166_2_entry
-		code="KM"	name="Kosovo-Metohija" />
+		code="RS KM"	name="Kosovo-Metohija" />
 	<iso_3166_2_entry
-		code="VO"	name="Vojvodina" />
+		code="RS VO"	name="Vojvodina" />
 </iso_3166_subset>
 <iso_3166_subset type="District">
 	<iso_3166_2_entry
@@ -9100,13 +9126,13 @@
 <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




More information about the Pkg-isocodes-devel mailing list