Use the list of country names from metrics.
git diff is not very helpful for single-line files, so here's what
changed:
< Bolivia, Plurinational State of:BO
> Bolivia:BO
< Brunei Darussalam:BN
> Brunei:BN
< Holy See (Vatican City State):VA
> Vatican City:VA
< Iran, Islamic Republic of:IR
> Iran:IR
< Korea, Democratic People's Republic of:KP
> North Korea:KP
< Lao People's Democratic Republic:LA
> Laos:LA
< Macao:MO
> Macau:MO
< Macedonia, the former Yugoslav Republic of:MK
> Macedonia:MK
< Myanmar:MM
> Burma:MM
< Palestinian Territory, Occupied:PS
> Palestinian Territory:PS
< Pitcairn:PN
> Pitcairn Islands:PN
< Russian Federation:RU
> Russia:RU
< Saint Helena, Ascension and Tristan da Cunha:SH
> Saint Helena:SH
< Saint Barthélemy:BL
> Saint Bartelemey:BL
< Saint Martin (French part):MF
> Saint Martin:MF
< Suritext:SR
> Suriname:SR
< Taiwan, Province of China:TW
> Taiwan:TW
< Timor-Leste:TL
> East Timor:TL
< Venezuela, Bolivarian Republic of:VE
> Venezuela:VE
< Viet Nam:VN
> Vietnam:VN
The following names have not been changed, because they were mainly about
formatting or because there was no equivalent in either country list:
< Åland Islands:AX
> Aland Islands:AX
< Bonaire, Sint Eustatius and Saba:BQ
> Congo, The Democratic Republic of the:CD
< Congo, the Democratic Republic of the:CD
< Côte d'Ivoire:CI
> Côte d'Ivoire:CI
< Curaçao:CW
> France, Metropolitan:FX
> Netherlands Antilles:AN
< Réunion:RE
> Reunion:RE
< Sao Tome and Principe:ST
> São Tomé and Príncipe:ST
< Sint Maarten (Dutch part):SX