4 files changed, 45 insertions, 23 deletions

diff --git a/games/quiz/datfiles/africa b/games/quiz/datfiles/africa
index e713d968cf8..13227d4b638 100644
--- a/games/quiz/datfiles/africa
+++ b/games/quiz/datfiles/africa
@@ -1,9 +1,9 @@
 Algeria:Alg[iers|er]
 Angola:Luanda
-Benin|Dahomey:Porto[-| ]Novo
+Benin:Porto[-| ]Novo
 Botswana:Gaborone
 Burkina Faso:Ouagadougou
-Burundi:Bujumbura
+Burundi:Gitega|Bujumbura
 Camero[o|u]n:Yaounde
 [Cabo|Cape] Verde:Praia
 Central Africa{n Rep{ublic}}:Bangui
@@ -16,9 +16,10 @@ Djibouti:Djibouti City
 Egypt:Cairo
 Equatorial Guinea:Malabo
 Eritrea:Asmara
+Eswatini|Swaziland:Mbabane|Lobamba
 Ethiopia:Addis Ababa
 Gabon:Libreville
-Gambia:Banjul
+{The }Gambia:Banjul
 Ghana:Accra
 Guinea-Bissau:Bissau
 Guinea:Conakry
@@ -42,10 +43,9 @@ Senegal:Dakar
 Seychelles:Victoria
 Sierra Leone:Freetown
 Somalia:Mogadishu
-{Rep{ublic} of }South Africa:Pretoria
+South Africa:Pretoria|Cape Town|Bloemfontein
 South Sudan:Juba
 Sudan:Khartoum
-Swaziland:Mbabane
 Tanzania:Dodoma
 Togo:Lome
 Tunisia:Tunis
diff --git a/games/quiz/datfiles/america b/games/quiz/datfiles/america
index a4f121815b1..f7d6be9f1f6 100644
--- a/games/quiz/datfiles/america
+++ b/games/quiz/datfiles/america
@@ -1,6 +1,8 @@
+Antigua and Barbuda:St. John's
 Argentina:Buenos Aires
-Bahamas:Nassau
+{The }Bahamas:Nassau
 Barbados:Bridgetown
+Belize:Belmopan
 Bolivia:La Paz|Sucre
 Bra[z|s]il:Brasilia
 Canada:Ottawa
@@ -8,19 +10,25 @@ Chile:Santiago
 Colombia:Bogota
 Costa Rica:San Jose
 Cuba:Ha[v|b]ana
+Dominica:Roseau
 Dominican Republic:Santo Domingo
 Ecuador:Quito
 El Salvador:San Salvador
-Guatemala:Guatemala
+Grenada:St. George's
+Guatemala:Guatemala City
 Guyana:Georgetown
-Haiti:Port au Prince
+Haiti:Port[-| ]au[-| ]Prince
 Honduras:Tegucigalpa
 Jamaica:Kingston
-Mexico:Mexico
+Mexico:Mexico City
 Nicaragua:Managua
-Panama:Panama
+Panama:Panama City
 Paraguay:Asuncion
 Peru:Lima
+Saint Lucia:Castries
+Saint Kitts and Nevis:Basseterre
+Saint Vincent and the Grenadines:Kingstown
+Suriname:Paramaribo
 Trinidad{ and Tobago}:Port of Spain
 United States|US{A}:Washington
 Uruguay:Montevideo
diff --git a/games/quiz/datfiles/asia b/games/quiz/datfiles/asia
index c2ddab8eb4c..53b90266016 100644
--- a/games/quiz/datfiles/asia
+++ b/games/quiz/datfiles/asia
@@ -3,13 +3,14 @@ Armenia:Yerevan
 Australia:Canberra
 Azerbaijan:Baku
 Bahrain:Manama
-Bangladesh:Dacca
+Bangladesh:Dhaka|Dacca
 Bhutan:Thim[b|ph]u
 Brunei:Bandar Seri Begawan
 Cambodia:P{h}nom Penh
 China:Beijing|Peking
 Cyprus:Nicosia
-East Timor:Dili
+East Timor|Timor-Leste:Dili
+Fiji:Suva
 Georgia:Tbilisi
 India:New Delhi
 Indonesia:Jakarta|Djakarta
@@ -18,32 +19,44 @@ Iraq:Baghdad
 Israel:Jerusalem
 Japan:Tokyo
 Jordan:Amman
-Kazakhstan:Astana
+Kazakhstan:Nur-Sultan|Astana
+Kiribati:South Tarawa
 Kuwait:Al-Kuwait|Kuwait City
 Kyrgyzstan:Bishkek
 Laos:Vientiane
 Lebanon:Beirut
-Malaysia:Kuala Lumpur
-Maldive Islands:Male
+Malaysia:Kuala Lumpur|Putrajaya
+Maldive{ Island}s:Male
+Marshall Islands:Delap[-| ]Uliga[-| ]Djarrit
+Micronesia:Palikir
 Mongolia:Ulaanbaatar|Ulan Bator
 Myanmar|Burma:Naypyidaw|Nay Pyi Taw
+Nauru:Yaren
 Nepal:Kat{h}mandu
+New Zealand:Wellington
 North Korea:P{'}yongyang
 Oman:Muscat
 Pakistan:Islamabad
+Palau:Ngerulmud
 Papua[-| ]New Guinea:Port Moresby
 Philippines:Manila
 Qatar:Doha
+Samoa:Apia
 Saudi Arabia:Riyadh
 Singapore:Singapore
+Solomon Islands:Honiara
 South Korea:Seoul
-Sri Lanka:Colombo
+Sri Lanka:Colombo|{Sri Jayawardenepura }Kotte
 Syria:Damascus
 Taiwan:Taipei
+Tajikistan:Dushanbe
 Thailand:Bangkok
+Tonga:Nuku{'}alofa
 Turkey:Ankara
 Turkmenistan:Ashgabat
-United Arab Emirates:Abu Dhabi
+Tuvalu:Funafuti
+[United Arab Emirates|UAE]:Abu Dhabi
 Uzbekistan:Tashkent
+Vanuatu:Port Vila
 Vietnam:Hanoi
 Yemen:San{'}a
diff --git a/games/quiz/datfiles/europe b/games/quiz/datfiles/europe
index 83af7320713..9653ed89736 100644
--- a/games/quiz/datfiles/europe
+++ b/games/quiz/datfiles/europe
@@ -3,7 +3,7 @@ Andorra:Andorra la V[ell|iej]a
 Austria:Vienna|Wien
 Belarus|Byelorussia:M[i|e]nsk
 Belgium:Brussel[s|]|Bruxelles
-Bosnia[-Herzegovina|]:Sarajevo
+Bosnia{[ and |-]Herzegovina}:Sarajevo
 Bulgaria:Sofi[a|ya]
 Croatia:Zagreb
 Czech Republic:Prague|Praha
@@ -23,22 +23,23 @@ Latvia:Riga
 Liechtenstein:Vaduz
 Lithuania:Vilnius
 Luxembourg:Luxembourg
-[|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
 Malta:Valletta
 Moldova:Chisinau|Kishinev
 Monaco:Monaco
-Netherlands|Holland:The Hague|'sGravenhage|den Haag|Amsterdam
+Montenegro:Podgori[ca|tsa]
+Netherlands|Holland:Amsterdam
+North Macedonia:Skop[|l]je
 Norway:Oslo
 Poland:Wars[aw|zawa]
 Portugal:Lisbo[n|a]
-R[u|o]mania:Bucharest|Bucuresti
+Romania:Bucharest|Bucuresti
 Russia:Mos[cow|kva]
 San Marino:San Marino
+Serbia:Belgrade|Beograd
 Slovakia|Slovak Republic:Bratislava
 Slovenia:Ljubljana
 Spain:Madrid
 Sweden:Stockholm
 Switzerland:Bern{e}
 Turkey:Ankara
-Ukraine:Kiev|Kyiv
-Yugoslavia:Belgrade|Beograd
+Ukraine:Kyiv|Kiev