Module Name: src
Committed By: pgoyette
Date: Tue Jun 28 00:15:40 UTC 2016
Modified Files:
src/games/quiz/datfiles: africa america asia europe pres
Log Message:
Merge updates from PR bin/42576
XXX Any typos are mine, not those of the PR submitter!
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/games/quiz/datfiles/africa
cvs rdiff -u -r1.1 -r1.2 src/games/quiz/datfiles/america
cvs rdiff -u -r1.4 -r1.5 src/games/quiz/datfiles/asia
cvs rdiff -u -r1.6 -r1.7 src/games/quiz/datfiles/europe
cvs rdiff -u -r1.5 -r1.6 src/games/quiz/datfiles/pres
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/quiz/datfiles/africa
diff -u src/games/quiz/datfiles/africa:1.3 src/games/quiz/datfiles/africa:1.4
--- src/games/quiz/datfiles/africa:1.3 Wed Oct 12 15:33:41 2005
+++ src/games/quiz/datfiles/africa Tue Jun 28 00:15:40 2016
@@ -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
Index: src/games/quiz/datfiles/america
diff -u src/games/quiz/datfiles/america:1.1 src/games/quiz/datfiles/america:1.2
--- src/games/quiz/datfiles/america:1.1 Sun Apr 4 10:49:48 1993
+++ src/games/quiz/datfiles/america Tue Jun 28 00:15:40 2016
@@ -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
Index: src/games/quiz/datfiles/asia
diff -u src/games/quiz/datfiles/asia:1.4 src/games/quiz/datfiles/asia:1.5
--- src/games/quiz/datfiles/asia:1.4 Wed Oct 12 15:14:27 2005
+++ src/games/quiz/datfiles/asia Tue Jun 28 00:15:40 2016
@@ -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
Index: src/games/quiz/datfiles/europe
diff -u src/games/quiz/datfiles/europe:1.6 src/games/quiz/datfiles/europe:1.7
--- src/games/quiz/datfiles/europe:1.6 Mon May 2 15:39:27 2005
+++ src/games/quiz/datfiles/europe Tue Jun 28 00:15:40 2016
@@ -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
Index: src/games/quiz/datfiles/pres
diff -u src/games/quiz/datfiles/pres:1.5 src/games/quiz/datfiles/pres:1.6
--- src/games/quiz/datfiles/pres:1.5 Mon May 2 15:29:59 2005
+++ src/games/quiz/datfiles/pres Tue Jun 28 00:15:40 2016
@@ -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}:
