1
0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00

update countres and capitals in quiz(6)

Changes:
- update country and capital names that have changed in recent years
- remove the formal prefix from South Africa for consistency with other
  country names
- add additional capitals for countries with multiple capitals
- add "The" as optional prefix for The Gambia and The Bahamas
- add missing suffix "City" to a few capitals
- add many missing countries

NetBSD appears to have also added territories which I've not added in this
update.

The removal of The Hague for The Netherlands was taken from NetBSD and
confirmed by otto@

The duplicate Turkey and Georgia entries have not been touched.

Prompted by a diff by Ben Fuller, who also provided much helpful feedback.
This commit is contained in:
daniel 2022-07-06 02:09:05 +00:00
parent 8f48bc460a
commit 0fde2ccbdd
4 changed files with 45 additions and 23 deletions

View File

@ -1,9 +1,9 @@
Algeria:Alg[iers|er] Algeria:Alg[iers|er]
Angola:Luanda Angola:Luanda
Benin|Dahomey:Porto[-| ]Novo Benin:Porto[-| ]Novo
Botswana:Gaborone Botswana:Gaborone
Burkina Faso:Ouagadougou Burkina Faso:Ouagadougou
Burundi:Bujumbura Burundi:Gitega|Bujumbura
Camero[o|u]n:Yaounde Camero[o|u]n:Yaounde
[Cabo|Cape] Verde:Praia [Cabo|Cape] Verde:Praia
Central Africa{n Rep{ublic}}:Bangui Central Africa{n Rep{ublic}}:Bangui
@ -16,9 +16,10 @@ Djibouti:Djibouti City
Egypt:Cairo Egypt:Cairo
Equatorial Guinea:Malabo Equatorial Guinea:Malabo
Eritrea:Asmara Eritrea:Asmara
Eswatini|Swaziland:Mbabane|Lobamba
Ethiopia:Addis Ababa Ethiopia:Addis Ababa
Gabon:Libreville Gabon:Libreville
Gambia:Banjul {The }Gambia:Banjul
Ghana:Accra Ghana:Accra
Guinea-Bissau:Bissau Guinea-Bissau:Bissau
Guinea:Conakry Guinea:Conakry
@ -42,10 +43,9 @@ Senegal:Dakar
Seychelles:Victoria Seychelles:Victoria
Sierra Leone:Freetown Sierra Leone:Freetown
Somalia:Mogadishu Somalia:Mogadishu
{Rep{ublic} of }South Africa:Pretoria South Africa:Pretoria|Cape Town|Bloemfontein
South Sudan:Juba South Sudan:Juba
Sudan:Khartoum Sudan:Khartoum
Swaziland:Mbabane
Tanzania:Dodoma Tanzania:Dodoma
Togo:Lome Togo:Lome
Tunisia:Tunis Tunisia:Tunis

View File

@ -1,6 +1,8 @@
Antigua and Barbuda:St. John's
Argentina:Buenos Aires Argentina:Buenos Aires
Bahamas:Nassau {The }Bahamas:Nassau
Barbados:Bridgetown Barbados:Bridgetown
Belize:Belmopan
Bolivia:La Paz|Sucre Bolivia:La Paz|Sucre
Bra[z|s]il:Brasilia Bra[z|s]il:Brasilia
Canada:Ottawa Canada:Ottawa
@ -8,19 +10,25 @@ Chile:Santiago
Colombia:Bogota Colombia:Bogota
Costa Rica:San Jose Costa Rica:San Jose
Cuba:Ha[v|b]ana Cuba:Ha[v|b]ana
Dominica:Roseau
Dominican Republic:Santo Domingo Dominican Republic:Santo Domingo
Ecuador:Quito Ecuador:Quito
El Salvador:San Salvador El Salvador:San Salvador
Guatemala:Guatemala Grenada:St. George's
Guatemala:Guatemala City
Guyana:Georgetown Guyana:Georgetown
Haiti:Port au Prince Haiti:Port[-| ]au[-| ]Prince
Honduras:Tegucigalpa Honduras:Tegucigalpa
Jamaica:Kingston Jamaica:Kingston
Mexico:Mexico Mexico:Mexico City
Nicaragua:Managua Nicaragua:Managua
Panama:Panama Panama:Panama City
Paraguay:Asuncion Paraguay:Asuncion
Peru:Lima Peru:Lima
Saint Lucia:Castries
Saint Kitts and Nevis:Basseterre
Saint Vincent and the Grenadines:Kingstown
Suriname:Paramaribo
Trinidad{ and Tobago}:Port of Spain Trinidad{ and Tobago}:Port of Spain
United States|US{A}:Washington United States|US{A}:Washington
Uruguay:Montevideo Uruguay:Montevideo

View File

@ -3,13 +3,14 @@ Armenia:Yerevan
Australia:Canberra Australia:Canberra
Azerbaijan:Baku Azerbaijan:Baku
Bahrain:Manama Bahrain:Manama
Bangladesh:Dacca Bangladesh:Dhaka|Dacca
Bhutan:Thim[b|ph]u Bhutan:Thim[b|ph]u
Brunei:Bandar Seri Begawan Brunei:Bandar Seri Begawan
Cambodia:P{h}nom Penh Cambodia:P{h}nom Penh
China:Beijing|Peking China:Beijing|Peking
Cyprus:Nicosia Cyprus:Nicosia
East Timor:Dili East Timor|Timor-Leste:Dili
Fiji:Suva
Georgia:Tbilisi Georgia:Tbilisi
India:New Delhi India:New Delhi
Indonesia:Jakarta|Djakarta Indonesia:Jakarta|Djakarta
@ -18,32 +19,44 @@ Iraq:Baghdad
Israel:Jerusalem Israel:Jerusalem
Japan:Tokyo Japan:Tokyo
Jordan:Amman Jordan:Amman
Kazakhstan:Astana Kazakhstan:Nur-Sultan|Astana
Kiribati:South Tarawa
Kuwait:Al-Kuwait|Kuwait City Kuwait:Al-Kuwait|Kuwait City
Kyrgyzstan:Bishkek Kyrgyzstan:Bishkek
Laos:Vientiane Laos:Vientiane
Lebanon:Beirut Lebanon:Beirut
Malaysia:Kuala Lumpur Malaysia:Kuala Lumpur|Putrajaya
Maldive Islands:Male Maldive{ Island}s:Male
Marshall Islands:Delap[-| ]Uliga[-| ]Djarrit
Micronesia:Palikir
Mongolia:Ulaanbaatar|Ulan Bator Mongolia:Ulaanbaatar|Ulan Bator
Myanmar|Burma:Naypyidaw|Nay Pyi Taw Myanmar|Burma:Naypyidaw|Nay Pyi Taw
Nauru:Yaren
Nepal:Kat{h}mandu Nepal:Kat{h}mandu
New Zealand:Wellington
North Korea:P{'}yongyang North Korea:P{'}yongyang
Oman:Muscat Oman:Muscat
Pakistan:Islamabad Pakistan:Islamabad
Palau:Ngerulmud
Papua[-| ]New Guinea:Port Moresby Papua[-| ]New Guinea:Port Moresby
Philippines:Manila Philippines:Manila
Qatar:Doha Qatar:Doha
Samoa:Apia
Saudi Arabia:Riyadh Saudi Arabia:Riyadh
Singapore:Singapore Singapore:Singapore
Solomon Islands:Honiara
South Korea:Seoul South Korea:Seoul
Sri Lanka:Colombo Sri Lanka:Colombo|{Sri Jayawardenepura }Kotte
Syria:Damascus Syria:Damascus
Taiwan:Taipei Taiwan:Taipei
Tajikistan:Dushanbe
Thailand:Bangkok Thailand:Bangkok
Tonga:Nuku{'}alofa
Turkey:Ankara Turkey:Ankara
Turkmenistan:Ashgabat Turkmenistan:Ashgabat
United Arab Emirates:Abu Dhabi Tuvalu:Funafuti
[United Arab Emirates|UAE]:Abu Dhabi
Uzbekistan:Tashkent Uzbekistan:Tashkent
Vanuatu:Port Vila
Vietnam:Hanoi Vietnam:Hanoi
Yemen:San{'}a Yemen:San{'}a

View File

@ -3,7 +3,7 @@ Andorra:Andorra la V[ell|iej]a
Austria:Vienna|Wien Austria:Vienna|Wien
Belarus|Byelorussia:M[i|e]nsk Belarus|Byelorussia:M[i|e]nsk
Belgium:Brussel[s|]|Bruxelles Belgium:Brussel[s|]|Bruxelles
Bosnia[-Herzegovina|]:Sarajevo Bosnia{[ and |-]Herzegovina}:Sarajevo
Bulgaria:Sofi[a|ya] Bulgaria:Sofi[a|ya]
Croatia:Zagreb Croatia:Zagreb
Czech Republic:Prague|Praha Czech Republic:Prague|Praha
@ -23,22 +23,23 @@ Latvia:Riga
Liechtenstein:Vaduz Liechtenstein:Vaduz
Lithuania:Vilnius Lithuania:Vilnius
Luxembourg:Luxembourg Luxembourg:Luxembourg
[|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
Malta:Valletta Malta:Valletta
Moldova:Chisinau|Kishinev Moldova:Chisinau|Kishinev
Monaco:Monaco Monaco:Monaco
Netherlands|Holland:The Hague|'sGravenhage|den Haag|Amsterdam Montenegro:Podgori[ca|tsa]
Netherlands|Holland:Amsterdam
North Macedonia:Skop[|l]je
Norway:Oslo Norway:Oslo
Poland:Wars[aw|zawa] Poland:Wars[aw|zawa]
Portugal:Lisbo[n|a] Portugal:Lisbo[n|a]
R[u|o]mania:Bucharest|Bucuresti Romania:Bucharest|Bucuresti
Russia:Mos[cow|kva] Russia:Mos[cow|kva]
San Marino:San Marino San Marino:San Marino
Serbia:Belgrade|Beograd
Slovakia|Slovak Republic:Bratislava Slovakia|Slovak Republic:Bratislava
Slovenia:Ljubljana Slovenia:Ljubljana
Spain:Madrid Spain:Madrid
Sweden:Stockholm Sweden:Stockholm
Switzerland:Bern{e} Switzerland:Bern{e}
Turkey:Ankara Turkey:Ankara
Ukraine:Kiev|Kyiv Ukraine:Kyiv|Kiev
Yugoslavia:Belgrade|Beograd