Merge a bunch of cleanups from NetBSD.

PR:		8083
Submitted by:	Stephen J. Roznowski <sjr@home.net>
Obtained from:	a whole slew of NetBSD PRs

1 files changed, 14 insertions, 2 deletions

diff --git a/games/quiz/datfiles/europe b/games/quiz/datfiles/europe
index 01fe42096a44..477e8b7b4e89 100644
--- a/games/quiz/datfiles/europe
+++ b/games/quiz/datfiles/europe
@@ -1,10 +1,15 @@
 Albania:Tirana|Tirane"
 Andorra:Andorra la V[ell|iej]a
 Austria:Vienna|Wien
+Belarus|Byelorussia:M[i|e]nsk
 Belgium:Brussel[s|]|Bruxelles
+Bosnia[-Herzegovina|]:Sarajevo
 Bulgaria:Sofi[a|ya]
-Czechoslovakia:Prague|Praha
+Croatia:Zagreb
+Czech Republic:Prague|Praha
 Denmark:Copenhagen|K[o|o/]benhavn
+Estonia:Tallinn
+Georgia:Tbilisi
 Germany:Berlin
 United Kingdom|England|Great Britain|UK:London
 Finland:Helsinki
@@ -14,19 +19,26 @@ Hungary:Budapest
 Iceland:Reykjavik
 Ireland|Eire:Dublin
 Italy:Rom[e|a]
+Latvia:Riga
 Liechtenstein:Vaduz
+Lithuania:Vilnius
 Luxembourg:Luxembourg
+[|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
 Malta:Valletta
+Moldova:Chisinau|Kishinev
 Monaco:Monte Carlo
 Netherlands|Holland:The Hague|'sGravenhage|den Haag|Amsterdam
 Norway:Oslo
 Poland:Wars[aw|zawa]
 Portugal:Lisbo[n|a]
 R[u|o]mania:Bucharest|Bucuresti
+Russia:Mos[cow|kva]
 San Marino:San Marino
+Slovakia|Slovak Republic:Bratislava
+Slovenia:Ljubljana
 Spain:Madrid
 Sweden:Stockholm
 Switzerland:Bern{e}
 Turkey:Ankara
-Russia:Mos[cow|kva]
+Ukraine:Kiev|Kyiv
 Yugoslavia:Belgrade|Beograd