1 files changed, 14 insertions, 13 deletions
diff --git a/locale/iso-3166.def b/locale/iso-3166.def
index 3a9a45e5b1..6412acf4b1 100644
--- a/locale/iso-3166.def
+++ b/locale/iso-3166.def
@@ -57,7 +57,7 @@ DEFINE_COUNTRY_CODE ("CONGO, THE DEMOCRATIC REPUBLIC OF THE", CD, COD, 180)
 DEFINE_COUNTRY_CODE ("COOK ISLANDS", CK, COK, 184)
 DEFINE_COUNTRY_CODE ("COSTA RICA", CR, CRI, 188)
 DEFINE_COUNTRY_CODE ("COTE D'IVOIRE", CI, CIV, 384)
-DEFINE_COUNTRY_CODE ("CROATIA (local name: Hrvatska)", HR, HRV, 191)
+DEFINE_COUNTRY_CODE ("CROATIA", HR, HRV, 191)
 DEFINE_COUNTRY_CODE ("CUBA", CU, CUB, 192)
 DEFINE_COUNTRY_CODE ("CYPRUS", CY, CYP, 196)
 DEFINE_COUNTRY_CODE ("CZECH REPUBLIC", CZ, CZE, 203)
@@ -78,7 +78,6 @@ DEFINE_COUNTRY_CODE ("FAROE ISLANDS", FO, FRO, 234)
 DEFINE_COUNTRY_CODE ("FIJI", FJ, FJI, 242)
 DEFINE_COUNTRY_CODE ("FINLAND", FI, FIN, 246)
 DEFINE_COUNTRY_CODE ("FRANCE", FR, FRA, 250)
-DEFINE_COUNTRY_CODE ("FRANCE, METROPOLITAN", FX, FXX, 249)
 DEFINE_COUNTRY_CODE ("FRENCH GUIANA", GF, GUF, 254)
 DEFINE_COUNTRY_CODE ("FRENCH POLYNESIA", PF, PYF, 258)
 DEFINE_COUNTRY_CODE ("FRENCH SOUTHERN TERRITORIES", TF, ATF, 260)
@@ -98,7 +97,7 @@ DEFINE_COUNTRY_CODE ("GUINEA", GN, GIN, 324)
 DEFINE_COUNTRY_CODE ("GUINEA-BISSAU", GW, GNB, 624)
 DEFINE_COUNTRY_CODE ("GUYANA", GY, GUY, 328)
 DEFINE_COUNTRY_CODE ("HAITI", HT, HTI, 332)
-DEFINE_COUNTRY_CODE ("HEARD AND MC DONALD ISLANDS", HM, HMD, 334)
+DEFINE_COUNTRY_CODE ("HEARD ISLAND AND MC DONALD ISLANDS", HM, HMD, 334)
 DEFINE_COUNTRY_CODE ("HOLY SEE (VATICAN CITY STATE)", VA, VAT, 336)
 DEFINE_COUNTRY_CODE ("HONDURAS", HN, HND, 340)
 DEFINE_COUNTRY_CODE ("HONG KONG", HK, HKG, 344)
@@ -106,7 +105,7 @@ DEFINE_COUNTRY_CODE ("HUNGARY", HU, HUN, 348)
 DEFINE_COUNTRY_CODE ("ICELAND", IS, ISL, 352)
 DEFINE_COUNTRY_CODE ("INDIA", IN, IND, 356)
 DEFINE_COUNTRY_CODE ("INDONESIA", ID, IDN, 360)
-DEFINE_COUNTRY_CODE ("IRAN (ISLAMIC REPUBLIC OF)", IR, IRN, 364)
+DEFINE_COUNTRY_CODE ("IRAN, ISLAMIC REPUBLIC OF", IR, IRN, 364)
 DEFINE_COUNTRY_CODE ("IRAQ", IQ, IRQ, 368)
 DEFINE_COUNTRY_CODE ("IRELAND", IE, IRL, 372)
 DEFINE_COUNTRY_CODE ("ISRAEL", IL, ISR, 376)
@@ -114,7 +113,7 @@ DEFINE_COUNTRY_CODE ("ITALY", IT, ITA, 380)
 DEFINE_COUNTRY_CODE ("JAMAICA", JM, JAM, 388)
 DEFINE_COUNTRY_CODE ("JAPAN", JP, JPN, 392)
 DEFINE_COUNTRY_CODE ("JORDAN", JO, JOR, 400)
-DEFINE_COUNTRY_CODE ("KAZAKHSTAN", KZ, KAZ, 398)
+DEFINE_COUNTRY_CODE ("KAZAKSTAN", KZ, KAZ, 398)
 DEFINE_COUNTRY_CODE ("KENYA", KE, KEN, 404)
 DEFINE_COUNTRY_CODE ("KIRIBATI", KI, KIR, 296)
 DEFINE_COUNTRY_CODE ("KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", KP, PRK, 408)
@@ -169,6 +168,8 @@ DEFINE_COUNTRY_CODE ("NORWAY", NO, NOR, 578)
 DEFINE_COUNTRY_CODE ("OMAN", OM, OMN, 512)
 DEFINE_COUNTRY_CODE ("PAKISTAN", PK, PAK, 586)
 DEFINE_COUNTRY_CODE ("PALAU", PW, PLW, 585)
+// If anybody finds out the number please report it.
+// DEFINE_COUNTRY_CODE ("PALESTINE TERRITORY, OCUPIED", PS, PSE, ...)
 DEFINE_COUNTRY_CODE ("PANAMA", PA, PAN, 591)
 DEFINE_COUNTRY_CODE ("PAPUA NEW GUINEA", PG, PNG, 598)
 DEFINE_COUNTRY_CODE ("PARAGUAY", PY, PRY, 600)
@@ -183,8 +184,10 @@ DEFINE_COUNTRY_CODE ("REUNION", RE, REU, 638)
 DEFINE_COUNTRY_CODE ("ROMANIA", RO, ROM, 642)
 DEFINE_COUNTRY_CODE ("RUSSIAN FEDERATION", RU, RUS, 643)
 DEFINE_COUNTRY_CODE ("RWANDA", RW, RWA, 646)
+DEFINE_COUNTRY_CODE ("SAINT HELENA", SH, SHN, 654)
 DEFINE_COUNTRY_CODE ("SAINT KITTS AND NEVIS", KN, KNA, 659)
 DEFINE_COUNTRY_CODE ("SAINT LUCIA", LC, LCA, 662)
+DEFINE_COUNTRY_CODE ("SAINT PIERRE AND MIQUELON", PM, SPM, 666)
 DEFINE_COUNTRY_CODE ("SAINT VINCENT AND THE GRENADINES", VC, VCT, 670)
 DEFINE_COUNTRY_CODE ("SAMOA", WS, WSM, 882)
 DEFINE_COUNTRY_CODE ("SAN MARINO", SM, SMR, 674)
@@ -194,7 +197,7 @@ DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686)
 DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690)
 DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694)
 DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702)
-DEFINE_COUNTRY_CODE ("SLOVAKIA (Slovak Republic)", SK, SVK, 703)
+DEFINE_COUNTRY_CODE ("SLOVAKIA", SK, SVK, 703)
 DEFINE_COUNTRY_CODE ("SLOVENIA", SI, SVN, 705)
 DEFINE_COUNTRY_CODE ("SOLOMON ISLANDS", SB, SLB, 90)
 DEFINE_COUNTRY_CODE ("SOMALIA", SO, SOM, 706)
@@ -202,11 +205,9 @@ DEFINE_COUNTRY_CODE ("SOUTH AFRICA", ZA, ZAF, 710)
 DEFINE_COUNTRY_CODE ("SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS", GS, SGS, 239)
 DEFINE_COUNTRY_CODE ("SPAIN", ES, ESP, 724)
 DEFINE_COUNTRY_CODE ("SRI LANKA", LK, LKA, 144)
-DEFINE_COUNTRY_CODE ("ST. HELENA", SH, SHN, 654)
-DEFINE_COUNTRY_CODE ("ST. PIERRE AND MIQUELON", PM, SPM, 666)
 DEFINE_COUNTRY_CODE ("SUDAN", SD, SDN, 736)
 DEFINE_COUNTRY_CODE ("SURINAME", SR, SUR, 740)
-DEFINE_COUNTRY_CODE ("SVALBARD AND JAN MAYEN ISLANDS", SJ, SJM, 744)
+DEFINE_COUNTRY_CODE ("SVALBARD AND JAN MAYEN", SJ, SJM, 744)
 DEFINE_COUNTRY_CODE ("SWAZILAND", SZ, SWZ, 748)
 DEFINE_COUNTRY_CODE ("SWEDEN", SE, SWE, 752)
 DEFINE_COUNTRY_CODE ("SWITZERLAND", CH, CHE, 756)
@@ -234,10 +235,10 @@ DEFINE_COUNTRY_CODE ("URUGUAY", UY, URY, 858)
 DEFINE_COUNTRY_CODE ("UZBEKISTAN", UZ, UZB, 860)
 DEFINE_COUNTRY_CODE ("VANUATU", VU, VUT, 548)
 DEFINE_COUNTRY_CODE ("VENEZUELA", VE, VEN, 862)
-DEFINE_COUNTRY_CODE ("VIET NAM", VN, VNM, 704)
-DEFINE_COUNTRY_CODE ("VIRGIN ISLANDS (BRITISH)", VG, VGB, 92)
-DEFINE_COUNTRY_CODE ("VIRGIN ISLANDS (U.S.)", VI, VIR, 850)
-DEFINE_COUNTRY_CODE ("WALLIS AND FUTUNA ISLANDS", WF, WLF, 876)
+DEFINE_COUNTRY_CODE ("VIETNAM", VN, VNM, 704)
+DEFINE_COUNTRY_CODE ("VIRGIN ISLANDS, BRITISH", VG, VGB, 92)
+DEFINE_COUNTRY_CODE ("VIRGIN ISLANDS, U.S.", VI, VIR, 850)
+DEFINE_COUNTRY_CODE ("WALLIS AND FUTUNA", WF, WLF, 876)
 DEFINE_COUNTRY_CODE ("WESTERN SAHARA", EH, ESH, 732)
 DEFINE_COUNTRY_CODE ("YEMEN", YE, YEM, 887)
 DEFINE_COUNTRY_CODE ("YUGOSLAVIA", YU, YUG, 891)