On Sun, 3 Jul 2022, Daniel Dickman wrote:
> On Sat, Jul 2, 2022 at 9:26 PM Ben Fuller <[email protected]> wrote:
> >
> > I noticed Montenegro doesn't have an entry. Presumably this file hasn't
> > been updated since before 2006!
>
> These files could use a big overhaul and are very dated.
>
> In the below, make sure to keep the file sorted.
>
> In the Europe file there are other issues. For example I think
> Macedonia is now North Macedonia, etc.
>
> There are many issues in the other files. For example africa doesn't
> have Eswatini, etc, etc.
>
> Do you want to take a stab at doing a bigger update of the 4 quiz
> files? africa, america, europe, asia?
>
I had some time on my hand and took a stab on this. A few notes:
Added multiple capitals for countries with more than one capital city that
were missing these:
- Eswatini
- South Africa
- Malaysia
- Sri Lanka
Removed duplicate entries:
- Turkey: remove from europe, keep in asia
- Georgia: remove from europe, keep in asia
For the above I followed this wikipedia classification:
https://en.wikipedia.org/wiki/List_of_sovereign_states_and_dependent_territories_by_continent
africa:
- removed Dahomey as the the pre-1975 name for Benin; it's been close to
50 years since the rename.
- updated Swaziland -> Eswatini. I left Swaziland since Eswatini rename
happened in 2018. So going by the Benin example, seems like when we get
closer to 50 years from the rename we can drop the old name
- added "The" as an optional prefix for Gambia
- removed "Republic of" from South Africa for consistency with other
countries which don't generally include the formal prefix as part of the
name.
americas:
- added many missing countries
- added "The" as an optional prefix for Bahamas
- added missing suffix of "City" from many capitals like Guatemala,
Mexico, and Panama
asia:
- added many missing countries in Oceania (like New Zealand, Fiji, etc)
- added UAE in addition to United Arab Emirates
europe:
- added Montenegro
- added Vatican City
- renamed Macedonia to North Macedonia
- Yugoslavia -> Serbia
I also looked at NetBSD a bit and noticed they added a lot of territories
and their capitals, but I decided not to add those in this update.
I also noticed NetBSD removed The Hague as a capital of The Netherlands,
but I disagree with that. Maybe some of the Dutch folks on this mailing
list can weigh in which is right.
anyone want to ok this update?
Index: africa
===================================================================
RCS file: /cvs/src/games/quiz/datfiles/africa,v
retrieving revision 1.5
diff -u -p -u -r1.5 africa
--- africa 2 Dec 2014 12:43:09 -0000 1.5
+++ africa 4 Jul 2022 21:34:34 -0000
@@ -1,6 +1,6 @@
Algeria:Alg[iers|er]
Angola:Luanda
-Benin|Dahomey:Porto[-| ]Novo
+Benin:Porto[-| ]Novo
Botswana:Gaborone
Burkina Faso:Ouagadougou
Burundi:Bujumbura
@@ -16,9 +16,10 @@ Djibouti:Djibouti City
Egypt:Cairo
Equatorial Guinea:Malabo
Eritrea:Asmara
+Eswatini|Swaziland:Mbabane|Lobamba
Ethiopia:Addis Ababa
Gabon:Libreville
-Gambia:Banjul
+{The }Gambia:Banjul
Ghana:Accra
Guinea-Bissau:Bissau
Guinea:Conakry
@@ -42,10 +43,9 @@ Senegal:Dakar
Seychelles:Victoria
Sierra Leone:Freetown
Somalia:Mogadishu
-{Rep{ublic} of }South Africa:Pretoria
+South Africa:Pretoria|Cape Town|Bloemfontein
South Sudan:Juba
Sudan:Khartoum
-Swaziland:Mbabane
Tanzania:Dodoma
Togo:Lome
Tunisia:Tunis
Index: america
===================================================================
RCS file: /cvs/src/games/quiz/datfiles/america,v
retrieving revision 1.2
diff -u -p -u -r1.2 america
--- america 2 Dec 2014 12:43:09 -0000 1.2
+++ america 4 Jul 2022 21:34:34 -0000
@@ -1,6 +1,8 @@
+Antigua and Barbuda:St. John's
Argentina:Buenos Aires
-Bahamas:Nassau
+{The }Bahamas:Nassau
Barbados:Bridgetown
+Belize:Belmopan
Bolivia:La Paz|Sucre
Bra[z|s]il:Brasilia
Canada:Ottawa
@@ -8,19 +10,25 @@ Chile:Santiago
Colombia:Bogota
Costa Rica:San Jose
Cuba:Ha[v|b]ana
+Dominica:Roseau
Dominican Republic:Santo Domingo
Ecuador:Quito
El Salvador:San Salvador
-Guatemala:Guatemala
+Greenland:Nuuk
+Grenada:St. George's
+Guatemala:Guatemala City
Guyana:Georgetown
-Haiti:Port au Prince
+Haiti:Port[-| ]au[-| ]Prince
Honduras:Tegucigalpa
Jamaica:Kingston
-Mexico:Mexico
+Mexico:Mexico City
Nicaragua:Managua
-Panama:Panama
+Panama:Panama City
Paraguay:Asuncion
Peru:Lima
+Saint Lucia:Castries
+Saint Vincent and the Grenadines:Kingstown
+Suriname:Paramaribo
Trinidad{ and Tobago}:Port of Spain
United States|US{A}:Washington
Uruguay:Montevideo
Index: asia
===================================================================
RCS file: /cvs/src/games/quiz/datfiles/asia,v
retrieving revision 1.5
diff -u -p -u -r1.5 asia
--- asia 24 Nov 2014 06:31:50 -0000 1.5
+++ asia 4 Jul 2022 21:34:34 -0000
@@ -10,6 +10,7 @@ Cambodia:P{h}nom Penh
China:Beijing|Peking
Cyprus:Nicosia
East Timor:Dili
+Fiji:Suva
Georgia:Tbilisi
India:New Delhi
Indonesia:Jakarta|Djakarta
@@ -19,31 +20,42 @@ Israel:Jerusalem
Japan:Tokyo
Jordan:Amman
Kazakhstan:Astana
+Kiribati:South Tarawa
Kuwait:Al-Kuwait|Kuwait City
Kyrgyzstan:Bishkek
Laos:Vientiane
Lebanon:Beirut
-Malaysia:Kuala Lumpur
+Malaysia:Kuala Lumpur|Putrajaya
Maldive Islands:Male
+Marshall Islands:Delap[-| ]Uliga[-| ]Djarrit
+Micronesia:Palikir
Mongolia:Ulaanbaatar|Ulan Bator
Myanmar|Burma:Naypyidaw|Nay Pyi Taw
+Nauru:Yaren
Nepal:Kat{h}mandu
+New Zealand:Wellington
North Korea:P{'}yongyang
Oman:Muscat
Pakistan:Islamabad
+Palau:Ngerulmud
Papua[-| ]New Guinea:Port Moresby
Philippines:Manila
Qatar:Doha
+Samoa:Apia
Saudi Arabia:Riyadh
Singapore:Singapore
+Solomon Islands:Honiara
South Korea:Seoul
-Sri Lanka:Colombo
+Sri Lanka:Colombo|Sri Jayawardenepura Kotte
Syria:Damascus
Taiwan:Taipei
Thailand:Bangkok
+Tonga:Nuku{'}alofa
Turkey:Ankara
Turkmenistan:Ashgabat
-United Arab Emirates:Abu Dhabi
+Tuvalu:Funafuti
+[United Arab Emirates|UAE]:Abu Dhabi
Uzbekistan:Tashkent
+Vanuatu:Port Vila
Vietnam:Hanoi
Yemen:San{'}a
Index: europe
===================================================================
RCS file: /cvs/src/games/quiz/datfiles/europe,v
retrieving revision 1.4
diff -u -p -u -r1.4 europe
--- europe 2 Dec 2014 12:43:09 -0000 1.4
+++ europe 4 Jul 2022 21:34:34 -0000
@@ -3,7 +3,7 @@ Andorra:Andorra la V[ell|iej]a
Austria:Vienna|Wien
Belarus|Byelorussia:M[i|e]nsk
Belgium:Brussel[s|]|Bruxelles
-Bosnia[-Herzegovina|]:Sarajevo
+Bosnia{[ and |-]Herzegovina}:Sarajevo
Bulgaria:Sofi[a|ya]
Croatia:Zagreb
Czech Republic:Prague|Praha
@@ -12,7 +12,6 @@ United Kingdom|England|Great Britain|UK:
Estonia:Tallinn
Finland:Helsinki
France:Paris
-Georgia:Tbilisi
Germany:Berlin
Greece:Athens
Hungary:Budapest
@@ -23,22 +22,23 @@ Latvia:Riga
Liechtenstein:Vaduz
Lithuania:Vilnius
Luxembourg:Luxembourg
-[|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
Malta:Valletta
Moldova:Chisinau|Kishinev
Monaco:Monaco
+Montenegro:Podgorica
Netherlands|Holland:The Hague|'sGravenhage|den Haag|Amsterdam
+North Macedonia:Skop[|l]je
Norway:Oslo
Poland:Wars[aw|zawa]
Portugal:Lisbo[n|a]
R[u|o]mania:Bucharest|Bucuresti
Russia:Mos[cow|kva]
San Marino:San Marino
+Serbia:Belgrade|Beograd
Slovakia|Slovak Republic:Bratislava
Slovenia:Ljubljana
Spain:Madrid
Sweden:Stockholm
Switzerland:Bern{e}
-Turkey:Ankara
Ukraine:Kiev|Kyiv
-Yugoslavia:Belgrade|Beograd
+Vatican City:Vatican City
