Merge updates from PR bin/42576

XXX Any typos are mine, not those of the PR submitter!

5 files changed, 66 insertions, 20 deletions

diff --git a/quiz/datfiles/africa b/quiz/datfiles/africa
index 8f214f8a..993c84ae 100644
--- a/quiz/datfiles/africa
+++ b/quiz/datfiles/africa
@@ -44,7 +44,7 @@ Somalia:Mogadis[hu|cio]
 South Africa:Pretoria
 Sudan:Khartoum
 Swaziland:Mbabane
-Tanzania:Dar[ |-]es[ |-]Salaam
+Tanzania:Dodoma
 {The }Gambia:Banjul
 Togo:Lom['^He|e^H'|e]
 Tunisia:Tunis
diff --git a/quiz/datfiles/america b/quiz/datfiles/america
index 7f8fee11..1bc4d758 100644
--- a/quiz/datfiles/america
+++ b/quiz/datfiles/america
@@ -1,27 +1,53 @@
+Anguilla:The Valley
+Antigua and Barbuda:St. John's
 Argentina:Buenos Aires
-Bahamas:Nassau
+Aruba:Oranjestad
 Barbados:Bridgetown
+Belize:Belmopan
+Bermuda:Hamilton
 Bolivia:La Paz|Sucre
 Bra[z|s]il:Brasilia
 Canada:Ottawa
+Cayman Islands:George Town
 Chile:Santiago
 Colombia:Bogot['a|a'|a]
-Costa Rica:San Jose
+Costa Rica:San Jos['e|e'|e]
 Cuba:Ha[v|b]ana
+Dominica:Roseau
 Dominican Republic:Santo Domingo
 Ecuador:Quito
 El Salvador:San Salvador
-Guatemala:Guatemala
+Falkland Islands:Stanley
+French Guiana:Cayenne
+Greenland:Nuuk
+Grenada:St. George's
+Guadeloupe:Basse-Terre
+Guatemala:Guatemala City
 Guyana:Georgetown
-Haiti:Port au Prince
+Haiti:Port[- ]au[-| ]Prince
 Honduras:Tegucigalpa
 Jamaica:Kingston
-Mexico:Mexico
+Martinique:Fort-de-France
+Mexico:Mexico City
+Montserrat:Plymouth|Brades
+Netherlands Antilles:Willemstad
 Nicaragua:Managua
-Panama:Panama
+Panama:Panama City
 Paraguay:Asunci['o|o'|o]n
 Peru:Lima
-Trinidad[ and Tobago|]:Port of Spain
+Puerto Rico:San Juan
+SGSSI|South Georgia and the South Sandwich Islands:Grytviken|King Edward Point
+Saint Barth['e|e'|e]lemy:Gustavia
+Saint Kitts and Nevis:Basseterre
+Saint Lucia:Castries
+Saint Martin:Marigot
+Saint Pierre and Miquelon:Saint-Pierre
+Saint Vincent and the Grenadines:Kingstown
+Suriname:Paramaribo
+Trinidad{ and Tobago}:Port of Spain
+Turks and Caicos Islands:Cockburn Town
+{The }Bahamas:Nassau
+[United States Virgin Islands|US Virgin Islands|USVI]:Charlotte Amalie
 United States|US{A}:Washington
 Uruguay:Montevideo
 Venezuela:Caracas
diff --git a/quiz/datfiles/asia b/quiz/datfiles/asia
index dca59fa2..db0077c6 100644
--- a/quiz/datfiles/asia
+++ b/quiz/datfiles/asia
@@ -7,8 +7,9 @@ Bangladesh:Dacca
 Bhutan:Thimbu
 Brunei:Bandar Seri Begawan
 Cambodia:P{h}nom Penh
-China:Peking
+{{Peoples' }Republic of }China:Peking
 Cyprus:Nicosia 
+East Timor:Dili
 Georgia:Tbilisi
 India:New Delhi
 Indonesia:Jakarta|Djakarta
@@ -18,24 +19,26 @@ Israel:Jerusalem
 Japan:Tokyo
 Jordan:Amman
 Kazakhstan:Astana
+Kuwait:Kuwait City
 Kyrgyzstan:Bishkek
-Kuwait:Al-kuwait
 Laos:Vientiane
 Lebanon:Beirut
 Malaysia:Kuala Lumpur
 Maldiv{e Island}s:Male
 Mongolia:Ulaanbataar|Ulan Bator
-Myanmar|Burma:Yangon|Rangoon
-Nepal:Katmandu
+Myanmar|Burma:Naypyidaw
+Nepal:Kat{h}mandu
 North Korea:P{'}yongyang
 Oman:Muscat
 Pakistan:Islamabad
 Papua[-| ]New Guinea:Port Moresby
 Philippines:Manila
 Qatar:Doha
+Russia:Moscow
 Saudi Arabia:Riyadh
 Singapore:Singapore
 South Korea:Seoul
+[South|Peoples' Democratic Republic of] Yemen:Aden
 Sri Lanka:[Kotte|Sri Jayewardenepura]
 Syria:Damascus
 Tajikistan:Dushanbe
@@ -43,7 +46,7 @@ Taiwan:Taipei
 Thailand:Bangkok
 Turkey:Ankara
 Turkmenistan:Ashqabat
-United Arab Emirates:Abu Dhabi
+[UAE|United Arab Emirates]:Abu Dhabi
 Uzbekistan:Tashkent
 Vietnam:Hanoi
-Yemen:Sana'a
+[North Yemen|Yemen Arab Republic]:Sana'a
diff --git a/quiz/datfiles/europe b/quiz/datfiles/europe
index b36fb498..56f7e3e0 100644
--- a/quiz/datfiles/europe
+++ b/quiz/datfiles/europe
@@ -1,9 +1,13 @@
+Abkhazia:Sukhumi
 Albania:Tirana|Tirane"
+Alland Islands:Mariehamn
 Andorra:Andorra la V[ell|iej]a
+Armenia:Yerevan
 Austria:Vienna|Wien
+Azerbaijan:Baku
 Belarus|Byelorussia:M[i|e]nsk
-Belgium:Brussel[s|]|Bruxelles
-Bosnia[-Herzegovina|]:Sarajevo
+Belgium:Brussel{s}|Bruxelles
+Bosnia{[ and |-]Herzegovina}:Sarajevo
 Bulgaria:Sofi[a|ya]
 Croatia:Zagreb
 Cyprus:Nicosia
@@ -11,23 +15,31 @@ Czech Republic:Prague|Praha
 Denmark:Copenhagen|K[o|o/]benhavn
 United Kingdom|England|Great Britain|UK:London
 Estonia:Tallinn
+Faroe Islands:T[o|o']rshavn
 Finland:Helsinki
 France:Paris
 Georgia:Tbilisi
 Germany:Berlin
+Gibraltar:Gibraltar
 Greece:Athens
+Guernsey:Saint Peter Port
 Hungary:Budapest
 Iceland:Reykjavik
 Ireland|Eire:Dublin
+Isle of Man:Douglas
 Italy:Rom[e|a]
+Jersey:Saint Helier
+Kazakhstan:Astana
+Kosovo:Pristina
 Latvia:Riga
 Liechtenstein:Vaduz
 Lithuania:Vilnius
 Luxembourg:Luxembourg
 [|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
 Malta:Valletta
-Moldova:Chisinau|Kishinev
+Moldova:Chi[s|s,]inau|Kishinev
 Monaco:Monaco
+Montenegro:Podgorica
 Netherlands|Holland:Amsterdam
 Norway:Oslo
 Poland:Wars[aw|zawa]
@@ -35,11 +47,14 @@ Portugal:Lisbo[n|a]
 R[u|o]mania:Bucharest|Bucuresti
 Russia:Mos[cow|kva]
 San Marino:San Marino
-Serbia and Montenegro:Belgrade|Beograd
+Serbia:Belgrade|Beograd
 Slovakia|Slovak Republic:Bratislava
 Slovenia:Ljubljana
+South Ossetia:Tskhinvali
 Spain:Madrid
+Svalbard:Longyearbyen
 Sweden:Stockholm
 Switzerland:Bern{e}
 Turkey:Ankara
 Ukraine:Kiev|Kyiv
+Vatican City:Vatican City
diff --git a/quiz/datfiles/pres b/quiz/datfiles/pres
index e564bb2a..6ae5af3b 100644
--- a/quiz/datfiles/pres
+++ b/quiz/datfiles/pres
@@ -79,5 +79,7 @@
 {J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton
 {W{illiam|m} }{J{efferson} }Clinton:1993-2001:\
 {A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush
-{G{eorge} }{W{alker} }Bush:2001-:\
-{R{ichard} }{B{ruce} }Cheney:
+{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\
+{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II}
+{B{arack} }{H{ussein} }Obama{ II}:2009-:\
+{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}: