Package: iso-codes Version: 0.41-1 Severity: minor Hi.
The iso_3167_2.xml contains:
(1) absolutely botched names for Prague (i claim
authoritativeness) and all the Slovak regions (I can't speak
Slovak *that* well to claim absolute correctness). Further
review of other countries' names is probably due -- this is just
horrible.
(2) the reference to the last update is ambiguous: 2004-03-08 is
newsletter number six, not two.
(3) various extraneous space as well as indenting corrections
I dared to correct (1) and (2) in `substantial_changes.patch', and (3)
in `all_changes.patch'. The patches are meant to be applied
sequentially, in this order.
Cheers,
Jan.
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (700, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.10
Locale: LANG=C, LC_CTYPE=cs_CZ.ISO-8859-2 (charmap=ISO-8859-2)
-- no debconf information
--
)^o-o^| jabber: [EMAIL PROTECTED]
| .v K e-mail: jjminar FastMail FM
` - .' phone: +44(0)7981 738 696
\ __/Jan icq: 345 355 493
__|o|__Minář irc: [EMAIL PROTECTED]
--- iso_3167_2.xml.SUBSTANTIAL_CHANGES 2005-02-02 00:00:38.000000000 +0000
+++ iso_3167_2.xml.ALL_CHANGES 2005-02-02 00:00:46.000000000 +0000
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!-- -->
<!-- ISO-3166-2 Standard for country subdivisions -->
<!-- -->
<!-- The following conventions are used in this file: -->
<!-- -->
-<!-- If the standard lists a subdivision name in more than language -->
+<!-- If the standard lists a subdivision name in more than one language
-->
<!-- and/or romanization system, only the first listed name is shown. -->
<!-- -->
<!-- Proper subdivision codes have the format 'XX-YYY' where XX is the -->
<!-- ISO 3166-1 Alpha-2 country code and YYY is a 1-, 2- or 3-character
-->
-<!-- code for the subdivision.
-->
+<!-- code for the subdivision. -->
<!-- -->
<!-- For some countries the standard also lists a second level of -->
-<!-- regional divisions (e.g. for BE, FR, GB, IT, etc.). The codes -->
+<!-- regional divisions (e.g. for BE, FR, GB, IT, etc.). The codes -->
<!-- for these regional divisions are shown as 'XX YYYY', i.e. with a -->
<!-- space character instead of the '-'. -->
<!-- -->
@@ -31,7 +30,7 @@
<!-- United Arab Emirates -->
<iso_3166_country code="AE">
<iso_3166_2_entry
- code="AE-AZ" name="Abu Zaby" />
+ code="AE-AZ" name="Abu Zaby" />
<iso_3166_2_entry
code="AE-AJ" name="'Ajman" />
<iso_3166_2_entry
@@ -226,7 +225,7 @@
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" />
@@ -303,23 +302,23 @@
<!-- Austria -->
<iso_3166_country code="AT">
<iso_3166_2_entry
- code="AT-1" name="Burgenland" />
+ code="AT-1" name="Burgenland" />
<iso_3166_2_entry
- code="AT-2" name="Kärnten" />
+ code="AT-2" name="Kärnten" />
<iso_3166_2_entry
- code="AT-3" name="Niederosterreich" />
+ code="AT-3" name="Niederosterreich" />
<iso_3166_2_entry
- code="AT-4" name="Oberosterreich" />
+ code="AT-4" name="Oberosterreich" />
<iso_3166_2_entry
- code="AT-5" name="Salzburg" />
+ code="AT-5" name="Salzburg" />
<iso_3166_2_entry
- code="AT-6" name="Steiermark" />
+ code="AT-6" name="Steiermark" />
<iso_3166_2_entry
- code="AT-7" name="Tirol" />
+ code="AT-7" name="Tirol" />
<iso_3166_2_entry
- code="AT-8" name="Vorarlberg" />
+ code="AT-8" name="Vorarlberg" />
<iso_3166_2_entry
- code="AT-9" name="Wien" />
+ code="AT-9" name="Wien" />
</iso_3166_country>
<!-- Australia -->
<iso_3166_country code="AU">
@@ -363,7 +362,7 @@
<iso_3166_2_entry
code="AZ-SM" name="Sumqayit" />
<iso_3166_2_entry
- code="AZ-SS" name="Susa " />
+ code="AZ-SS" name="Susa" />
<iso_3166_2_entry
code="AZ-XA" name="Xankandi" />
<iso_3166_2_entry
@@ -375,7 +374,7 @@
<iso_3166_2_entry
code="AZ-AGM" name="Agdam" />
<iso_3166_2_entry
- code="AZ-AGS" name="Agdas " />
+ code="AZ-AGS" name="Agdas" />
<iso_3166_2_entry
code="AZ-AGA" name="Agstafa" />
<iso_3166_2_entry
@@ -506,7 +505,7 @@
<iso_3166_2_entry
code="BA-SRP" name="Republika Srpska" />
</iso_3166_country>
- <!-- Bangladesh -->
+ <!-- Bangladesh -->
<iso_3166_country code="BD">
<iso_3166_2_entry
code="BD-05" name="Bagerhat zila" />
@@ -1077,7 +1076,7 @@
<!-- Botswana -->
<iso_3166_country code="BW">
<iso_3166_2_entry
- code="BW-CE" name="Central " />
+ code="BW-CE" name="Central" />
<iso_3166_2_entry
code="BW-GH" name="Ghanzi" />
<iso_3166_2_entry
@@ -1087,7 +1086,7 @@
<iso_3166_2_entry
code="BW-KW" name="Kweneng" />
<iso_3166_2_entry
- code="BW-NG" name="Ngamiland " />
+ code="BW-NG" name="Ngamiland" />
<iso_3166_2_entry
code="BW-NE" name="North-East" />
<iso_3166_2_entry
@@ -1099,11 +1098,12 @@
</iso_3166_country>
<!-- Belarus -->
<iso_3166_country code="BY-BR">
- <!-- ISO 3166-2 gives several Romanised versions of the names; here we
choose the GOST be version -->
+ <!-- ISO 3166-2 gives several Romanised versions of the names; here we
+ choose the GOST be version -->
<iso_3166_2_entry
code="BY-BR" name="Brèsckaja voblasc'" />
<iso_3166_2_entry
- code="BY-HO" name="Homel'skaja voblasc' " />
+ code="BY-HO" name="Homel'skaja voblasc'" />
<iso_3166_2_entry
code="BY-HR" name="Hrodzenskaja voblasc'" />
<iso_3166_2_entry
@@ -1131,7 +1131,7 @@
<!-- Canada -->
<iso_3166_country code="CA">
<!-- sub-region codes for Canadian provinces and territories -->
-<iso_3166_subset type="Province">
+<iso_3166_subset type="Province">
<iso_3166_2_entry
code="CA-AB" name="Alberta" />
<iso_3166_2_entry
@@ -1189,7 +1189,7 @@
<iso_3166_2_entry
code="CD-SK" name="Sud-Kivu" />
</iso_3166_country>
- <!-- Central African Republic -->
+ <!-- Central African Republic -->
<iso_3166_country code="CF">
<iso_3166_2_entry
code="CF-BGF" name="Bangui" />
@@ -1395,7 +1395,7 @@
</iso_3166_country>
<!-- China -->
<iso_3166_country code="CN">
- <!-- For Taiwan, Hong Kong, see also seperate entries under TW, HR -->
+ <!-- For Taiwan, Hong Kong, see also seperate entries under TW, HR -->
<iso_3166_2_entry
code="CN-11" name="Beijing" />
<iso_3166_2_entry
@@ -1583,7 +1583,7 @@
code="CU-99" name="Isla de la Juventud" />
<geographical_region type="Province">
<!-- Postal codes for Cuba. -->
- <!-- Data taken from http://www.columbia.edu/kermit/postal.html -->
+ <!-- Data taken from http://www.columbia.edu/kermit/postal.html -->
<!-- Provincias of Cuba, with recommended abbreviations -->
<region code="CU-PR" name="Pinar del Roo" />
<region code="CU-CA" name="Ciego de Avila" />
@@ -1714,7 +1714,7 @@
<iso_3166_2_entry
code="DE-BR" name="Berlin" />
<iso_3166_2_entry
- code="DE-BB" name="Brandenburg " />
+ code="DE-BB" name="Brandenburg" />
<iso_3166_2_entry
code="DE-MV" name="Mecklenburg-Vorpommern" />
<iso_3166_2_entry
@@ -2095,8 +2095,8 @@
</iso_3166_country>
<!-- Spain -->
<iso_3166_country code="ES">
- <!-- Autonomous communities: -->
- <!-- Provinces: Autonomous community: -->
+ <!-- Autonomous communities: -->
+ <!-- Provinces: Autonomous community: -->
<iso_3166_2_entry
code="ES-VI" name="Ă?lava" />
<iso_3166_2_entry
@@ -2197,7 +2197,7 @@
code="ES-ZA" name="Zamora" />
<iso_3166_2_entry
code="ES-Z" name="Zaragoza" />
- <!-- Major North African Locations: -->
+ <!-- Major North African Locations: -->
<iso_3166_2_entry
code="ES-CE" name="Ceuta" />
<iso_3166_2_entry
@@ -2226,7 +2226,7 @@
<!-- Ethiopia -->
<iso_3166_country code="ET">
<iso_3166_2_entry
- code="ET-AA" name="Addis Ababa " />
+ code="ET-AA" name="Addis Ababa" />
<iso_3166_2_entry
code="ET-DD" name="Dire Dawa" />
<iso_3166_2_entry
@@ -2518,7 +2518,7 @@
<iso_3166_2_entry
code="GB-BEX" name="Bexley" />
<iso_3166_2_entry
- code="GB-BIR" name="Birmingham " />
+ code="GB-BIR" name="Birmingham" />
<iso_3166_2_entry
code="GB-BBD" name="Blackburn with Darwen" />
<iso_3166_2_entry
@@ -2972,7 +2972,7 @@
<region code="GLOUS" name="Gloucestershire" />
<region code="GRAMP" name="Grampian" />
<region code="GWYNED" name="Gwynedd" />
- <region code="HANTS" name="Hampshire " />
+ <region code="HANTS" name="Hampshire" />
<region code="HERWOR" namme="Herefordshire & Worcestershire" />
<region code="HERTS" name="Hertfordshire" />
<region code="HIGHL" name="Highland" />
@@ -3417,7 +3417,7 @@
<iso_3166_2_entry
code="HR-16" name="VuRovarako-srijemska zupanija" />
<iso_3166_2_entry
- code="HR-13" name="Zadaraka " />
+ code="HR-13" name="Zadaraka" />
<iso_3166_2_entry
code="HR-01" name="Zagrebacka zupanija" />
</iso_3166_country>
@@ -4117,7 +4117,7 @@
<!-- Japan -->
</iso_3166_country>
<iso_3166_country code="JP">
- <!-- Japan uses Prefectures for its ISO 3166-2 regions -->
+ <!-- Japan uses Prefectures for its ISO 3166-2 regions -->
<!-- Data taken from http://fotw.digibel.be/flags/jp-prefe.html -->
<iso_3166_2_entry
code="JP-23" name="Aichi" />
@@ -4311,51 +4311,51 @@
<!-- Cambodia -->
<iso_3166_country code="KH">
<iso_3166_2_entry
- code="KH-23" name="Krong Kaeb " />
+ code="KH-23" name="Krong Kaeb" />
<iso_3166_2_entry
code="KH-24" name="Krong Pailin" />
<iso_3166_2_entry
- code="KH-18" name="Xrong Preah Sihanouk " />
+ code="KH-18" name="Xrong Preah Sihanouk" />
<iso_3166_2_entry
- code="KH-12" name="Phnom Penh " />
+ code="KH-12" name="Phnom Penh" />
<iso_3166_2_entry
- code="KH-2" name="Baat Dambang " />
+ code="KH-2" name="Baat Dambang" />
<iso_3166_2_entry
- code="KH-1" name="Banteay Mean Chey " />
+ code="KH-1" name="Banteay Mean Chey" />
<iso_3166_2_entry
- code="KH-3" name="Rampong Chaam " />
+ code="KH-3" name="Rampong Chaam" />
<iso_3166_2_entry
- code="KH-4" name="Kampong Chhnang " />
+ code="KH-4" name="Kampong Chhnang" />
<iso_3166_2_entry
- code="KH-5" name="Kampong Spueu " />
+ code="KH-5" name="Kampong Spueu" />
<iso_3166_2_entry
- code="KH-6" name="Kampong Thum " />
+ code="KH-6" name="Kampong Thum" />
<iso_3166_2_entry
- code="KH-7" name="Kampot " />
+ code="KH-7" name="Kampot" />
<iso_3166_2_entry
- code="KH-8" name="Kandaal " />
+ code="KH-8" name="Kandaal" />
<iso_3166_2_entry
- code="KH-9" name="Kach Kong " />
+ code="KH-9" name="Kach Kong" />
<iso_3166_2_entry
- code="KH-10" name="Krachoh " />
+ code="KH-10" name="Krachoh" />
<iso_3166_2_entry
- code="KH-11" name="Mondol Kiri " />
+ code="KH-11" name="Mondol Kiri" />
<iso_3166_2_entry
- code="KH-22" name="Otdar Mean Chey " />
+ code="KH-22" name="Otdar Mean Chey" />
<iso_3166_2_entry
- code="KH-15" name="Pousaat " />
+ code="KH-15" name="Pousaat" />
<iso_3166_2_entry
- code="KH-13" name="Preah Vihear " />
+ code="KH-13" name="Preah Vihear" />
<iso_3166_2_entry
- code="KH-14" name="Prey Veaeng " />
+ code="KH-14" name="Prey Veaeng" />
<iso_3166_2_entry
- code="KH-16" name="Rotanak Kiri " />
+ code="KH-16" name="Rotanak Kiri" />
<iso_3166_2_entry
- code="KH-17" name="Siem Reab " />
+ code="KH-17" name="Siem Reab" />
<iso_3166_2_entry
- code="KH-19" name="Stueng Traeng " />
+ code="KH-19" name="Stueng Traeng" />
<iso_3166_2_entry
- code="KH-20" name="Svaay Rieng " />
+ code="KH-20" name="Svaay Rieng" />
<iso_3166_2_entry
code="KH-21" name="Taakaev" />
</iso_3166_country>
@@ -4504,13 +4504,13 @@
<iso_3166_2_entry
code="LA-VT" name="Vientiane" />
<iso_3166_2_entry
- code="LA-AT" name="Attapu " />
+ code="LA-AT" name="Attapu" />
<iso_3166_2_entry
code="LA-BK" name="Bokeo" />
<iso_3166_2_entry
- code="LA-BL" name="Bolikhamxai " />
+ code="LA-BL" name="Bolikhamxai" />
<iso_3166_2_entry
- code="LA-CH" name="Champasak " />
+ code="LA-CH" name="Champasak" />
<iso_3166_2_entry
code="LA-HO" name="Houaphan" />
<iso_3166_2_entry
@@ -4518,23 +4518,23 @@
<iso_3166_2_entry
code="LA-LM" name="Louang Namtha" />
<iso_3166_2_entry
- code="LA-LP" name="Louangphabang " />
+ code="LA-LP" name="Louangphabang" />
<iso_3166_2_entry
- code="LA-OU" name="Oudomxai " />
+ code="LA-OU" name="Oudomxai" />
<iso_3166_2_entry
- code="LA-PH" name="Phongsali " />
+ code="LA-PH" name="Phongsali" />
<iso_3166_2_entry
- code="LA-SL" name="Salavan " />
+ code="LA-SL" name="Salavan" />
<iso_3166_2_entry
code="LA-SV" name="Savannakhet" />
<iso_3166_2_entry
code="LA-VI" name="Vientiane" />
<iso_3166_2_entry
- code="LA-XA" name="Xaignabouli " />
+ code="LA-XA" name="Xaignabouli" />
<iso_3166_2_entry
code="LA-XN" name="Xiasomboun" />
<iso_3166_2_entry
- code="LA-XE" name="Xekong " />
+ code="LA-XE" name="Xekong" />
<iso_3166_2_entry
code="LA-XI" name="Xiangkhoang" />
</iso_3166_country>
@@ -4853,11 +4853,11 @@
<iso_3166_2_entry
code="MA-BER" name="Berkane" />
<iso_3166_2_entry
- code="MA-BOD" name="Boujdour " />
+ code="MA-BOD" name="Boujdour" />
<iso_3166_2_entry
code="MA-BOM" name="Boulemane" />
<iso_3166_2_entry
- code="MA-CAS" name="Casablanca [Dar el BeĂŻda]" />
+ code="MA-CAS" name="Casablanca [Dar el BeĂŻda]" />
<iso_3166_2_entry
code="MA-CHE" name="Chefchaouene" />
<iso_3166_2_entry
@@ -4871,7 +4871,7 @@
<iso_3166_2_entry
code="MA-ESI" name="Essaouira" />
<iso_3166_2_entry
- code="MA-ESM" name="Es Smara " />
+ code="MA-ESM" name="Es Smara" />
<iso_3166_2_entry
code="MA-FES" name="Fès" />
<iso_3166_2_entry
@@ -5201,7 +5201,7 @@
<iso_3166_2_entry
code="MU-AG" name="Agalega Islands" />
<iso_3166_2_entry
- code="MU-CC" name="Cargados Carajos Shoals " />
+ code="MU-CC" name="Cargados Carajos Shoals" />
<iso_3166_2_entry
code="MU-RO" name="Rodrigues Island" />
</iso_3166_subset>
@@ -5724,7 +5724,7 @@
<iso_3166_2_entry
code="OM-BA" name="Al Batinah" />
<iso_3166_2_entry
- code="OM-JA" name="Al Janblyah " />
+ code="OM-JA" name="Al Janblyah" />
<iso_3166_2_entry
code="OM-WU" name="Al Wusta" />
<iso_3166_2_entry
@@ -5776,7 +5776,7 @@
<iso_3166_2_entry
code="PE-CAJ" name="Cajamarca" />
<iso_3166_2_entry
- code="PE-CUS" name="Cuzco " />
+ code="PE-CUS" name="Cuzco" />
<iso_3166_2_entry
code="PE-HUV" name="Huancavelica" />
<iso_3166_2_entry
@@ -5845,7 +5845,7 @@
<iso_3166_2_entry
code="PG-NSA" name="North Solomons" />
<iso_3166_2_entry
- code="PG-SAN" name="Santaun " />
+ code="PG-SAN" name="Santaun" />
<iso_3166_2_entry
code="PG-SHM" name="Southern Highlands" />
<iso_3166_2_entry
@@ -6068,7 +6068,7 @@
<iso_3166_2_entry
code="PL-WP" name="Wielkopolskie" />
<iso_3166_2_entry
- code="PL-ZP" name="Zachodniopomorskie " />
+ code="PL-ZP" name="Zachodniopomorskie" />
</iso_3166_country>
<!-- Palestine -->
<iso_3166_country code="PS">
@@ -6119,7 +6119,7 @@
code="PT-30" name="Regiao Autonoma da Madeira" />
</iso_3166_country>
<!-- Paraguay -->
-<iso_3166_country code="PY">
+<iso_3166_country code="PY">
<iso_3166_2_entry
code="PY-ASU" name="Asuncion" />
<iso_3166_2_entry
@@ -6272,7 +6272,7 @@
<!-- Russia -->
<iso_3166_country code="RU">
<!-- The ISO 3166-2 entries give romanised versions according to two
standards, -->
- <!-- GOST (1983) and Russian BGN/PCGN (1947).
-->
+ <!-- GOST (1983) and Russian BGN/PCGN (1947).
-->
<!-- Here the BGN entry is listed , since it was listed first in the
ISO document -->
<!-- Localize to Cyrillic anyway in the po files.
-->
<iso_3166_subset type="Republic">
@@ -7972,13 +7972,13 @@
<iso_3166_2_entry
code="US-AS" name="American Samoa" />
<iso_3166_2_entry
- code="US-AZ" name="Arizona " />
+ code="US-AZ" name="Arizona" />
<iso_3166_2_entry
code="US-AR" name="Arkansas" />
<iso_3166_2_entry
- code="US-CA" name="California " />
+ code="US-CA" name="California" />
<iso_3166_2_entry
- code="US-CO" name="Colorado " />
+ code="US-CO" name="Colorado" />
<iso_3166_2_entry
code="US-CT" name="Connecticut" />
<iso_3166_2_entry
@@ -8080,7 +8080,7 @@
<iso_3166_2_entry
code="US-WY" name="Wyoming" />
<!-- The USPS Also recognizes the following Military "States" -->
- <!-- (Europe includes Africa, Middile East) -->
+ <!-- (Europe includes Africa, Middile East) -->
<iso_3166_2_entry
code="US-AE" name="Armed Forces Europe" />
<iso_3166_2_entry
@@ -8132,7 +8132,7 @@
<!-- Uzbekistan -->
<iso_3166_country code="UZ">
<iso_3166_2_entry
- code="UZ-TK" name="Toshkent " />
+ code="UZ-TK" name="Toshkent" />
<iso_3166_2_entry
code="UZ-QR" name="Qoraqalpogiston Respublikasi" />
<iso_3166_2_entry
--- iso_3167_2.xml.ORIG 2005-02-01 23:58:50.000000000 +0000 +++ iso_3167_2.xml.SUBSTANTIAL_CHANGES 2005-02-02 00:00:38.000000000 +0000 @@ -20,6 +20,12 @@ <!-- The sorting order is the same that is used in the standard. --> <!-- --> <!-- Up-to-date as of newsletter, 2004-03-08, Newsletter 2. --> +<!-- --> +<!-- Up-to-date as of what?!: Google says: --> +<!-- ``ISO 3166-2 Newsletter Number I-6 was published on 2004-03-08.'' --> +<!-- (http://google.com/search?q=iso%203166%20newsletter%202004-03-08) --> +<!-- Cf. http://en.wikipedia.org/wiki/ISO_3166-2 --> +<!-- -Jan MinĂĄĹ? --> <iso_3166_2_entries> <!-- United Arab Emirates --> @@ -1672,7 +1678,7 @@ <iso_3166_2_entry code="CZ-PL" name="PlzeĹ?skĂ˝ kraj" /> <iso_3166_2_entry - code="CZ-PR" name="Praha, hlavanĂ msÄ?sto" /> + code="CZ-PR" name="Praha, hlavnĂ mÄ?sto" /> <iso_3166_2_entry code="CZ-ST" name="StĹ?edoÄ?eskĂ˝ kraj" /> <iso_3166_2_entry @@ -6953,22 +6959,24 @@ </iso_3166_country> <!-- Slovakia --> <iso_3166_country code="SK"> + <!-- These names are wrong, and some slovak-speaking person should + proofread them -Jan MinĂĄĹ? --> <iso_3166_2_entry - code="SK-BC" name="Banskobyatricky kraj" /> + code="SK-BC" name="BĂĄnskobystrickĂ˝ kraj" /> <iso_3166_2_entry - code="SK-BL" name="Bratislavsky kraj" /> + code="SK-BL" name="BratislavskĂ˝ kraj" /> <iso_3166_2_entry - code="SK-KI" name="Kolicky kraj" /> + code="SK-KI" name="KoĹĄickĂ˝ kraj" /> <iso_3166_2_entry - code="SK-NJ" name="Nitrianaky kraj" /> + code="SK-NJ" name="NitrianskĂ˝ kraj" /> <iso_3166_2_entry - code="SK-PV" name="Prebovaky kraj" /> + code="SK-PV" name="PreĹĄovskĂ˝ kraj" /> <iso_3166_2_entry - code="SK-TC" name="Trenciansky kraj" /> + code="SK-TC" name="TrenÄ?ianskĂ˝ kraj" /> <iso_3166_2_entry - code="SK-TA" name="Trnavaky kraj" /> + code="SK-TA" name="TrnavskĂ˝ kraj" /> <iso_3166_2_entry - code="SK-ZI" name="Zilinaky kraj" /> + code="SK-ZI" name="Ĺ˝ilinskĂ˝ kraj" /> </iso_3166_country> <!-- Sierra Leone --> <iso_3166_country code="SL">
pgppa9VU2uVOn.pgp
Description: PGP signature
