[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.28-11-g50aea80
Christian PERRIER
bubulle at debian.org
Wed Sep 28 20:07:37 UTC 2011
The following commit has been merged in the master branch:
commit 6276cab84e781efb99270d15e81ba42b4e3c5e40
Author: Christian PERRIER <bubulle at debian.org>
Date: Wed Sep 28 22:06:22 2011 +0200
Normalize separator between country code and subdivision code to a dash
diff --git a/ChangeLog b/ChangeLog
index 14c0d5d..3e8e393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ UNRELEASED
[ ISO 3166-2 ]
* Fix code error for Vakaga (CF-VK). Closes: alioth#313363
Thanks to Vitali Yakavenka for spotting them and providing the fix
+ * Normalize all subdivision codes to <country_code>-<code> instead of
+ using either spaces or dashes.aCloses: alioth#313369
[ ISO 3166 translations ]
* Sinhala by Danishka Navin. Closes: #640933
diff --git a/iso_3166_2/iso_3166_2.xml b/iso_3166_2/iso_3166_2.xml
index 339fe73..1774717 100644
--- a/iso_3166_2/iso_3166_2.xml
+++ b/iso_3166_2/iso_3166_2.xml
@@ -464,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
@@ -689,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
@@ -1912,9 +1912,9 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
<iso_3166_country code="CV">
<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
@@ -3153,25 +3153,25 @@ 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
@@ -3783,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
@@ -5823,37 +5823,37 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
<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
@@ -6751,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 Region" />
+ code="MW-C" name="Central Region" />
<iso_3166_2_entry
- code="MW N" name="Northern Region" />
+ code="MW-N" name="Northern Region" />
<iso_3166_2_entry
- code="MW S" name="Southern Region" />
+ code="MW-S" name="Southern Region" />
</iso_3166_subset>
<iso_3166_subset type="District">
<iso_3166_2_entry
@@ -8012,9 +8012,9 @@ 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
--
ISO language, territory, currency, script codes and their translations
More information about the Pkg-isocodes-devel
mailing list