misc/31566: Jaap Boender: update African and Asian capitals to the

current situation.

diff --git a/quiz/datfiles/africa b/quiz/datfiles/africa
index 6e7455038c462741fae60caf7f4010303b28ed97..8f629703afb1f46c5bd6790eaffcfc3e04b08546 100644 (file)
--- a/quiz/datfiles/africa
+++ b/quiz/datfiles/africa
@@ -1,43 +1,56 @@
 Algeria:Alg[iers|er]
 Algeria:Alg[iers|er]

-Botswana:Gaberones
+Angola:L{o}uanda
+Benin:Porto[-| ]Novo
+Botswana:Gaborone
+Burkina Faso:Ouagadougou

 Burundi:Bujumbura
 Burundi:Bujumbura

-Cameroun:Yaound['\be|e\b'|e]
+Camero[o|u]n:Yaound['^He|e^H'|e]
+Cape Verde:Praia 

 Central Africa{n Rep{ublic}}:Bangui
 Central Africa{n Rep{ublic}}:Bangui

-Chad:Ndjamena
-Congo:Brazzaville
-Dahomey:Porto Novo
+Chad:[Nd|N'D]jamena
+Comoros:Moroni
+[Ivory Coast|Cote d'Ivoire|Co^H^te d'Ivoire|C^^Hote
++d'Ivoire]:[Yamoussoukro|Abidjan]
+{Democratic Republic of the }Congo:Kinshasa
+Djibouti:Djibouti
+Egypt:Cairo  
+Equatorial Guinea:Malabo
+Eritrea:Asmara

 Ethiopia:Addis Ababa
 Gabon:Libreville
 Ghana:Accra
 Ethiopia:Addis Ababa
 Gabon:Libreville
 Ghana:Accra

+Guinea:Conakry  

 Guinea-Bissau:Bissau
 Guinea-Bissau:Bissau

-Guinea:Conakry
-Ivory Coast:Abidjan

 Kenya:Nairobi
 Lesotho:Maseru
 Liberia:Monrovia
 Kenya:Nairobi
 Lesotho:Maseru
 Liberia:Monrovia

-Libya:Al Bayda{'}
-Malagasy{ Rep{ublic}}|Madagascar:Tananarive
-Malawi:Zomba
+Libya:Tripoli
+Madagascar:Antananarivo
+Malawi:Lilongwe

 Mali:Bamako
 Mauritania:Nouakchott
 Mali:Bamako
 Mauritania:Nouakchott

+Mauritius:Port Louis

 Morocco:Rabat
 Morocco:Rabat

-Mo[z|,\bc|c\b,|c]ambique:Louren[,\bc|c\b,|c]o Marques
+Mo[z|,^Hc|c^H,|c]ambique:Maputo
+Namibia:Windhoek

 Niger:Niamey
 Niger:Niamey

-Nigeria:Lagos
-Rhodesia:Salisbury
+Nigeria:Abuja
+{Republic of the }Congo:Brazzaville

 Rwanda:Kigali
 Rwanda:Kigali

+S[a|~^Ha|a^H~]o Tom[e|'^He|e^H'] and Principe:S[a|~^Ha|a^H~]o Tom[e|'^He|e^H']  

 Senegal:Dakar
 Senegal:Dakar

+Seychelles:Victoria

 Sierra Leone:Freetown
 Sierra Leone:Freetown

-Somali{ Rep{ublic}}:Mogadis[cio|hu]
+Somalia:Mogadis[hu|cio]
+South Africa:Pretoria

 Sudan:Khartoum
 Swaziland:Mbabane
 Sudan:Khartoum
 Swaziland:Mbabane

-Tanzania:Dar es Salaam
-Togo:Lom['\be|e\b'|e]
+Tanzania:Dar[ |-]es[ |-]Salaam
+{The }Gambia:Banjul
+Togo:Lom['^He|e^H'|e]

 Tunisia:Tunis
 Uganda:Kampala
 Tunisia:Tunis
 Uganda:Kampala

-United Arab Rep{ublic}|Egypt:Cairo
-Upper Volta:Ouagadougou
+Western Sahara:[El Aajun|El Aaj'^Hun|El
++Aaju^H'n|Laanyoune|La"^Hanyoune|Laa^H"nyoune]

 Zambia:Lusaka
 Zambia:Lusaka

-Za["\bi|i\b"|i]re:Kinshasha
-{Rep{ublic} of }South Africa:Pretoria
-{The }Gambia:Bathurst
+Zimbabwe:Harare

diff --git a/quiz/datfiles/asia b/quiz/datfiles/asia
index 75250855fe85bc6c05564c1e5f8731add5e19c88..dca59fa2341c8e3749f8b4ecb7b8e9ed9f48d740 100644 (file)
--- a/quiz/datfiles/asia
+++ b/quiz/datfiles/asia
@@ -1,11 +1,15 @@
 Afghanistan:Kabul
 Afghanistan:Kabul

+Armenia:Yerevan

 Australia:Canberra
 Australia:Canberra

-Bahrein:Manama
+Azerbaijan:Baku 
+Bahrain:Manama

 Bangladesh:Dacca
 Bhutan:Thimbu
 Bangladesh:Dacca
 Bhutan:Thimbu

-Burma:Rangoon
-Cambodia|Khmer:P{h}nom Penh
+Brunei:Bandar Seri Begawan
+Cambodia:P{h}nom Penh

 China:Peking
 China:Peking

+Cyprus:Nicosia 
+Georgia:Tbilisi

 India:New Delhi
 Indonesia:Jakarta|Djakarta
 Iran:Tehran
 India:New Delhi
 Indonesia:Jakarta|Djakarta
 Iran:Tehran


@@ -13,28 +17,33 @@ Iraq:Baghdad
 Israel:Jerusalem
 Japan:Tokyo
 Jordan:Amman
 Israel:Jerusalem
 Japan:Tokyo
 Jordan:Amman

+Kazakhstan:Astana
+Kyrgyzstan:Bishkek

 Kuwait:Al-kuwait
 Laos:Vientiane
 Lebanon:Beirut
 Malaysia:Kuala Lumpur
 Kuwait:Al-kuwait
 Laos:Vientiane
 Lebanon:Beirut
 Malaysia:Kuala Lumpur

-Maldive Islands:Male
-Mongolia:Ulan Bator
+Maldiv{e Island}s:Male
+Mongolia:Ulaanbataar|Ulan Bator
+Myanmar|Burma:Yangon|Rangoon

 Nepal:Katmandu
 North Korea:P{'}yongyang
 Nepal:Katmandu
 North Korea:P{'}yongyang

-North Yemen:San{'}a

 Oman:Muscat
 Pakistan:Islamabad
 Papua[-| ]New Guinea:Port Moresby
 Philippines:Manila
 Qatar:Doha
 Oman:Muscat
 Pakistan:Islamabad
 Papua[-| ]New Guinea:Port Moresby
 Philippines:Manila
 Qatar:Doha

-Saudi Arabia:Riyadh|J{ei}ddah
+Saudi Arabia:Riyadh

 Singapore:Singapore
 South Korea:Seoul
 Singapore:Singapore
 South Korea:Seoul

-South Yemen:Aden
-Sri Lanka:Colombo
+Sri Lanka:[Kotte|Sri Jayewardenepura]

 Syria:Damascus
 Syria:Damascus

+Tajikistan:Dushanbe

 Taiwan:Taipei
 Thailand:Bangkok
 Turkey:Ankara
 Taiwan:Taipei
 Thailand:Bangkok
 Turkey:Ankara

+Turkmenistan:Ashqabat

 United Arab Emirates:Abu Dhabi
 United Arab Emirates:Abu Dhabi

+Uzbekistan:Tashkent

 Vietnam:Hanoi
 Vietnam:Hanoi

+Yemen:Sana'a