From ac210ad583cfd938d62ecd269175c1e210a36373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mudr=C3=A1k?= <david@moodle.com>
Date: Thu, 26 Sep 2019 09:14:37 +0200
Subject: [PATCH] MDL-66774 lang: Update the list of countries as per ISO
 3166-1

Source: https://www.iso.org/obp/ui/

Two significant changes are:

* North Macedonia
* Eswatini

All other changes are formal, such as changing the letter case of the
"And" (the current ISO uses the lower case "and").  Our own existing
modifications of the list (such as having just "United States" and
"United Kingdom" instead of the full long name) were kept.
---
 lang/en/countries.php | 64 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/lang/en/countries.php b/lang/en/countries.php
index 2c2e57cbcbd..9b206cd0997 100644
--- a/lang/en/countries.php
+++ b/lang/en/countries.php
@@ -25,7 +25,7 @@
 $string['AD'] = 'Andorra';
 $string['AE'] = 'United Arab Emirates';
 $string['AF'] = 'Afghanistan';
-$string['AG'] = 'Antigua And Barbuda';
+$string['AG'] = 'Antigua and Barbuda';
 $string['AI'] = 'Anguilla';
 $string['AL'] = 'Albania';
 $string['AM'] = 'Armenia';
@@ -38,7 +38,7 @@ $string['AU'] = 'Australia';
 $string['AW'] = 'Aruba';
 $string['AX'] = 'Åland Islands';
 $string['AZ'] = 'Azerbaijan';
-$string['BA'] = 'Bosnia And Herzegovina';
+$string['BA'] = 'Bosnia and Herzegovina';
 $string['BB'] = 'Barbados';
 $string['BD'] = 'Bangladesh';
 $string['BE'] = 'Belgium';
@@ -50,8 +50,8 @@ $string['BJ'] = 'Benin';
 $string['BL'] = 'Saint Barthélemy';
 $string['BM'] = 'Bermuda';
 $string['BN'] = 'Brunei Darussalam';
-$string['BO'] = 'Bolivia, Plurinational State Of';
-$string['BQ'] = 'Bonaire, Sint Eustatius And Saba';
+$string['BO'] = 'Bolivia (Plurinational State of)';
+$string['BQ'] = 'Bonaire, Sint Eustatius and Saba';
 $string['BR'] = 'Brazil';
 $string['BS'] = 'Bahamas';
 $string['BT'] = 'Bhutan';
@@ -61,7 +61,7 @@ $string['BY'] = 'Belarus';
 $string['BZ'] = 'Belize';
 $string['CA'] = 'Canada';
 $string['CC'] = 'Cocos (Keeling) Islands';
-$string['CD'] = 'Congo, The Democratic Republic Of The';
+$string['CD'] = 'Congo (the Democratic Republic of the)';
 $string['CF'] = 'Central African Republic';
 $string['CG'] = 'Congo';
 $string['CH'] = 'Switzerland';
@@ -94,7 +94,7 @@ $string['ET'] = 'Ethiopia';
 $string['FI'] = 'Finland';
 $string['FJ'] = 'Fiji';
 $string['FK'] = 'Falkland Islands (Malvinas)';
-$string['FM'] = 'Micronesia, Federated States Of';
+$string['FM'] = 'Micronesia (Federated States of)';
 $string['FO'] = 'Faroe Islands';
 $string['FR'] = 'France';
 $string['GA'] = 'Gabon';
@@ -111,13 +111,13 @@ $string['GN'] = 'Guinea';
 $string['GP'] = 'Guadeloupe';
 $string['GQ'] = 'Equatorial Guinea';
 $string['GR'] = 'Greece';
-$string['GS'] = 'South Georgia And The South Sandwich Islands';
+$string['GS'] = 'South Georgia and the South Sandwich Islands';
 $string['GT'] = 'Guatemala';
 $string['GU'] = 'Guam';
 $string['GW'] = 'Guinea-Bissau';
 $string['GY'] = 'Guyana';
 $string['HK'] = 'Hong Kong';
-$string['HM'] = 'Heard Island And Mcdonald Islands';
+$string['HM'] = 'Heard Island and McDonald Islands';
 $string['HN'] = 'Honduras';
 $string['HR'] = 'Croatia';
 $string['HT'] = 'Haiti';
@@ -125,11 +125,11 @@ $string['HU'] = 'Hungary';
 $string['ID'] = 'Indonesia';
 $string['IE'] = 'Ireland';
 $string['IL'] = 'Israel';
-$string['IM'] = 'Isle Of Man';
+$string['IM'] = 'Isle of Man';
 $string['IN'] = 'India';
 $string['IO'] = 'British Indian Ocean Territory';
 $string['IQ'] = 'Iraq';
-$string['IR'] = 'Iran, Islamic Republic Of';
+$string['IR'] = 'Iran (Islamic Republic of)';
 $string['IS'] = 'Iceland';
 $string['IT'] = 'Italy';
 $string['JE'] = 'Jersey';
@@ -141,9 +141,9 @@ $string['KG'] = 'Kyrgyzstan';
 $string['KH'] = 'Cambodia';
 $string['KI'] = 'Kiribati';
 $string['KM'] = 'Comoros';
-$string['KN'] = 'Saint Kitts And Nevis';
-$string['KP'] = 'Korea, Democratic People\'s Republic Of';
-$string['KR'] = 'Korea, Republic Of';
+$string['KN'] = 'Saint Kitts and Nevis';
+$string['KP'] = 'Korea (the Democratic People\'s Republic of)';
+$string['KR'] = 'Korea (the Republic of)';
 $string['KW'] = 'Kuwait';
 $string['KY'] = 'Cayman Islands';
 $string['KZ'] = 'Kazakhstan';
@@ -160,12 +160,12 @@ $string['LV'] = 'Latvia';
 $string['LY'] = 'Libya';
 $string['MA'] = 'Morocco';
 $string['MC'] = 'Monaco';
-$string['MD'] = 'Moldova, Republic Of';
+$string['MD'] = 'Moldova (the Republic of)';
 $string['ME'] = 'Montenegro';
-$string['MF'] = 'Saint Martin (French Part)';
+$string['MF'] = 'Saint Martin (French part)';
 $string['MG'] = 'Madagascar';
 $string['MH'] = 'Marshall Islands';
-$string['MK'] = 'Macedonia, The Former Yugoslav Republic Of';
+$string['MK'] = 'North Macedonia';
 $string['ML'] = 'Mali';
 $string['MM'] = 'Myanmar';
 $string['MN'] = 'Mongolia';
@@ -201,10 +201,10 @@ $string['PG'] = 'Papua New Guinea';
 $string['PH'] = 'Philippines';
 $string['PK'] = 'Pakistan';
 $string['PL'] = 'Poland';
-$string['PM'] = 'Saint Pierre And Miquelon';
+$string['PM'] = 'Saint Pierre and Miquelon';
 $string['PN'] = 'Pitcairn';
 $string['PR'] = 'Puerto Rico';
-$string['PS'] = 'Palestine, State Of';
+$string['PS'] = 'Palestine, State of';
 $string['PT'] = 'Portugal';
 $string['PW'] = 'Palau';
 $string['PY'] = 'Paraguay';
@@ -220,9 +220,9 @@ $string['SC'] = 'Seychelles';
 $string['SD'] = 'Sudan';
 $string['SE'] = 'Sweden';
 $string['SG'] = 'Singapore';
-$string['SH'] = 'Saint Helena, Ascension And Tristan Da Cunha';
+$string['SH'] = 'Saint Helena, Ascension and Tristan da Cunha';
 $string['SI'] = 'Slovenia';
-$string['SJ'] = 'Svalbard And Jan Mayen';
+$string['SJ'] = 'Svalbard and Jan Mayen';
 $string['SK'] = 'Slovakia';
 $string['SL'] = 'Sierra Leone';
 $string['SM'] = 'San Marino';
@@ -230,12 +230,12 @@ $string['SN'] = 'Senegal';
 $string['SO'] = 'Somalia';
 $string['SR'] = 'Suriname';
 $string['SS'] = 'South Sudan';
-$string['ST'] = 'Sao Tome And Principe';
+$string['ST'] = 'Sao Tome and Principe';
 $string['SV'] = 'El Salvador';
-$string['SX'] = 'Sint Maarten (Dutch Part)';
+$string['SX'] = 'Sint Maarten (Dutch part)';
 $string['SY'] = 'Syrian Arab Republic';
-$string['SZ'] = 'Swaziland';
-$string['TC'] = 'Turks And Caicos Islands';
+$string['SZ'] = 'Eswatini';
+$string['TC'] = 'Turks and Caicos Islands';
 $string['TD'] = 'Chad';
 $string['TF'] = 'French Southern Territories';
 $string['TG'] = 'Togo';
@@ -247,24 +247,24 @@ $string['TM'] = 'Turkmenistan';
 $string['TN'] = 'Tunisia';
 $string['TO'] = 'Tonga';
 $string['TR'] = 'Turkey';
-$string['TT'] = 'Trinidad And Tobago';
+$string['TT'] = 'Trinidad and Tobago';
 $string['TV'] = 'Tuvalu';
 $string['TW'] = 'Taiwan';
-$string['TZ'] = 'Tanzania, United Republic Of';
+$string['TZ'] = 'Tanzania, the United Republic of';
 $string['UA'] = 'Ukraine';
 $string['UG'] = 'Uganda';
 $string['UM'] = 'United States Minor Outlying Islands';
 $string['US'] = 'United States';
 $string['UY'] = 'Uruguay';
 $string['UZ'] = 'Uzbekistan';
-$string['VA'] = 'Holy See (Vatican City State)';
-$string['VC'] = 'Saint Vincent And The Grenadines';
-$string['VE'] = 'Venezuela, Bolivarian Republic Of';
-$string['VG'] = 'Virgin Islands, British';
-$string['VI'] = 'Virgin Islands, U.S.';
+$string['VA'] = 'Holy See';
+$string['VC'] = 'Saint Vincent and the Grenadines';
+$string['VE'] = 'Venezuela (Bolivarian Republic of)';
+$string['VG'] = 'Virgin Islands (British)';
+$string['VI'] = 'Virgin Islands (U.S.)';
 $string['VN'] = 'Viet Nam';
 $string['VU'] = 'Vanuatu';
-$string['WF'] = 'Wallis And Futuna';
+$string['WF'] = 'Wallis and Futuna';
 $string['WS'] = 'Samoa';
 $string['YE'] = 'Yemen';
 $string['YT'] = 'Mayotte';