Update ISO 3166 country codes list.

* gettext-tools/doc/ISO_3166: Update to match current Wikipedia.
* gettext-tools/doc/iso-3166.texi: Likewise.
* gettext-tools/src/msginit.c (catalogname_for_locale): Likewise.

diff --git a/gettext-tools/doc/ISO_3166 b/gettext-tools/doc/ISO_3166
index 0098448730c063974415b092e83cdcdbe2d111f5..4d1092317ea793f1730a6908d958341f737ac9a5 100644 (file)
--- a/gettext-tools/doc/ISO_3166
+++ b/gettext-tools/doc/ISO_3166
@@ -19,7 +19,7 @@
 # Lines beginning with '#' are comments.
 #
 # Updated from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-# 2014-02-10 by Daiki Ueno
+# 2025-12-26 by Bruno Haible
 #
 #country-
 #code  country name
@@ -62,7 +62,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
@@ -74,11 +74,11 @@ CN  China
 CO     Colombia
 CR     Costa Rica
 CU     Cuba
-CV     Cape Verde
+CV     Cabo Verde
 CW     Curaçao
 CX     Christmas Island
 CY     Cyprus
-CZ     Czech Republic
+CZ     Czechia
 DE     Germany
 DJ     Djibouti
 DK     Denmark
@@ -99,7 +99,7 @@ FM    Micronesia, Federated States of
 FO     Faroe Islands
 FR     France
 GA     Gabon
-GB     United Kingdom
+GB     United Kingdom of Great Britain and Northern Ireland
 GD     Grenada
 GE     Georgia
 GF     French Guiana
@@ -188,7 +188,7 @@ NE  Niger
 NF     Norfolk Island
 NG     Nigeria
 NI     Nicaragua
-NL     Netherlands
+NL     Netherlands, Kingdom of the
 NO     Norway
 NP     Nepal
 NR     Nauru
@@ -255,14 +255,14 @@ TZ        Tanzania, United Republic of
 UA     Ukraine
 UG     Uganda
 UM     United States Minor Outlying Islands
-US     United States
+US     United States of America
 UY     Uruguay
 UZ     Uzbekistan
-VA     Holy See (Vatican City State)
+VA     Holy See
 VC     Saint Vincent and the Grenadines
 VE     Venezuela, Bolivarian Republic of
-VG     Virgin Islands, British
-VI     Virgin Islands, U.S.
+VG     Virgin Islands (British)
+VI     Virgin Islands (U.S.)
 VN     Viet Nam
 VU     Vanuatu
 WF     Wallis and Futuna

diff --git a/gettext-tools/doc/iso-3166.texi b/gettext-tools/doc/iso-3166.texi
index dd1583d34ffc75f2f511aba797e93a80aac86d9c..be590b647643c691097af1e403070fa91daa217e 100644 (file)
--- a/gettext-tools/doc/iso-3166.texi
+++ b/gettext-tools/doc/iso-3166.texi
@@ -77,7 +77,7 @@ Canada.
 @item CC
 Cocos (Keeling) Islands.
 @item CD
-Congo, The Democratic Republic of the.
+Congo, Democratic Republic of the.
 @item CF
 Central African Republic.
 @item CG
@@ -101,7 +101,7 @@ Costa Rica.
 @item CU
 Cuba.
 @item CV
-Cape Verde.
+Cabo Verde.
 @item CW
 Curaçao.
 @item CX
@@ -109,7 +109,7 @@ Christmas Island.
 @item CY
 Cyprus.
 @item CZ
-Czech Republic.
+Czechia.
 @item DE
 Germany.
 @item DJ
@@ -151,7 +151,7 @@ France.
 @item GA
 Gabon.
 @item GB
-United Kingdom.
+United Kingdom of Great Britain and Northern Ireland.
 @item GD
 Grenada.
 @item GE
@@ -329,7 +329,7 @@ Nigeria.
 @item NI
 Nicaragua.
 @item NL
-Netherlands.
+Netherlands, Kingdom of the.
 @item NO
 Norway.
 @item NP
@@ -463,21 +463,21 @@ Uganda.
 @item UM
 United States Minor Outlying Islands.
 @item US
-United States.
+United States of America.
 @item UY
 Uruguay.
 @item UZ
 Uzbekistan.
 @item VA
-Holy See (Vatican City State).
+Holy See.
 @item VC
 Saint Vincent and the Grenadines.
 @item VE
 Venezuela, Bolivarian Republic of.
 @item VG
-Virgin Islands, British.
+Virgin Islands (British).
 @item VI
-Virgin Islands, U.S..
+Virgin Islands (U.S.).
 @item VN
 Viet Nam.
 @item VU

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index d9f0e90c59d7e3ffd56b6acec01bec1c792407bf..0222663f52a7a6ab1118f16afaec38ae2786168a 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -559,7 +559,7 @@ catalogname_for_locale (const char *locale)
     "cr_CA",    /* Cree         Canada */
     /* Don't put "crh_UZ" or "crh_UA" here.  That would be asking for fruitless
        political discussion.  */
-    "cs_CZ",    /* Czech        Czech Republic */
+    "cs_CZ",    /* Czech        Czechia */
     "csb_PL",   /* Kashubian    Poland */
     "cy_GB",    /* Welsh        Britain */
     "da_DK",    /* Danish       Denmark */