get rid of line-printer-era backspace-encoding of diacriticals;

patch from pjanzen@; ok jmc@

4 files changed, 12 insertions, 12 deletions

diff --git a/games/quiz/datfiles/africa b/games/quiz/datfiles/africa
index 6959fa8c36c..e713d968cf8 100644
--- a/games/quiz/datfiles/africa
+++ b/games/quiz/datfiles/africa
@@ -4,14 +4,14 @@ Benin|Dahomey:Porto[-| ]Novo
 Botswana:Gaborone
 Burkina Faso:Ouagadougou
 Burundi:Bujumbura
-Camero[o|u]n:Yaound['e|e'|e]
+Camero[o|u]n:Yaounde
 [Cabo|Cape] Verde:Praia
 Central Africa{n Rep{ublic}}:Bangui
 Chad:N'Djamena
 {Union of the }Comoros:Moroni
 Republic of Congo:Brazzaville
 Democratic Republic of the Congo:Kinshasa
-C[^o|o^|o]te d'Ivoire|Ivory Coast:Yamoussoukro
+Cote d'Ivoire|Ivory Coast:Yamoussoukro
 Djibouti:Djibouti City
 Egypt:Cairo
 Equatorial Guinea:Malabo
@@ -32,12 +32,12 @@ Mali:Bamako
 Mauritania:Nouakchott
 Mauritius:Port Louis
 Morocco:Rabat
-Mo[z|,c|c,|c]ambique:Maputo
+Mo[z|c]ambique:Maputo
 Namibia:Windhoek
 Niger:Niamey
 Nigeria:Abuja
 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]
+Sao Tome and Principe:Sao Tome
 Senegal:Dakar
 Seychelles:Victoria
 Sierra Leone:Freetown
@@ -47,7 +47,7 @@ South Sudan:Juba
 Sudan:Khartoum
 Swaziland:Mbabane
 Tanzania:Dodoma
-Togo:Lom['e|e'|e]
+Togo:Lome
 Tunisia:Tunis
 Uganda:Kampala
 Zambia:Lusaka
diff --git a/games/quiz/datfiles/america b/games/quiz/datfiles/america
index 7f8fee11212..a4f121815b1 100644
--- a/games/quiz/datfiles/america
+++ b/games/quiz/datfiles/america
@@ -5,7 +5,7 @@ Bolivia:La Paz|Sucre
 Bra[z|s]il:Brasilia
 Canada:Ottawa
 Chile:Santiago
-Colombia:Bogot['a|a'|a]
+Colombia:Bogota
 Costa Rica:San Jose
 Cuba:Ha[v|b]ana
 Dominican Republic:Santo Domingo
@@ -19,9 +19,9 @@ Jamaica:Kingston
 Mexico:Mexico
 Nicaragua:Managua
 Panama:Panama
-Paraguay:Asunci['o|o'|o]n
+Paraguay:Asuncion
 Peru:Lima
-Trinidad[ and Tobago|]:Port of Spain
+Trinidad{ and Tobago}:Port of Spain
 United States|US{A}:Washington
 Uruguay:Montevideo
 Venezuela:Caracas
diff --git a/games/quiz/datfiles/europe b/games/quiz/datfiles/europe
index 3bc3fcdcb18..83af7320713 100644
--- a/games/quiz/datfiles/europe
+++ b/games/quiz/datfiles/europe
@@ -1,4 +1,4 @@
-Albania:Tirana|Tirane"
+Albania:Tirana|Tirane
 Andorra:Andorra la V[ell|iej]a
 Austria:Vienna|Wien
 Belarus|Byelorussia:M[i|e]nsk
@@ -7,7 +7,7 @@ Bosnia[-Herzegovina|]:Sarajevo
 Bulgaria:Sofi[a|ya]
 Croatia:Zagreb
 Czech Republic:Prague|Praha
-Denmark:Copenhagen|K[o|o/]benhavn
+Denmark:Copenhagen|Kobenhavn
 United Kingdom|England|Great Britain|UK:London
 Estonia:Tallinn
 Finland:Helsinki
diff --git a/games/quiz/datfiles/midearth b/games/quiz/datfiles/midearth
index 17e21c01712..e5cb890b740 100644
--- a/games/quiz/datfiles/midearth
+++ b/games/quiz/datfiles/midearth
@@ -4,7 +4,7 @@ Gondor:Minas Tirith
 Umbar:{City of the }Corsairs
 Rhovanion:Esgaroth{ upon the Long Lake}
 Rohan:Edoras
-Lothl['o|o|o']rien:Caras Galadon
+Lothlorien:Caras Galadon
 Breeland:Bree
-Arnor:Ann['u|u'|u]minas
+Arnor:Annuminas
 Arthedain:Fornost{ Erain}|Norbury of the Kings