resync with ISO web site; ok kmos@

diff --git a/share/misc/countrycodes b/share/misc/countrycodes
index f663151..48a58b8 100644 (file)
--- a/share/misc/countrycodes
+++ b/share/misc/countrycodes
@@ -1,7 +1,7 @@
-# $OpenBSD: countrycodes,v 1.4 2015/09/03 17:08:29 naddy Exp $
+# $OpenBSD: countrycodes,v 1.5 2022/11/11 11:27:05 daniel Exp $
 #
 # ISO 3166-1 country names and code elements
-# https://www.iso.org/obp/ui/#search/code/
+# https://www.iso.org/obp/ui/#search
 #
 # ccTLDs are derived from this list, though a few ccTLDs in popular use 
 # are not on this list (i.e., 'UK')
@@ -47,7 +47,7 @@ BY:BELARUS
 BZ:BELIZE
 CA:CANADA
 CC:COCOS (KEELING) ISLANDS
-CD:CONGO (THE DEMOCRATIC REPUBLIC OF THE)
+CD:CONGO, DEMOCRATIC REPUBLIC OF THE
 CF:CENTRAL AFRICAN REPUBLIC
 CG:CONGO
 CH:SWITZERLAND
@@ -63,7 +63,7 @@ CV:CABO VERDE
 CW:CURACAO
 CX:CHRISTMAS ISLAND
 CY:CYPRUS
-CZ:CZECH REPUBLIC
+CZ:CZECHIA
 DE:GERMANY
 DJ:DJIBOUTI
 DK:DENMARK
@@ -79,7 +79,7 @@ ES:SPAIN
 ET:ETHIOPIA
 FI:FINLAND
 FJ:FIJI
-FK:FALKLAND ISLANDS [MALVINAS]
+FK:FALKLAND ISLANDS (MALVINAS)
 FM:MICRONESIA (FEDERATED STATES OF)
 FO:FAROE ISLANDS
 FR:FRANCE
@@ -128,8 +128,8 @@ KH:CAMBODIA
 KI:KIRIBATI
 KM:COMOROS
 KN:SAINT KITTS AND NEVIS
-KP:KOREA (THE DEMOCRATIC PEOPLE'S REPUBLIC OF)
-KR:KOREA (THE REPUBLIC OF)
+KP:KOREA (DEMOCRATIC PEOPLE'S REPUBLIC OF)
+KR:KOREA, REPUBLIC OF
 KW:KUWAIT
 KY:CAYMAN ISLANDS
 KZ:KAZAKHSTAN
@@ -146,12 +146,12 @@ LV:LATVIA
 LY:LIBYA
 MA:MOROCCO
 MC:MONACO
-MD:MOLDOVA (THE REPUBLIC OF)
+MD:MOLDOVA, REPUBLIC OF
 ME:MONTENEGRO
 MF:SAINT MARTIN (FRENCH PART)
 MG:MADAGASCAR
 MH:MARSHALL ISLANDS
-MK:MACEDONIA (THE FORMER YUGOSLAV REPUBLIC OF)
+MK:NORTH MACEDONIA
 ML:MALI
 MM:MYANMAR
 MN:MONGOLIA
@@ -220,7 +220,7 @@ ST:SAO TOME AND PRINCIPE
 SV:EL SALVADOR
 SX:SINT MAARTEN (DUTCH PART)
 SY:SYRIAN ARAB REPUBLIC
-SZ:SWAZILAND
+SZ:ESWATINI
 TC:TURKS AND CAICOS ISLANDS
 TD:CHAD
 TF:FRENCH SOUTHERN TERRITORIES
@@ -235,7 +235,7 @@ TO:TONGA
 TR:TURKEY
 TT:TRINIDAD AND TOBAGO
 TV:TUVALU
-TW:TAIWAN (PROVINCE OF CHINA)
+TW:TAIWAN, PROVINCE OF CHINA
 TZ:TANZANIA, UNITED REPUBLIC OF
 UA:UKRAINE
 UG:UGANDA