From: Tobias Quathamer Date: Thu, 16 Feb 2012 11:26:50 +0100 Subject: quiz: Update presidents, capitals, fix typos in murders, poetry --- quiz/datfiles/africa | 51 ++++++++++++++++++++++++++++++++------------------- quiz/datfiles/america | 45 ++++++++++++++++++++++++++++++++++++--------- quiz/datfiles/asia | 40 +++++++++++++++++++++++++--------------- quiz/datfiles/europe | 44 ++++++++++++++++++++++++++++++-------------- quiz/datfiles/murders | 2 +- quiz/datfiles/poetry | 2 +- quiz/datfiles/pres | 6 ++++-- 7 files changed, 129 insertions(+), 61 deletions(-) diff --git a/quiz/datfiles/africa b/quiz/datfiles/africa index 6e74550..a2eeeaf 100644 --- a/quiz/datfiles/africa +++ b/quiz/datfiles/africa @@ -1,43 +1,56 @@ -Algeria:Alg[iers|er] -Botswana:Gaberones +Algeria:Algiers +Angola:Luanda +Benin:Porto-Novo +Botswana:Gaborone +Burkina Faso:Ouagadougou Burundi:Bujumbura -Cameroun:Yaound['e|e'|e] +C[^o|o^|o]te d'Ivoire:Yamoussoukro +Cameroon:Yaound['e|e'|e] +Cape Verde:Praia Central Africa{n Rep{ublic}}:Bangui -Chad:Ndjamena -Congo:Brazzaville -Dahomey:Porto Novo +Chad:N'Djamena|Ndjamena +Comoros:Moroni +Djibouti:Djibouti +Egypt:Cairo +Equatorial Guinea:Malabo +Eritrea:Asmara Ethiopia:Addis Ababa Gabon:Libreville Ghana:Accra Guinea-Bissau:Bissau Guinea:Conakry -Ivory Coast:Abidjan Kenya:Nairobi Lesotho:Maseru Liberia:Monrovia -Libya:Al Bayda{'} -Malagasy{ Rep{ublic}}|Madagascar:Tananarive -Malawi:Zomba +Libya:Tripoli +Malagasy{ Rep{ublic}}|Madagascar:Antananarivo +Malawi:Lilongwe Mali:Bamako Mauritania:Nouakchott +Mauritius:Port Louis +Mayotte:Mamoudzou +Mo[z|,c|c,|c]ambique:Maputo Morocco:Rabat -Mo[z|,c|c,|c]ambique:Louren[,c|c,|c]o Marques +Namibia:Windhoek Niger:Niamey -Nigeria:Lagos -Rhodesia:Salisbury +Nigeria:Abuja +R['e|e'|e]union:Saint-Denis +Rep. Congo:Brazzaville Rwanda:Kigali +S[~a|a~|a]o Tom['e|e'|e] and Pr['i|i'|i]ncipe:S[~a|a~|a]o Tom['e|e'|e] +Saint Helena:Jamestown Senegal:Dakar +Seychelles:Victoria Sierra Leone:Freetown -Somali{ Rep{ublic}}:Mogadis[cio|hu] +Somalia:Mogadishu Sudan:Khartoum Swaziland:Mbabane -Tanzania:Dar es Salaam +Tanzania:Dodoma Togo:Lom['e|e'|e] Tunisia:Tunis Uganda:Kampala -United Arab Rep{ublic}|Egypt:Cairo -Upper Volta:Ouagadougou Zambia:Lusaka -Za["i|i"|i]re:Kinshasha +Zimbabwe:Harare +{DR |Democratic Republic of the }Congo:Kinshasa {Rep{ublic} of }South Africa:Pretoria -{The }Gambia:Bathurst +{The }Gambia:Banjul|Bathurst diff --git a/quiz/datfiles/america b/quiz/datfiles/america index 7f8fee1..5c9e321 100644 --- a/quiz/datfiles/america +++ b/quiz/datfiles/america @@ -1,27 +1,54 @@ +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 +Bra[z|s]il:Bras['i|i'|i]lia +British Virgin Islands:Road Town 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 -United States|US{A}:Washington +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 +United States Virgin Islands:Charlotte Amalie +United States|US{A}:Washington{ DC} Uruguay:Montevideo Venezuela:Caracas +{The }Bahamas:Nassau diff --git a/quiz/datfiles/asia b/quiz/datfiles/asia index b9449f4..8c8ee55 100644 --- a/quiz/datfiles/asia +++ b/quiz/datfiles/asia @@ -1,12 +1,16 @@ Afghanistan:Kabul +Armenia:Yerevan Australia:Canberra -Bahrein:Manama -Bangladesh:Dacca -Bhutan:Thimbu -Burma:Rangoon -Cambodia|Khmer:P{h}nom Penh -China:Peking +Azerbaijan:Baku +Bahr[a|e]in:Manama +Bangladesh:Dhaka +Bhutan:Thimphu +Burma:Naypyidaw +Cambodia:Phnom Penh Cyprus:Nicosia +East Timor:Dili +Egypt:Cairo +Georgia:Tbilisi India:New Delhi Indonesia:Jakarta|Djakarta Iran:Tehran @@ -14,28 +18,34 @@ Iraq:Baghdad Israel:Jerusalem Japan:Tokyo Jordan:Amman -Kuwait:Al-kuwait +Kazakhstan:Astana +Kuwait:Kuwait City +Kyrgyzstan:Bishkek Laos:Vientiane Lebanon:Beirut Malaysia:Kuala Lumpur -Maldive Islands:Male +Maldives:Mal['e|e'|e] Mongolia:Ulan Bator -Nepal:Katmandu +Nepal:Kathmandu North Korea:P{'}yongyang -North Yemen:San{'}a Oman:Muscat Pakistan:Islamabad -Papua[-| ]New Guinea:Port Moresby +Papua New Guinea:Port Moresby Philippines:Manila Qatar:Doha -Saudi Arabia:Riyadh|J{ei}ddah +Russia:Moscow +Saudi Arabia:Riyadh Singapore:Singapore South Korea:Seoul -South Yemen:Aden -Sri Lanka:Colombo +Sri Lanka:Kotte Syria:Damascus Taiwan:Taipei +Tajikistan:Dushanbe Thailand:Bangkok Turkey:Ankara -United Arab Emirates:Abu Dhabi +Turkmenistan:Ashgabat +United Arab Emirates|UAE:Abu Dhabi +Uzbekistan:Tashkent Vietnam:Hanoi +{Republic of }Yemen:Sana'a +{{People's }Republic of }China:Beijing|Peking diff --git a/quiz/datfiles/europe b/quiz/datfiles/europe index 91176e5..d089f41 100644 --- a/quiz/datfiles/europe +++ b/quiz/datfiles/europe @@ -1,44 +1,60 @@ -Albania:Tirana|Tirane" +Abkhazia:Sukhumi +Albania:Tirana Andorra:Andorra la V[ell|iej]a +Armenia:Yerevan Austria:Vienna|Wien -Belarus|Byelorussia:M[i|e]nsk -Belgium:Brussel[s|]|Bruxelles -Bosnia[-Herzegovina|]:Sarajevo -Bulgaria:Sofi[a|ya] +Azerbaijan:Baku +Belarus:Minsk +Belgium:Brussel{s}|Bruxelles +Bosnia and Herzegovina:Sarajevo +Bulgaria:Sofia Croatia:Zagreb +Cyprus:Nicosia Czech Republic:Prague|Praha -Denmark:Copenhagen|K[o|o/]benhavn -United Kingdom|England|Great Britain|UK:London +Denmark:Copenhagen|K[o|o/|/o]benhavn Estonia:Tallinn +Faroe Islands:T['o|o'|o]rshavn Finland:Helsinki France:Paris Georgia:Tbilisi Germany:Berlin +Gibraltar:Gibraltar Greece:Athens +Guernsey:Saint Peter Port Hungary:Budapest -Iceland:Reykjavik +Iceland:Reykjav['i|i'|i]k 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 +Macedonia:Skopje Malta:Valletta -Moldova:Chisinau|Kishinev +Moldova:Chi[,s|s,|s]inau|Kishinev Monaco:Monaco -Netherlands|Holland:Amsterdam +Montenegro:Podgorica +Netherlands:Amsterdam Norway:Oslo Poland:Wars[aw|zawa] Portugal:Lisbo[n|a] -R[u|o]mania:Bucharest|Bucuresti +Romania:Bucharest Russia:Mos[cow|kva] San Marino:San Marino -Serbia and Montenegro:Belgrade|Beograd -Slovakia|Slovak Republic:Bratislava +Serbia:Belgrade +Slovakia:Bratislava Slovenia:Ljubljana +South Ossetia:Tskhinvali Spain:Madrid +Svalbard:Longyearbyen Sweden:Stockholm Switzerland:Bern{e} Turkey:Ankara Ukraine:Kiev|Kyiv +United Kingdom|England|Great Britain|UK:London +Vatican City:Vatican City +[°A|A°|A]land Islands:Mariehamn diff --git a/quiz/datfiles/murders b/quiz/datfiles/murders index 30cf324..b1070ce 100644 --- a/quiz/datfiles/murders +++ b/quiz/datfiles/murders @@ -19,7 +19,7 @@ Pompeii:Vesuvius {Yukio }Mishima:{Yukio }Mishima {Alexander }Hamilton:{Aaron }Burr Cleopatra:{the |an }asp -[Ann Boleyn|Catharine Howard]:Henry{ VIII} +[Anne Boleyn|Catharine Howard]:Henry{ VIII} vaudeville:{the }movies|film {the }movies|film:TV|television {the }VA patients:{the }nurses diff --git a/quiz/datfiles/poetry b/quiz/datfiles/poetry index f4c07d6..78d117a 100644 --- a/quiz/datfiles/poetry +++ b/quiz/datfiles/poetry @@ -64,7 +64,7 @@ Drink deep{,} or taste not the Pierian spring{.}:\ {Alexander }Pope The curfew tolls the knell of parting day{,}:\ The lowing herd wind slowly o'er the lea:\ -Elegy{ Written in a Country Church{-| }Yard:\ +Elegy{ Written in a Country Church{-| }Yard}:\ {Thomas }Gray The best laid schemes o' mice an' men gang aft a-gley{,}:\ An{'|d} lea{'|v}e us nought but grief an{'|d} pain for promised joy{.}:\ diff --git a/quiz/datfiles/pres b/quiz/datfiles/pres index 6f81228..4ce5862 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{{,} J{unio}r} -{G{eorge} }{W{alker} }Bush{{,} J{unio}r}: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}: