doc: update country codes to the latest

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 95740891a784037451a5eb9ee28593ba651b5d97..eb254b11d8aac8b152470038ccdd03321c76a567 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-10  Daiki Ueno  <ueno@gnu.org>
+
+       * ISO_3166: Remove AN, add BL, BQ, CW, MF, SS, and SX.  Update
+       country code for AG, AS, BA, BN, BO, CD, CG, FK, FM, FO, GB, GS,
+       HM, IR, KN, KP, KR, LA, LC, MD, MK, MM, PM, PS, RU, SH, SJ, ST,
+       SY, TC, TF, TT, TW, TZ, UM, VA, VC, VE, VG, VI, VN, WF, and WS.
+       * iso-3166.texi: Regenerate.
+       Reported by Karl Berry in:
+       <https://lists.gnu.org/archive/html/bug-gettext/2014-02/msg00006.html>.
+
 2014-01-12  Benno Schulenberg <bensberg@justemail.net>  (tiny change)
 
        * gettext.texi (c-format Flag): Wording fixes.

diff --git a/gettext-tools/doc/ISO_3166 b/gettext-tools/doc/ISO_3166
index c0ace90f624ab702d07fe3de171410ca514527ef..9ce547c87136a46bd4c6767102ebf390a2c7f586 100644 (file)
--- a/gettext-tools/doc/ISO_3166
+++ b/gettext-tools/doc/ISO_3166
@@ -18,26 +18,28 @@
 #
 # Lines beginning with '#' are comments.
 #
+# Updated from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+# 2014-02-10 by Daiki Ueno
+#
 #country-
 #code  country name
 AD     Andorra
 AE     United Arab Emirates
 AF     Afghanistan
-AG     Antigua & Barbuda
+AG     Antigua and Barbuda
 AI     Anguilla
 AL     Albania
 AM     Armenia
-AN     Netherlands Antilles
 AO     Angola
 AQ     Antarctica
 AR     Argentina
-AS     Samoa (American)
+AS     American Samoa
 AT     Austria
 AU     Australia
 AW     Aruba
 AX     Åland Islands
 AZ     Azerbaijan
-BA     Bosnia & Herzegovina
+BA     Bosnia and Herzegovina
 BB     Barbados
 BD     Bangladesh
 BE     Belgium
@@ -46,9 +48,11 @@ BG   Bulgaria
 BH     Bahrain
 BI     Burundi
 BJ     Benin
+BL     Saint Barthélemy
 BM     Bermuda
-BN     Brunei
-BO     Bolivia
+BN     Brunei Darussalam
+BO     Bolivia, Plurinational State of
+BQ     Bonaire, Sint Eustatius and Saba
 BR     Brazil
 BS     Bahamas
 BT     Bhutan
@@ -58,9 +62,9 @@ BY    Belarus
 BZ     Belize
 CA     Canada
 CC     Cocos (Keeling) Islands
-CD     Congo (Dem. Rep.)
+CD     Congo, The Democratic Republic of the
 CF     Central African Republic
-CG     Congo (Rep.)
+CG     Congo
 CH     Switzerland
 CI     Côte d'Ivoire
 CK     Cook Islands
@@ -71,6 +75,7 @@ CO    Colombia
 CR     Costa Rica
 CU     Cuba
 CV     Cape Verde
+CW     Curaçao
 CX     Christmas Island
 CY     Cyprus
 CZ     Czech Republic
@@ -89,12 +94,12 @@ ES  Spain
 ET     Ethiopia
 FI     Finland
 FJ     Fiji
-FK     Falkland Islands
-FM     Micronesia
-FO     Faeroe Islands
+FK     Falkland Islands (Malvinas)
+FM     Micronesia, Federated States of
+FO     Faroe Islands
 FR     France
 GA     Gabon
-GB     Britain (United Kingdom)
+GB     United Kingdom
 GD     Grenada
 GE     Georgia
 GF     French Guiana
@@ -107,13 +112,13 @@ GN        Guinea
 GP     Guadeloupe
 GQ     Equatorial Guinea
 GR     Greece
-GS     South Georgia & the South Sandwich Islands
+GS     South Georgia and the South Sandwich Islands
 GT     Guatemala
 GU     Guam
 GW     Guinea-Bissau
 GY     Guyana
 HK     Hong Kong
-HM     Heard Island & McDonald Islands
+HM     Heard Island and McDonald Islands
 HN     Honduras
 HR     Croatia
 HT     Haiti
@@ -125,7 +130,7 @@ IM  Isle of Man
 IN     India
 IO     British Indian Ocean Territory
 IQ     Iraq
-IR     Iran
+IR     Iran, Islamic Republic of
 IS     Iceland
 IT     Italy
 JE     Jersey
@@ -137,15 +142,15 @@ KG        Kyrgyzstan
 KH     Cambodia
 KI     Kiribati
 KM     Comoros
-KN     St Kitts & Nevis
-KP     Korea (North)
-KR     Korea (South)
+KN     Saint Kitts and Nevis
+KP     Korea, Democratic People's Republic of
+KR     Korea, Republic of
 KW     Kuwait
 KY     Cayman Islands
 KZ     Kazakhstan
-LA     Laos
+LA     Lao People's Democratic Republic
 LB     Lebanon
-LC     St Lucia
+LC     Saint Lucia
 LI     Liechtenstein
 LK     Sri Lanka
 LR     Liberia
@@ -156,13 +161,14 @@ LV        Latvia
 LY     Libya
 MA     Morocco
 MC     Monaco
-MD     Moldova
+MD     Moldova, Republic of
 ME     Montenegro
+MF     Saint Martin (French part)
 MG     Madagascar
 MH     Marshall Islands
-MK     Macedonia
+MK     Macedonia, The Former Yugoslav Republic of
 ML     Mali
-MM     Myanmar (Burma)
+MM     Myanmar
 MN     Mongolia
 MO     Macao
 MP     Northern Mariana Islands
@@ -196,10 +202,10 @@ PG        Papua New Guinea
 PH     Philippines
 PK     Pakistan
 PL     Poland
-PM     St Pierre & Miquelon
+PM     Saint Pierre and Miquelon
 PN     Pitcairn
 PR     Puerto Rico
-PS     Palestine
+PS     Palestine, State of
 PT     Portugal
 PW     Palau
 PY     Paraguay
@@ -207,7 +213,7 @@ QA  Qatar
 RE     Réunion
 RO     Romania
 RS     Serbia
-RU     Russia
+RU     Russian Federation
 RW     Rwanda
 SA     Saudi Arabia
 SB     Solomon Islands
@@ -215,22 +221,24 @@ SC        Seychelles
 SD     Sudan
 SE     Sweden
 SG     Singapore
-SH     St Helena
+SH     Saint Helena, Ascension and Tristan da Cunha
 SI     Slovenia
-SJ     Svalbard & Jan Mayen
+SJ     Svalbard and Jan Mayen
 SK     Slovakia
 SL     Sierra Leone
 SM     San Marino
 SN     Senegal
 SO     Somalia
 SR     Suriname
-ST     Sao Tome & Principe
+SS     South Sudan
+ST     Sao Tome and Principe
 SV     El Salvador
-SY     Syria
+SX     Sint Maarten (Dutch part)
+SY     Syrian Arab Republic
 SZ     Swaziland
-TC     Turks & Caicos Islands
+TC     Turks and Caicos Islands
 TD     Chad
-TF     French Southern & Antarctic Lands
+TF     French Southern Territories
 TG     Togo
 TH     Thailand
 TJ     Tajikistan
@@ -240,25 +248,25 @@ TM        Turkmenistan
 TN     Tunisia
 TO     Tonga
 TR     Turkey
-TT     Trinidad & Tobago
+TT     Trinidad and Tobago
 TV     Tuvalu
-TW     Taiwan
-TZ     Tanzania
+TW     Taiwan, Province of China
+TZ     Tanzania, United Republic of
 UA     Ukraine
 UG     Uganda
-UM     US minor outlying islands
+UM     United States Minor Outlying Islands
 US     United States
 UY     Uruguay
 UZ     Uzbekistan
-VA     Vatican City
-VC     St Vincent & the Grenadines
-VE     Venezuela
-VG     Virgin Islands (UK)
-VI     Virgin Islands (US)
-VN     Vietnam
+VA     Holy See (Vatican City State)
+VC     Saint Vincent and the Grenadines
+VE     Venezuela, Bolivarian Republic of
+VG     Virgin Islands, British
+VI     Virgin Islands, U.S.
+VN     Viet Nam
 VU     Vanuatu
-WF     Wallis & Futuna
-WS     Samoa (Western)
+WF     Wallis and Futuna
+WS     Samoa
 YE     Yemen
 YT     Mayotte
 ZA     South Africa

diff --git a/gettext-tools/doc/iso-3166.texi b/gettext-tools/doc/iso-3166.texi
index 2b162c71e9ce7af4779de5adffed4ff603036c14..310a39229e9cd64fbb10f88c30a4abc1e121f263 100644 (file)
--- a/gettext-tools/doc/iso-3166.texi
+++ b/gettext-tools/doc/iso-3166.texi
@@ -12,8 +12,6 @@ Anguilla.
 Albania.
 @item AM
 Armenia.
-@item AN
-Netherlands Antilles.
 @item AO
 Angola.
 @item AQ
@@ -21,7 +19,7 @@ Antarctica.
 @item AR
 Argentina.
 @item AS
-Samoa (American).
+American Samoa.
 @item AT
 Austria.
 @item AU
@@ -50,12 +48,16 @@ Bahrain.
 Burundi.
 @item BJ
 Benin.
+@item BL
+Saint Barthelemy.
 @item BM
 Bermuda.
 @item BN
-Brunei.
+Brunei Darussalam.
 @item BO
-Bolivia.
+Bolivia, Plurinational State of.
+@item BQ
+Bonaire, Sint Eustatius and Saba.
 @item BR
 Brazil.
 @item BS
@@ -75,11 +77,11 @@ Canada.
 @item CC
 Cocos (Keeling) Islands.
 @item CD
-Congo (Dem. Rep.).
+Congo, The Democratic Republic of the.
 @item CF
 Central African Republic.
 @item CG
-Congo (Rep.).
+Congo.
 @item CH
 Switzerland.
 @item CI
@@ -100,6 +102,8 @@ Costa Rica.
 Cuba.
 @item CV
 Cape Verde.
+@item CW
+Curaçao.
 @item CX
 Christmas Island.
 @item CY
@@ -137,17 +141,17 @@ Finland.
 @item FJ
 Fiji.
 @item FK
-Falkland Islands.
+Falkland Islands (Malvinas).
 @item FM
-Micronesia.
+Micronesia, Federated States of.
 @item FO
-Faeroe Islands.
+Faroe Islands.
 @item FR
 France.
 @item GA
 Gabon.
 @item GB
-Britain (United Kingdom).
+United Kingdom.
 @item GD
 Grenada.
 @item GE
@@ -209,7 +213,7 @@ British Indian Ocean Territory.
 @item IQ
 Iraq.
 @item IR
-Iran.
+Iran, Islamic Republic of.
 @item IS
 Iceland.
 @item IT
@@ -233,11 +237,11 @@ Kiribati.
 @item KM
 Comoros.
 @item KN
-St Kitts and Nevis.
+Saint Kitts and Nevis.
 @item KP
-Korea (North).
+Korea, Democratic People's Republic of.
 @item KR
-Korea (South).
+Korea, Republic of.
 @item KW
 Kuwait.
 @item KY
@@ -245,11 +249,11 @@ Cayman Islands.
 @item KZ
 Kazakhstan.
 @item LA
-Laos.
+Lao People's Democratic Republic.
 @item LB
 Lebanon.
 @item LC
-St Lucia.
+Saint Lucia.
 @item LI
 Liechtenstein.
 @item LK
@@ -271,19 +275,21 @@ Morocco.
 @item MC
 Monaco.
 @item MD
-Moldova.
+Moldova, Republic of.
 @item ME
 Montenegro.
+@item MF
+Saint Martin (French part).
 @item MG
 Madagascar.
 @item MH
 Marshall Islands.
 @item MK
-Macedonia.
+Macedonia, The Former Yugoslav Republic of.
 @item ML
 Mali.
 @item MM
-Myanmar (Burma).
+Myanmar.
 @item MN
 Mongolia.
 @item MO
@@ -351,13 +357,13 @@ Pakistan.
 @item PL
 Poland.
 @item PM
-St Pierre and Miquelon.
+Saint Pierre and Miquelon.
 @item PN
 Pitcairn.
 @item PR
 Puerto Rico.
 @item PS
-Palestine.
+Palestine, State of.
 @item PT
 Portugal.
 @item PW
@@ -373,7 +379,7 @@ Romania.
 @item RS
 Serbia.
 @item RU
-Russia.
+Russian Federation.
 @item RW
 Rwanda.
 @item SA
@@ -389,7 +395,7 @@ Sweden.
 @item SG
 Singapore.
 @item SH
-St Helena.
+Saint Helena, Ascension and Tristan da Cunha.
 @item SI
 Slovenia.
 @item SJ
@@ -406,12 +412,16 @@ Senegal.
 Somalia.
 @item SR
 Suriname.
+@item SS
+South Sudan.
 @item ST
 Sao Tome and Principe.
 @item SV
 El Salvador.
+@item SX
+Sint Maarten (Dutch part).
 @item SY
-Syria.
+Syrian Arab Republic.
 @item SZ
 Swaziland.
 @item TC
@@ -419,7 +429,7 @@ Turks and Caicos Islands.
 @item TD
 Chad.
 @item TF
-French Southern and Antarctic Lands.
+French Southern Territories.
 @item TG
 Togo.
 @item TH
@@ -443,15 +453,15 @@ Trinidad and Tobago.
 @item TV
 Tuvalu.
 @item TW
-Taiwan.
+Taiwan, Province of China.
 @item TZ
-Tanzania.
+Tanzania, United Republic of.
 @item UA
 Ukraine.
 @item UG
 Uganda.
 @item UM
-US minor outlying islands.
+United States Minor Outlying Islands.
 @item US
 United States.
 @item UY
@@ -459,23 +469,23 @@ Uruguay.
 @item UZ
 Uzbekistan.
 @item VA
-Vatican City.
+Holy See (Vatican City State).
 @item VC
-St Vincent and the Grenadines.
+Saint Vincent and the Grenadines.
 @item VE
-Venezuela.
+Venezuela, Bolivarian Republic of.
 @item VG
-Virgin Islands (UK).
+Virgin Islands, British.
 @item VI
-Virgin Islands (US).
+Virgin Islands, U.S..
 @item VN
-Vietnam.
+Viet Nam.
 @item VU
 Vanuatu.
 @item WF
 Wallis and Futuna.
 @item WS
-Samoa (Western).
+Samoa.
 @item YE
 Yemen.
 @item YT