summaryrefslogtreecommitdiff
path: root/games/quiz/datfiles
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-11-22 20:06:28 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-11-22 20:06:28 +0000
commit83e4350010e6362f69caeb86aa2d9f83a722cca0 (patch)
treeb888585604157cd2ce1145ea0098842f46a6300b /games/quiz/datfiles
parentea309dfc1d0691c8b35bd5c510d92880f8aa3fc8 (diff)
Update to gravely outdated places to visit, from Jack Szmidt
Diffstat (limited to 'games/quiz/datfiles')
-rw-r--r--games/quiz/datfiles/africa41
-rw-r--r--games/quiz/datfiles/asia24
2 files changed, 42 insertions, 23 deletions
diff --git a/games/quiz/datfiles/africa b/games/quiz/datfiles/africa
index bf0574ece87..1d476a25fa9 100644
--- a/games/quiz/datfiles/africa
+++ b/games/quiz/datfiles/africa
@@ -1,43 +1,54 @@
Algeria:Alg[iers|er]
+Angola:Luanda
Botswana:Gaborone
+Burkina Faso:Ouagadougou
Burundi:Bujumbura
-Cameroun:Yaound['e|e'|e]
+Camero[o|u]n:Yaound['e|e'|e]
+[Cabo|Cape] Verde:Praia
Central Africa{n Rep{ublic}}:Bangui
-Chad:Ndjamena
-Congo:Brazzaville
-Dahomey:Porto Novo
+Chad:N'Djamena
+{Union of the }Comoros:Moroni
+Republic of Congo:Brazzaville
+Democratic Republic of the Congo:Kinshasa
+Djibouti:Djibouti City
+Benin|Dahomey:Porto[-| ]Novo
Ethiopia:Addis Ababa
+Equatorial Guinea:Malabo
+Eritrea:Asmara
Gabon:Libreville
+Gambia:Banjul
Ghana:Accra
Guinea-Bissau:Bissau
Guinea:Conakry
-Ivory Coast:Abidjan
+C[^o|o^|o]te d'Ivoire|Ivory Coast:Yamoussoukro
Kenya:Nairobi
Lesotho:Maseru
Liberia:Monrovia
Libya:Tripoli
-Malagasy{ Rep{ublic}}|Madagascar:Tananarive
+Madagascar:Tananarive
Malawi:Lilongwe
Mali:Bamako
Mauritania:Nouakchott
+Mauritius:Port Louis
Morocco:Rabat
-Mo[z|,c|c,|c]ambique:Louren[,c|c,|c]o Marques
+Mo[z|,c|c,|c]ambique:Maputo
+Namibia:Windhoek
Niger:Niamey
Nigeria:Abuja
-Rhodesia:Salisbury
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]
Senegal:Dakar
+Seychelles:Victoria
Sierra Leone:Freetown
-Somali{ Rep{ublic}}:Mogadis[cio|hu]
+Somalia:Mogadishu
+{Rep{ublic} of }South Africa:Pretoria
+South Sudan:Juba
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
+Egypt:Cairo
Zambia:Lusaka
-Za["i|i"|i]re:Kinshasha
-{Rep{ublic} of }South Africa:Pretoria
-{The }Gambia:Bathurst
+Zimbabwe:Harare
diff --git a/games/quiz/datfiles/asia b/games/quiz/datfiles/asia
index 99d94007350..72141cc8ba1 100644
--- a/games/quiz/datfiles/asia
+++ b/games/quiz/datfiles/asia
@@ -1,11 +1,16 @@
Afghanistan:Kabul
+Armenia:Yerevan
+Azerbaijan:Baku
Australia:Canberra
Bahrain:Manama
Bangladesh:Dacca
-Bhutan:Thimbu
-Burma:Rangoon
+Bhutan:Thim[b|ph]u
+Brunei:Bandar Seri Begawan
+Cambodia:P{h}nom Penh
China:Beijing|Peking
Cyprus:Nicosia
+East Timor:Dili
+Georgia:Tbilisi
India:New Delhi
Indonesia:Jakarta|Djakarta
Iran:Tehran
@@ -13,16 +18,17 @@ Iraq:Baghdad
Israel:Jerusalem
Japan:Tokyo
Jordan:Amman
-Khmer|Cambodia:P{h}nom Penh
-Kuwait:Al-kuwait
+Kazakhstan:Astana
+Kuwait:Al-Kuwait|Kuwait City
+Kyrgyzstan:Bishkek
Laos:Vientiane
Lebanon:Beirut
Malaysia:Kuala Lumpur
Maldive Islands:Male
-Mongolia:Ulan Bator
-Nepal:Katmandu
+Mongolia:Ulaanbaatar|Ulan Bator
+Myanmar|Burma:Naypyidaw|Nay Pyi Taw
+Nepal:Kat{h}mandu
North Korea:P{'}yongyang
-North Yemen:San{'}a
Oman:Muscat
Pakistan:Islamabad
Papua[-| ]New Guinea:Port Moresby
@@ -31,11 +37,13 @@ Qatar:Doha
Saudi Arabia:Riyadh
Singapore:Singapore
South Korea:Seoul
-South Yemen:Aden
Sri Lanka:Colombo
Syria:Damascus
Taiwan:Taipei
Thailand:Bangkok
Turkey:Ankara
+Turkmenistan:Ashgabat
United Arab Emirates:Abu Dhabi
+Uzbekistan:Tashkent
Vietnam:Hanoi
+Yemen:San{'}a