(svn r15762) -Codechange: inlined utf8 chars are not handled properly on eastern version of windows so escape them

5 files changed, 519 insertions, 519 deletions

diff --git a/src/currency.cpp b/src/currency.cpp
index f2ec0d9de..ee83de142 100644
--- a/src/currency.cpp
+++ b/src/currency.cpp
@@ -10,40 +10,40 @@
 
 #include "table/strings.h"
 
-	/*   exchange rate    prefix             symbol_pos
-	 *   |  separator        |     postfix   |
-	 *   |   |    Euro year  |       |       |    name
-	 *   |   |    |          |       |       |    | */
+	/*   exchange rate    prefix                      symbol_pos
+	 *   |  separator        |           postfix          |
+	 *   |   |   Euro year   |              |             | name
+	 *   |   |    |          |              |             |  | */
 static const CurrencySpec origin_currency_specs[NUM_CURRENCY] = {
-	{    1, ',', CF_NOEURO, "£",    "",      0,  STR_CURR_GBP    }, ///< british pounds
-	{    2, ',', CF_NOEURO, "$",    "",      0,  STR_CURR_USD    }, ///< us dollars
-	{    2, ',', CF_ISEURO, "€",    "",      0,  STR_CURR_EUR    }, ///< Euro
-	{  220, ',', CF_NOEURO, "¥",    "",      0,  STR_CURR_YEN    }, ///< yen
-	{   20, ',', 2002,      "",     " S.",   1,  STR_CURR_ATS    }, ///< austrian schilling
-	{   59, ',', 2002,      "BEF ", "",      0,  STR_CURR_BEF    }, ///< belgian franc
-	{    2, ',', CF_NOEURO, "CHF ", "",      0,  STR_CURR_CHF    }, ///< swiss franc
-	{   41, ',', CF_NOEURO, "",     " Kč",   1,  STR_CURR_CZK    }, ///< czech koruna
-	{    3, '.', 2002,      "DM ",  "",      0,  STR_CURR_DEM    }, ///< deutsche mark
-	{   11, '.', CF_NOEURO, "",     " kr",   1,  STR_CURR_DKK    }, ///< danish krone
-	{  245, '.', 2002,      "Pts ", "",      0,  STR_CURR_ESP    }, ///< spanish pesetas
-	{    9, ',', 2002,      "",     " mk",   1,  STR_CURR_FIM    }, ///< finnish markka
-	{   10, '.', 2002,      "FF ",  "",      0,  STR_CURR_FRF    }, ///< french francs
-	{  500, ',', 2002,      "",     "Dr.",   1,  STR_CURR_GRD    }, ///< greek drachma
-	{  378, ',', CF_NOEURO, "",     " Ft",   1,  STR_CURR_HUF    }, ///< hungarian forint
-	{  130, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_ISK    }, ///< icelandic krona
-	{ 2850, ',', 2002,      "",     " L.",   1,  STR_CURR_ITL    }, ///< italian lira
-	{    3, ',', 2002,      "NLG ", "",      0,  STR_CURR_NLG    }, ///< dutch gulden
-	{   12, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_NOK    }, ///< norwegian krone
-	{    6, ' ', CF_NOEURO, "",     " zl",   1,  STR_CURR_PLN    }, ///< polish zloty
-	{    5, '.', CF_NOEURO, "",     " Lei",  1,  STR_CURR_ROL    }, ///< romanian Lei
-	{   50, ' ', CF_NOEURO, "",     " p",    1,  STR_CURR_RUR    }, ///< russian rouble
-	{  352, '.', 2007,      "",     " SIT",  1,  STR_CURR_SIT    }, ///< slovenian tolar
-	{   13, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_SEK    }, ///< swedish krona
-	{    3, '.', CF_NOEURO, "",     " TL",   1,  STR_CURR_TRY    }, ///< turkish lira
-	{   52, ',', 2009,      "",     " Sk",   1,  STR_CURR_SKK    }, ///< slovak koruna
-	{    4, ',', CF_NOEURO, "R$ ",  "",      0,  STR_CURR_BRL    }, ///< brazil real
-	{   20, '.', CF_NOEURO, "",     " EEK",  1,  STR_CURR_EEK    }, ///< estonian krooni
-	{    1, ' ', CF_NOEURO, "",     "",      2,  STR_CURR_CUSTOM }, ///< custom currency
+	{    1, ',', CF_NOEURO, "\xC2\xA3",     "",           0, STR_CURR_GBP    }, ///< british pounds
+	{    2, ',', CF_NOEURO, "$",            "",           0, STR_CURR_USD    }, ///< us dollars
+	{    2, ',', CF_ISEURO, "\xE2\x82\xAC", "",           0, STR_CURR_EUR    }, ///< Euro
+	{  220, ',', CF_NOEURO, "\xC2\xA5",     "",           0, STR_CURR_YEN    }, ///< yen
+	{   20, ',', 2002,      "",             " S.",        1, STR_CURR_ATS    }, ///< austrian schilling
+	{   59, ',', 2002,      "BEF ",         "",           0, STR_CURR_BEF    }, ///< belgian franc
+	{    2, ',', CF_NOEURO, "CHF ",         "",           0, STR_CURR_CHF    }, ///< swiss franc
+	{   41, ',', CF_NOEURO, "",             " K\xC4\x8D", 1, STR_CURR_CZK    }, ///< czech koruna
+	{    3, '.', 2002,      "DM ",          "",           0, STR_CURR_DEM    }, ///< deutsche mark
+	{   11, '.', CF_NOEURO, "",             " kr",        1, STR_CURR_DKK    }, ///< danish krone
+	{  245, '.', 2002,      "Pts ",         "",           0, STR_CURR_ESP    }, ///< spanish pesetas
+	{    9, ',', 2002,      "",             " mk",        1, STR_CURR_FIM    }, ///< finnish markka
+	{   10, '.', 2002,      "FF ",          "",           0, STR_CURR_FRF    }, ///< french francs
+	{  500, ',', 2002,      "",             "Dr.",        1, STR_CURR_GRD    }, ///< greek drachma
+	{  378, ',', CF_NOEURO, "",             " Ft",        1, STR_CURR_HUF    }, ///< hungarian forint
+	{  130, '.', CF_NOEURO, "",             " Kr",        1, STR_CURR_ISK    }, ///< icelandic krona
+	{ 2850, ',', 2002,      "",             " L.",        1, STR_CURR_ITL    }, ///< italian lira
+	{    3, ',', 2002,      "NLG ",         "",           0, STR_CURR_NLG    }, ///< dutch gulden
+	{   12, '.', CF_NOEURO, "",             " Kr",        1, STR_CURR_NOK    }, ///< norwegian krone
+	{    6, ' ', CF_NOEURO, "",             " zl",        1, STR_CURR_PLN    }, ///< polish zloty
+	{    5, '.', CF_NOEURO, "",             " Lei",       1, STR_CURR_ROL    }, ///< romanian Lei
+	{   50, ' ', CF_NOEURO, "",             " p",         1, STR_CURR_RUR    }, ///< russian rouble
+	{  352, '.', 2007,      "",             " SIT",       1, STR_CURR_SIT    }, ///< slovenian tolar
+	{   13, '.', CF_NOEURO, "",             " Kr",        1, STR_CURR_SEK    }, ///< swedish krona
+	{    3, '.', CF_NOEURO, "",             " TL",        1, STR_CURR_TRY    }, ///< turkish lira
+	{   52, ',', 2009,      "",             " Sk",        1, STR_CURR_SKK    }, ///< slovak koruna
+	{    4, ',', CF_NOEURO, "R$ ",          "",           0, STR_CURR_BRL    }, ///< brazil real
+	{   20, '.', CF_NOEURO, "",             " EEK",       1, STR_CURR_EEK    }, ///< estonian krooni
+	{    1, ' ', CF_NOEURO, "",             "",           2, STR_CURR_CUSTOM }, ///< custom currency
 };
 
 /* Array of currencies used by the system */
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 1eaf4617d..df474d598 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -315,7 +315,7 @@ struct AboutWindow : public Window {
 			"  Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework",
 			"  Victor Fischer (Celestar) - Programming everywhere you need him to",
 			"  Christoph Elsenhans (frosch) - General coding",
-			"  Loïc Guilloux (glx) - Windows Expert",
+			"  Lo\xC3\xAF""c Guilloux (glx) - Windows Expert",
 			"  Michael Lutz (michi_cc) - Path based signals",
 			"  Owen Rudge (orudge) - Forum host, OS/2 port",
 			"  Peter Nelson (peter1138) - Spiritual descendant from newGRF gods",
@@ -324,10 +324,10 @@ struct AboutWindow : public Window {
 			"  Thijs Marinussen (Yexo) - AI Framework",
 			"",
 			"Inactive Developers:",
-			"  Tamás Faragó (Darkvater) - Ex-Lead coder",
+			"  Tam\xC3\xA1s Farag\xC3\xB3 (Darkvater) - Ex-Lead coder",
 			"  Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)",
 			"  Jonathan Coome (Maedhros) - High priest of the NewGRF Temple",
-			"  Attila Bán (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
+			"  Attila B\xC3\xA1n (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
 			"  Christoph Mallon (Tron) - Programmer, code correctness police",
 			"",
 			"Retired Developers:",
diff --git a/src/namegen.cpp b/src/namegen.cpp
index caac1096a..68fc86a24 100644
--- a/src/namegen.cpp
+++ b/src/namegen.cpp
@@ -372,7 +372,7 @@ static char *MakeFinnishTownName(char *buf, const char *last, uint32 seed)
 				strstr(orig, "A") != NULL || strstr(orig, "O") != NULL || strstr(orig, "U")  != NULL) {
 			buf = strecpy(buf, "la", last);
 		} else {
-			buf = strecpy(buf, "lä", last);
+			buf = strecpy(buf, "l\xC3\xA4", last);
 		}
 		return buf;
 	}
diff --git a/src/ottdres.rc.in b/src/ottdres.rc.in
index 494531dc5..6fe8c5e11 100644
--- a/src/ottdres.rc.in
+++ b/src/ottdres.rc.in
@@ -85,7 +85,7 @@ BEGIN
             VALUE "FileDescription", "OpenTTD\0"
             VALUE "FileVersion", "Development @@VERSION@@\0"
             VALUE "InternalName", "openttd\0"
-            VALUE "LegalCopyright", "Copyright � OpenTTD Developers 2002-2009. All Rights Reserved.\0"
+            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2009. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
diff --git a/src/table/namegen.h b/src/table/namegen.h
index 494c10d16..66c8d2010 100644
--- a/src/table/namegen.h
+++ b/src/table/namegen.h
@@ -305,7 +305,7 @@ static const char * const _name_austrian_a2[] = {
 	"Aus",
 	"Alten",
 	"Braun",
-	"Vösl",
+	"V\xC3\xB6sl",
 	"Mittern",
 	"Nuss",
 	"Neu",
@@ -327,9 +327,9 @@ static const char * const _name_austrian_a2[] = {
 	"Frauen",
 	"Herren",
 	"Hof",
-	"Hütt",
+	"H\xC3\xBCtt",
 	"Kaisers",
-	"Königs",
+	"K\xC3\xB6nigs",
 	"Knittel",
 	"Lang",
 	"Ober",
@@ -341,7 +341,7 @@ static const char * const _name_austrian_a2[] = {
 	"Stocker",
 	"Unter",
 	"Utten",
-	"Vösen",
+	"V\xC3\xB6sen",
 	"Vill",
 	"Weissen",
 };
@@ -387,7 +387,7 @@ static const char * const _name_austrian_a5[] = {
 
 static const char * const _name_austrian_a6[] = {
 	"Aegyd",
-	"Andrä",
+	"Andr\xC3\xA4",
 	"Georgen",
 	"Jakob",
 	"Johann",
@@ -400,7 +400,7 @@ static const char * const _name_austrian_a6[] = {
 	"Nikolai",
 	"Oswald",
 	"Peter",
-	"Pölten",
+	"P\xC3\xB6lten",
 	"Stefan",
 	"Stephan",
 	"Thomas",
@@ -461,10 +461,10 @@ static const char * const _name_german_real[] = {
 	"Gera",
 	"Kassel",
 	"Kiel",
-	"Köln",
-	"Lübeck",
+	"K\xC3\xB6ln",
+	"L\xC3\xBC""beck",
 	"Magdeburg",
-	"München",
+	"M\xC3\xBCnchen",
 	"Potsdam",
 	"Stuttgart",
 	"Wiesbaden",
@@ -487,7 +487,7 @@ static const char * const _name_german_1[] = {
 	"Cloppen",
 	"Co",
 	"Duis",
-	"Düssel",
+	"D\xC3\xBCssel",
 	"Dannen",
 	"Elb",
 	"Els",
@@ -501,7 +501,7 @@ static const char * const _name_german_1[] = {
 	"Frei",
 	"Freuden",
 	"Fried",
-	"Fürsten",
+	"F\xC3\xBCrsten",
 	"Hahn",
 	"Ham",
 	"Harz",
@@ -522,10 +522,10 @@ static const char * const _name_german_1[] = {
 	"Langen",
 	"Lim",
 	"Lohr",
-	"Lüne",
+	"L\xC3\xBCne",
 	"Mel",
 	"Michels",
-	"Mühl",
+	"M\xC3\xBChl",
 	"Naum",
 	"Nest",
 	"Nord",
@@ -533,7 +533,7 @@ static const char * const _name_german_1[] = {
 	"Nien",
 	"Nidda",
 	"Nieder",
-	"Nürn",
+	"N\xC3\xBCrn",
 	"Ober",
 	"Offen",
 	"Osna",
@@ -547,18 +547,18 @@ static const char * const _name_german_1[] = {
 	"Regens",
 	"Rott",
 	"Ros",
-	"Rüssels",
+	"R\xC3\xBCssels",
 	"Saal",
 	"Saar",
 	"Salz",
-	"Schöne",
+	"Sch\xC3\xB6ne",
 	"Schwein",
 	"Sonder",
 	"Sonnen",
 	"Stein",
 	"Strals",
 	"Straus",
-	"Süd",
+	"S\xC3\xBC""d",
 	"Ton",
 	"Unter",
 	"Ur",
@@ -569,14 +569,14 @@ static const char * const _name_german_1[] = {
 	"Wester",
 	"Witten",
 	"Wolfs",
-	"Würz",
+	"W\xC3\xBCrz",
 };
 
 static const char * const _name_german_2[] = {
 	"bach",
 	"berg",
-	"brück",
-	"brücken",
+	"br\xC3\xBC""ck",
+	"br\xC3\xBC""cken",
 	"burg",
 	"dorf",
 	"feld",
@@ -586,7 +586,7 @@ static const char * const _name_german_2[] = {
 	"heim",
 	"horst",
 	"mund",
-	"münster",
+	"m\xC3\xBCnster",
 	"stadt",
 	"wald",
 };
@@ -710,7 +710,7 @@ static const char * const _name_french_real[] = {
 	"Bordeaux",
 	"Bayonne",
 	"Montpellier",
-	"Montélimar",
+	"Mont\xC3\xA9limar",
 	"Valence",
 	"Digne",
 	"Nice",
@@ -718,16 +718,16 @@ static const char * const _name_french_real[] = {
 	"St. Tropez",
 	"Marseille",
 	"Narbonne",
-	"Sète",
+	"S\xC3\xA8te",
 	"Aurillac",
-	"Guéret",
+	"Gu\xC3\xA9ret",
 	"Le Creusot",
 	"Nevers",
 	"Auxerre",
 	"Versailles",
 	"Meaux",
-	"Châlons",
-	"Compiègne",
+	"Ch\xC3\xA2lons",
+	"Compi\xC3\xA8gne",
 	"Metz",
 	"Chaumont",
 	"Langres",
@@ -740,8 +740,8 @@ static const char * const _name_french_real[] = {
 	"Le Mans",
 	"Angers",
 	"Nantes",
-	"Châteauroux",
-	"Orléans",
+	"Ch\xC3\xA2teauroux",
+	"Orl\xC3\xA9""ans",
 	"Lisieux",
 	"Cherbourg",
 	"Morlaix",
@@ -752,7 +752,7 @@ static const char * const _name_french_real[] = {
 	"Troyes",
 	"Charolles",
 	"Grenoble",
-	"Chambéry",
+	"Chamb\xC3\xA9ry",
 	"Tours",
 	"St. Brieuc",
 	"St. Malo",
@@ -766,11 +766,11 @@ static const char * const _name_french_real[] = {
 	"Albi",
 	"Paris",
 	"Biarritz",
-	"Béziers",
-	"Nîmes",
+	"B\xC3\xA9ziers",
+	"N\xC3\xAEmes",
 	"Chamonix",
-	"Angoulème",
-	"Alençon",
+	"Angoul\xC3\xA8me",
+	"Alen\xC3\xA7on",
 };
 
 static const char * const _name_silly_1[] = {
@@ -898,7 +898,7 @@ static const char * const _name_swedish_2[] = {
 	"Es",
 	"Fin",
 	"Fisk",
-	"Grön",
+	"Gr\xC3\xB6n",
 	"Hag",
 	"Halm",
 	"Karl",
@@ -917,17 +917,17 @@ static const char * const _name_swedish_2[] = {
 	"Skog",
 	"Stock",
 	"Stor",
-	"Ström",
+	"Str\xC3\xB6m",
 	"Sund",
-	"Söder",
+	"S\xC3\xB6""der",
 	"Tall",
 	"Tratt",
 	"Troll",
 	"Upp",
 	"Var",
-	"Väster",
-	"Ängel",
-	"Öster",
+	"V\xC3\xA4ster",
+	"\xC3\x84ngel",
+	"\xC3\x96ster",
 };
 
 static const char * const _name_swedish_2a[] = {
@@ -982,9 +982,9 @@ static const char * const _name_swedish_2b[] = {
 	"o",
 	"u",
 	"y",
-	"å",
-	"ä",
-	"ö",
+	"\xC3\xA5",
+	"\xC3\xA4",
+	"\xC3\xB6",
 };
 
 static const char * const _name_swedish_2c[] = {
@@ -1030,25 +1030,25 @@ static const char * const _name_swedish_3[] = {
 	"hamn",
 	"holm",
 	"hus",
-	"hättan",
+	"h\xC3\xA4ttan",
 	"kulle",
-	"köping",
+	"k\xC3\xB6ping",
 	"lund",
-	"löv",
+	"l\xC3\xB6v",
 	"sala",
 	"skrona",
-	"slätt",
-	"spång",
+	"sl\xC3\xA4tt",
+	"sp\xC3\xA5ng",
 	"stad",
 	"sund",
 	"svall",
 	"svik",
-	"såker",
+	"s\xC3\xA5ker",
 	"udde",
 	"valla",
 	"viken",
-	"älv",
-	"ås",
+	"\xC3\xA4lv",
+	"\xC3\xA5s",
 };
 
 static const char * const _name_dutch_1[] = {
@@ -1215,7 +1215,7 @@ static const char * const _name_finnish_real[] = {
 	"Espoo",
 	"Helsinki",
 	"Tapiola",
-	"Järvelä",
+	"J\xC3\xA4rvel\xC3\xA4",
 	"Lahti",
 	"Kotka",
 	"Hamina",
@@ -1250,26 +1250,26 @@ static const char * const _name_finnish_1[] = {
 	"Sauna",
 	"Uusi",
 	"Vanha",
-	"Kesä",
+	"Kes\xC3\xA4",
 	"Kuusi",
 	"Pelto",
 	"Tuomi",
 	"Terva",
 	"Olki",
-	"Heinä",
-	"Seinä",
+	"Hein\xC3\xA4",
+	"Sein\xC3\xA4",
 	"Rova",
 	"Koivu",
 	"Kokko",
-	"Mänty",
+	"M\xC3\xA4nty",
 	"Pihlaja",
-	"Petäjä",
+	"Pet\xC3\xA4j\xC3\xA4",
 	"Kielo",
 	"Kauha",
 	"Viita",
 	"Kivi",
 	"Riihi",
-	"Ääne",
+	"\xC3\x84\xC3\xA4ne",
 	"Niini",
 };
 
@@ -1278,27 +1278,27 @@ static const char * const _name_finnish_2[] = {
 	"Lohjan",
 	"Savon",
 	"Lapin",
-	"Pitäjän",
+	"Pit\xC3\xA4j\xC3\xA4n",
 	"Martin",
 	"Kuusan",
 	"Kemi",
 	"Keri",
-	"Hämeen",
+	"H\xC3\xA4meen",
 	"Kangas",
 };
 
 static const char * const _name_finnish_3[] = {
 	"harju",
 	"linna",
-	"järvi",
+	"j\xC3\xA4rvi",
 	"kallio",
-	"mäki",
+	"m\xC3\xA4ki",
 	"nummi",
 	"joki",
-	"kylä",
+	"kyl\xC3\xA4",
 	"lampi",
 	"lahti",
-	"metsä",
+	"mets\xC3\xA4",
 	"suo",
 	"laakso",
 	"niitty",
@@ -1311,56 +1311,56 @@ static const char * const _name_finnish_3[] = {
 
 static const char * const _name_polish_1_m[] = {
 	"Wielki ",
-	"Mały ",
-	"Zły ",
+	"Ma\xC5\x82y ",
+	"Z\xC5\x82y ",
 	"Dobry ",
 	"Nowy ",
 	"Stary ",
-	"Złoty ",
+	"Z\xC5\x82oty ",
 	"Zielony ",
-	"Biały ",
+	"Bia\xC5\x82y ",
 	"Modry ",
-	"Dębowy ",
+	"D\xC4\x99""bowy ",
 };
 
 static const char * const _name_polish_1_f[] = {
 	"Wielka ",
-	"Mała ",
-	"Zła ",
+	"Ma\xC5\x82""a ",
+	"Z\xC5\x82""a ",
 	"Dobra ",
 	"Nowa ",
 	"Stara ",
-	"Złota ",
+	"Z\xC5\x82ota ",
 	"Zielona ",
-	"Biała ",
+	"Bia\xC5\x82""a ",
 	"Modra ",
-	"Dębowa ",
+	"D\xC4\x99""bowa ",
 };
 
 static const char * const _name_polish_1_n[] = {
 	"Wielkie ",
-	"Małe ",
-	"Złe ",
+	"Ma\xC5\x82""e ",
+	"Z\xC5\x82""e ",
 	"Dobre ",
 	"Nowe ",
 	"Stare ",
-	"Złote ",
+	"Z\xC5\x82ote ",
 	"Zielone ",
-	"Białe ",
+	"Bia\xC5\x82""e ",
 	"Modre ",
-	"Dębowe ",
+	"D\xC4\x99""bowe ",
 };
 
 static const char * const _name_polish_2_o[] = {
 	"Frombork",
 	"Gniezno",
 	"Olsztyn",
-	"Toruń",
+	"Toru\xC5\x84",
 	"Bydgoszcz",
 	"Terespol",
-	"Kraków",
-	"Poznań",
-	"Wrocław",
+	"Krak\xC3\xB3w",
+	"Pozna\xC5\x84",
+	"Wroc\xC5\x82""aw",
 	"Katowice",
 	"Cieszyn",
 	"Bytom",
@@ -1371,7 +1371,7 @@ static const char * const _name_polish_2_o[] = {
 	"Malbork",
 	"Sopot",
 	"Sosnowiec",
-	"Gdańsk",
+	"Gda\xC5\x84sk",
 	"Gdynia",
 	"Sieradz",
 	"Sandomierz",
@@ -1379,7 +1379,7 @@ static const char * const _name_polish_2_o[] = {
 	"Szczytno",
 	"Szczecin",
 	"Zakopane",
-	"Szklarska Poręba",
+	"Szklarska Por\xC4\x99""ba",
 	"Bochnia",
 	"Golub-Dobrzyn",
 	"Chojnice",
@@ -1391,13 +1391,13 @@ static const char * const _name_polish_2_o[] = {
 static const char * const _name_polish_2_m[] = {
 	"Jarocin",
 	"Gogolin",
-	"Tomaszów",
-	"Piotrków",
+	"Tomasz\xC3\xB3w",
+	"Piotrk\xC3\xB3w",
 	"Lidzbark",
 	"Rypin",
 	"Radzymin",
-	"Wołomin",
-	"Pruszków",
+	"Wo\xC5\x82omin",
+	"Pruszk\xC3\xB3w",
 	"Olsztynek",
 	"Rypin",
 	"Cisek",
@@ -1407,7 +1407,7 @@ static const char * const _name_polish_2_m[] = {
 	"Lubicz",
 	"Milicz",
 	"Targ",
-	"Ostrów",
+	"Ostr\xC3\xB3w",
 	"Ozimek",
 	"Puck",
 	"Rzepin",
@@ -1420,7 +1420,7 @@ static const char * const _name_polish_2_m[] = {
 	"Strzepcz",
 	"Strzebielin",
 	"Sochaczew",
-	"Grębocin",
+	"Gr\xC4\x99""bocin",
 	"Gniew",
 	"Lubliniec",
 	"Lubasz",
@@ -1442,7 +1442,7 @@ static const char * const _name_polish_2_m[] = {
 static const char * const _name_polish_2_f[] = {
 	"Szprotawa",
 	"Pogorzelica",
-	"Motława",
+	"Mot\xC5\x82""awa",
 	"Lubawa",
 	"Nidzica",
 	"Kruszwica",
@@ -1496,7 +1496,7 @@ static const char * const _name_polish_2_n[] = {
 	"Braniewo",
 	"Sulinowo",
 	"Chmielno",
-	"Jastrzębie",
+	"Jastrz\xC4\x99""bie",
 	"Gryfino",
 	"Koronowo",
 	"Lubichowo",
@@ -1505,182 +1505,182 @@ static const char * const _name_polish_2_n[] = {
 
 static const char * const _name_polish_3_m[] = {
 	" Wybudowanie",
-	" Świętokrzyski",
-	" Górski",
+	" \xC5\x9Awi\xC4\x99tokrzyski",
+	" G\xC3\xB3rski",
 	" Morski",
-	" Zdrój",
+	" Zdr\xC3\xB3j",
 	" Wody",
 	" Bajoro",
-	" Krajeński",
-	" Śląski",
+	" Kraje\xC5\x84ski",
+	" \xC5\x9Al\xC4\x85ski",
 	" Mazowiecki",
 	" Pomorski",
 	" Wielki",
 	" Maly",
-	" Warmiński",
+	" Warmi\xC5\x84ski",
 	" Mazurski",
 	" Mniejszy",
-	" Większy",
-	" Górny",
+	" Wi\xC4\x99kszy",
+	" G\xC3\xB3rny",
 	" Dolny",
 	" Wielki",
 	" Stary",
 	" Nowy",
 	" Wielkopolski",
-	" Wzgórze",
+	" Wzg\xC3\xB3rze",
 	" Mosty",
 	" Kujawski",
-	" Małopolski",
+	" Ma\xC5\x82opolski",
 	" Podlaski",
 	" Lesny",
 };
 
 static const char * const _name_polish_3_f[] = {
 	" Wybudowanie",
-	" Świętokrzyska",
-	" Górska",
+	" \xC5\x9Awi\xC4\x99tokrzyska",
+	" G\xC3\xB3rska",
 	" Morska",
-	" Zdrój",
+	" Zdr\xC3\xB3j",
 	" Woda",
 	" Bajoro",
-	" Krajeńska",
-	" Śląska",
+	" Kraje\xC5\x84ska",
+	" \xC5\x9Al\xC4\x85ska",
 	" Mazowiecka",
 	" Pomorska",
 	" Wielka",
-	" Mała",
-	" Warmińska",
+	" Ma\xC5\x82""a",
+	" Warmi\xC5\x84ska",
 	" Mazurska",
 	" Mniejsza",
-	" Większa",
-	" Górna",
+	" Wi\xC4\x99ksza",
+	" G\xC3\xB3rna",
 	" Dolna",
 	" Wielka",
 	" Stara",
 	" Nowa",
 	" Wielkopolska",
-	" Wzgórza",
+	" Wzg\xC3\xB3rza",
 	" Mosty",
 	" Kujawska",
 	" Malopolska",
 	" Podlaska",
-	" Leśna",
+	" Le\xC5\x9Bna",
 };
 
 static const char * const _name_polish_3_n[] = {
 	" Wybudowanie",
-	" Świetokrzyskie",
-	" Górskie",
+	" \xC5\x9Awietokrzyskie",
+	" G\xC3\xB3rskie",
 	" Morskie",
-	" Zdrój",
+	" Zdr\xC3\xB3j",
 	" Wody",
 	" Bajoro",
-	" Krajeńskie",
-	" Śląskie",
+	" Kraje\xC5\x84skie",
+	" \xC5\x9Al\xC4\x85skie",
 	" Mazowieckie",
 	" Pomorskie",
 	" Wielkie",
-	" Małe",
-	" Warmińskie ",
+	" Ma\xC5\x82""e",
+	" Warmi\xC5\x84skie ",
 	" Mazurskie ",
 	" Mniejsze",
-	" Większe",
-	" Górne",
+	" Wi\xC4\x99ksze",
+	" G\xC3\xB3rne",
 	" Dolne",
 	" Wielkie",
 	" Stare",
 	" Nowe",
 	" Wielkopolskie",
-	" Wzgórze",
+	" Wzg\xC3\xB3rze",
 	" Mosty",
 	" Kujawskie",
-	" Małopolskie",
+	" Ma\xC5\x82opolskie",
 	" Podlaskie",
-	" Leśne",
+	" Le\xC5\x9Bne",
 };
 
 static const char * const _name_czech_real[] = {
-	"Aš",
-	"Benešov",
+	"A\xC5\xA1",
+	"Bene\xC5\xA1ov",
 	"Beroun",
-	"Bezdružice",
+	"Bezdru\xC5\xBEice",
 	"Blansko",
-	"Břeclav",
+	"B\xC5\x99""eclav",
 	"Brno",
-	"Bruntál",
-	"Česká Lípa",
-	"České Budějovice",
-	"Český Krumlov",
-	"Děčín",
-	"Domažlice",
-	"Dubí",
-	"Frýdek-Místek",
-	"Havlíčkův Brod",
-	"Hodonín",
-	"Hradec Králové",
+	"Brunt\xC3\xA1l",
+	"\xC4\x8C""esk\xC3\xA1 L\xC3\xADpa",
+	"\xC4\x8C""esk\xC3\xA9 Bud\xC4\x9Bjovice",
+	"\xC4\x8C""esk\xC3\xBD Krumlov",
+	"D\xC4\x9B\xC4\x8D\xC3\xADn",
+	"Doma\xC5\xBElice",
+	"Dub\xC3\xAD",
+	"Fr\xC3\xBD""dek-M\xC3\xADstek",
+	"Havl\xC3\xAD\xC4\x8Dk\xC5\xAFv Brod",
+	"Hodon\xC3\xADn",
+	"Hradec Kr\xC3\xA1lov\xC3\xA9",
 	"Humpolec",
 	"Cheb",
 	"Chomutov",
 	"Chrudim",
 	"Jablonec nad Nisou",
-	"Jeseník",
-	"Jičín",
+	"Jesen\xC3\xADk",
+	"Ji\xC4\x8D\xC3\xADn",
 	"Jihlava",
-	"Jindřichův Hradec",
+	"Jind\xC5\x99ich\xC5\xAFv Hradec",
 	"Karlovy Vary",
-	"Karviná",
+	"Karvin\xC3\xA1",
 	"Kladno",
 	"Klatovy",
-	"Kolín",
+	"Kol\xC3\xADn",
 	"Kosmonosy",
-	"Kroměříž",
-	"Kutná Hora",
+	"Krom\xC4\x9B\xC5\x99\xC3\xAD\xC5\xBE",
+	"Kutn\xC3\xA1 Hora",
 	"Liberec",
-	"Litoměřice",
+	"Litom\xC4\x9B\xC5\x99ice",
 	"Louny",
-	"Manětín",
-	"Mělník",
-	"Mladá Boleslav",
+	"Man\xC4\x9Bt\xC3\xADn",
+	"M\xC4\x9Bln\xC3\xADk",
+	"Mlad\xC3\xA1 Boleslav",
 	"Most",
-	"Náchod",
-	"Nový Jičín",
+	"N\xC3\xA1""chod",
+	"Nov\xC3\xBD Ji\xC4\x8D\xC3\xADn",
 	"Nymburk",
 	"Olomouc",
 	"Opava",
-	"Oráčov",
+	"Or\xC3\xA1\xC4\x8Dov",
 	"Ostrava",
 	"Pardubice",
-	"Pelhřimov",
-	"Polžice",
-	"Písek",
-	"Plzeň",
+	"Pelh\xC5\x99imov",
+	"Pol\xC5\xBEice",
+	"P\xC3\xADsek",
+	"Plze\xC5\x88",
 	"Praha",
 	"Prachatice",
-	"Přerov",
-	"Příbram",
-	"Prostějov",
-	"Rakovník",
+	"P\xC5\x99""erov",
+	"P\xC5\x99\xC3\xAD""bram",
+	"Prost\xC4\x9Bjov",
+	"Rakovn\xC3\xADk",
 	"Rokycany",
-	"Rudná",
-	"Rychnov nad Kněžnou",
+	"Rudn\xC3\xA1",
+	"Rychnov nad Kn\xC4\x9B\xC5\xBEnou",
 	"Semily",
 	"Sokolov",
 	"Strakonice",
-	"Středokluky",
-	"Šumperk",
+	"St\xC5\x99""edokluky",
+	"\xC5\xA0umperk",
 	"Svitavy",
-	"Tábor",
+	"T\xC3\xA1""bor",
 	"Tachov",
 	"Teplice",
-	"Třebíč",
+	"T\xC5\x99""eb\xC3\xAD\xC4\x8D",
 	"Trutnov",
-	"Uherské Hradiště",
-	"Ústí nad Labem",
-	"Ústí nad Orlicí",
-	"Vsetín",
-	"Vyškov",
-	"Žďár nad Sázavou",
-	"Zlín",
+	"Uhersk\xC3\xA9 Hradi\xC5\xA1t\xC4\x9B",
+	"\xC3\x9Ast\xC3\xAD nad Labem",
+	"\xC3\x9Ast\xC3\xAD nad Orlic\xC3\xAD",
+	"Vset\xC3\xADn",
+	"Vy\xC5\xA1kov",
+	"\xC5\xBD\xC4\x8F\xC3\xA1r nad S\xC3\xA1zavou",
+	"Zl\xC3\xADn",
 	"Znojmo",
 };
 
@@ -1714,12 +1714,12 @@ enum CzechPattern {
  * by this.
  * XXX: [CZG_SMASC][CZP_PRIVL] needs special handling: -ovX -> -uv. */
 static const char * const _name_czech_patmod[][3] = {
-	/* CZG_SMASC */ { "í", "ý", "X" },
-	/* CZG_SFEM */  { "í", "á", "a" },
-	/* CZG_SNEUT */ { "í", "é", "o" },
-	/* CZG_PMASC */ { "í", "é", "y" },
-	/* CZG_PFEM */  { "í", "é", "y" },
-	/* CZG_PNEUT */ { "í", "á", "a" }
+	/* CZG_SMASC */ { "\xC3\xAD", "\xC3\xBD", "X" },
+	/* CZG_SFEM */  { "\xC3\xAD", "\xC3\xA1", "a" },
+	/* CZG_SNEUT */ { "\xC3\xAD", "\xC3\xA9", "o" },
+	/* CZG_PMASC */ { "\xC3\xAD", "\xC3\xA9", "y" },
+	/* CZG_PFEM */  { "\xC3\xAD", "\xC3\xA9", "y" },
+	/* CZG_PNEUT */ { "\xC3\xAD", "\xC3\xA1", "a" }
 };
 
 /* This way the substantives can choose only some adjectives/endings:
@@ -1759,52 +1759,52 @@ struct CzechNameAdj {
 
 /* Some of items which should be common are doubled. */
 static const CzechNameAdj _name_czech_adj[] = {
-	{ CZP_JARNI, CZC_ANY, "Horní" },
-	{ CZP_JARNI, CZC_ANY, "Horní" },
-	{ CZP_JARNI, CZC_ANY, "Dolní" },
-	{ CZP_JARNI, CZC_ANY, "Dolní" },
-	{ CZP_JARNI, CZC_ANY, "Přední" },
-	{ CZP_JARNI, CZC_ANY, "Zadní" },
-	{ CZP_JARNI, CZC_ANY, "Kostelní" },
-	{ CZP_JARNI, CZC_ANY, "Havraní" },
-	{ CZP_JARNI, CZC_ANY, "Říční" },
-	{ CZP_JARNI, CZC_ANY, "Jezerní" },
-	{ CZP_MLADY, CZC_ANY, "Velký" },
-	{ CZP_MLADY, CZC_ANY, "Velký" },
-	{ CZP_MLADY, CZC_ANY, "Malý" },
-	{ CZP_MLADY, CZC_ANY, "Malý" },
-	{ CZP_MLADY, CZC_ANY, "Vysoký" },
-	{ CZP_MLADY, CZC_ANY, "Český" },
-	{ CZP_MLADY, CZC_ANY, "Moravský" },
-	{ CZP_MLADY, CZC_ANY, "Slovácký" },
-	{ CZP_MLADY, CZC_ANY, "Slezský" },
-	{ CZP_MLADY, CZC_ANY, "Uherský" },
-	{ CZP_MLADY, CZC_ANY, "Starý" },
-	{ CZP_MLADY, CZC_ANY, "Starý" },
-	{ CZP_MLADY, CZC_ANY, "Nový" },
-	{ CZP_MLADY, CZC_ANY, "Nový" },
-	{ CZP_MLADY, CZC_ANY, "Mladý" },
-	{ CZP_MLADY, CZC_ANY, "Královský" },
-	{ CZP_MLADY, CZC_ANY, "Kamenný" },
-	{ CZP_MLADY, CZC_ANY, "Cihlový" },
-	{ CZP_MLADY, CZC_ANY, "Divný" },
-	{ CZP_MLADY, CZC_COLOR, "Červená" },
-	{ CZP_MLADY, CZC_COLOR, "Červená" },
-	{ CZP_MLADY, CZC_COLOR, "Červená" },
-	{ CZP_MLADY, CZC_COLOR, "Zelená" },
-	{ CZP_MLADY, CZC_COLOR, "Žlutá" },
-	{ CZP_MLADY, CZC_COLOR, "Sivá" },
-	{ CZP_MLADY, CZC_COLOR, "Šedá" },
-	{ CZP_MLADY, CZC_COLOR, "Bílá" },
-	{ CZP_MLADY, CZC_COLOR, "Bílá" },
-	{ CZP_MLADY, CZC_COLOR, "Modrá" },
-	{ CZP_MLADY, CZC_COLOR, "Růžová" },
-	{ CZP_MLADY, CZC_COLOR, "Černá" },
-	{ CZP_PRIVL, CZC_ANY, "Králova" },
+	{ CZP_JARNI, CZC_ANY, "Horn\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Horn\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Doln\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Doln\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "P\xC5\x99""edn\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Zadn\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Kosteln\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Havran\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "\xC5\x98\xC3\xAD\xC4\x8Dn\xC3\xAD" },
+	{ CZP_JARNI, CZC_ANY, "Jezern\xC3\xAD" },
+	{ CZP_MLADY, CZC_ANY, "Velk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Velk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Mal\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Mal\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Vysok\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "\xC4\x8C""esk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Moravsk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Slov\xC3\xA1""ck\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Slezsk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Uhersk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Star\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Star\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Nov\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Nov\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Mlad\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Kr\xC3\xA1lovsk\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Kamenn\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Cihlov\xC3\xBD" },
+	{ CZP_MLADY, CZC_ANY, "Divn\xC3\xBD" },
+	{ CZP_MLADY, CZC_COLOR, "\xC4\x8C""erven\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "\xC4\x8C""erven\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "\xC4\x8C""erven\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "Zelen\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "\xC5\xBDlut\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "Siv\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "\xC5\xA0""ed\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "B\xC3\xADl\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "B\xC3\xADl\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "Modr\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "R\xC5\xAF\xC5\xBEov\xC3\xA1" },
+	{ CZP_MLADY, CZC_COLOR, "\xC4\x8C""ern\xC3\xA1" },
+	{ CZP_PRIVL, CZC_ANY, "Kr\xC3\xA1lova" },
 	{ CZP_PRIVL, CZC_ANY, "Janova" },
 	{ CZP_PRIVL, CZC_ANY, "Karlova" },
-	{ CZP_PRIVL, CZC_ANY, "Kryštofova" },
-	{ CZP_PRIVL, CZC_ANY, "Jiříkova" },
+	{ CZP_PRIVL, CZC_ANY, "Kry\xC5\xA1tofova" },
+	{ CZP_PRIVL, CZC_ANY, "Ji\xC5\x99\xC3\xADkova" },
 	{ CZP_PRIVL, CZC_ANY, "Petrova" },
 	{ CZP_PRIVL, CZC_ANY, "Sudovo" },
 };
@@ -1814,17 +1814,17 @@ static const CzechNameSubst _name_czech_subst_full[] = {
 	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Sedlec" },
 	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
 	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
-	{ CZG_SMASC, CZA_ALL, CZC_NONE, "Úval" },
-	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Žďár" },
+	{ CZG_SMASC, CZA_ALL, CZC_NONE, "\xC3\x9Aval" },
+	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "\xC5\xBD\xC4\x8F\xC3\xA1r" },
 	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Smrk" },
 	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Hora" },
 	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Lhota" },
 	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Lhota" },
 	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Hlava" },
-	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Lípa" },
+	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "L\xC3\xADpa" },
 	{ CZG_SNEUT, CZA_ALL, CZC_COLOR, "Pole" },
-	{ CZG_SNEUT, CZA_ALL, CZC_COLOR, "Údolí" },
-	{ CZG_PMASC, CZA_ALL, CZC_NONE, "Úvaly" },
+	{ CZG_SNEUT, CZA_ALL, CZC_COLOR, "\xC3\x9A""dol\xC3\xAD" },
+	{ CZG_PMASC, CZA_ALL, CZC_NONE, "\xC3\x9Avaly" },
 	{ CZG_PFEM,  CZA_ALL, CZC_COLOR, "Luka" },
 	{ CZG_PNEUT, CZA_ALL, CZC_COLOR, "Pole" },
 };
@@ -1832,46 +1832,46 @@ static const CzechNameSubst _name_czech_subst_full[] = {
 /* TODO: More stems needed. --pasky */
 static const CzechNameSubst _name_czech_subst_stem[] = {
 	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Kostel" },
-	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Klášter" },
+	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Kl\xC3\xA1\xC5\xA1ter" },
 	{ CZG_SMASC, CZA_SHORT,                         CZC_COLOR, "Lhot" },
 	{ CZG_SFEM,  CZA_SHORT,                         CZC_COLOR, "Lhot" },
 	{ CZG_SFEM,  CZA_SHORT,                         CZC_COLOR, "Hur" },
 	{ CZG_FREE,              CZA_MIDDLE | CZA_LONG, CZC_NONE, "Sedl" },
 	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_COLOR, "Hrad" },
 	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Pras" },
-	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Baž" },
+	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Ba\xC5\xBE" },
 	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Tes" },
-	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Už" },
-	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_POSTFIX, "Bř" },
+	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "U\xC5\xBE" },
+	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_POSTFIX, "B\xC5\x99" },
 	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_NONE, "Vod" },
 	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_NONE, "Jan" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Prach" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Kunr" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Strak" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Vít" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Vyš" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Žat" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Žer" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Střed" },
+	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "V\xC3\xADt" },
+	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Vy\xC5\xA1" },
+	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "\xC5\xBD""at" },
+	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "\xC5\xBD""er" },
+	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "St\xC5\x99""ed" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Harv" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Pruh" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Tach" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Písn" },
+	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "P\xC3\xADsn" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Jin" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Jes" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Jar" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Sok" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Hod" },
 	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Net" },
-	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Praž" },
+	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Pra\xC5\xBE" },
 	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Nerat" },
 	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Kral" },
 	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Hut" },
 	{ CZG_FREE,                           CZA_LONG, CZC_NOPOSTFIX, "Pan" },
-	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_NOPOSTFIX, "Odstřed" },
+	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_NOPOSTFIX, "Odst\xC5\x99""ed" },
 	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_COLOR, "Mrat" },
 	{ CZG_FREE,                           CZA_LONG, CZC_COLOR, "Hlav" },
-	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE,            CZC_NONE, "Měř" },
+	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE,            CZC_NONE, "M\xC4\x9B\xC5\x99" },
 	{ CZG_FREE,              CZA_MIDDLE | CZA_LONG, CZC_NONE, "Lip" },
 };
 
@@ -1885,47 +1885,47 @@ static const char * const _name_czech_subst_postfix[] = {
 /* This array must have the both neutral genders at the end! */
 static const CzechNameSubst _name_czech_subst_ending[] = {
 	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "ec" },
-	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "ín" },
+	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "\xC3\xADn" },
 	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "ov" },
 	{ CZG_SMASC, CZA_SHORT       |        CZA_LONG, CZC_ANY, "kov" },
-	{ CZG_SMASC,                          CZA_LONG, CZC_POSTFIX, "ín" },
-	{ CZG_SMASC,                          CZA_LONG, CZC_POSTFIX, "ník" },
+	{ CZG_SMASC,                          CZA_LONG, CZC_POSTFIX, "\xC3\xADn" },
+	{ CZG_SMASC,                          CZA_LONG, CZC_POSTFIX, "n\xC3\xADk" },
 	{ CZG_SMASC,                          CZA_LONG, CZC_ANY, "burk" },
 	{ CZG_SFEM,  CZA_SHORT,                         CZC_ANY, "ka" },
 	{ CZG_SFEM,              CZA_MIDDLE,            CZC_ANY, "inka" },
-	{ CZG_SFEM,              CZA_MIDDLE,            CZC_ANY, "ná" },
+	{ CZG_SFEM,              CZA_MIDDLE,            CZC_ANY, "n\xC3\xA1" },
 	{ CZG_SFEM,                           CZA_LONG, CZC_ANY, "ava" },
-	{ CZG_PMASC,                          CZA_LONG, CZC_POSTFIX, "íky" },
+	{ CZG_PMASC,                          CZA_LONG, CZC_POSTFIX, "\xC3\xADky" },
 	{ CZG_PMASC,                          CZA_LONG, CZC_ANY, "upy" },
 	{ CZG_PMASC,                          CZA_LONG, CZC_ANY, "olupy" },
 	{ CZG_PFEM,                           CZA_LONG, CZC_ANY, "avy" },
 	{ CZG_PFEM,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "ice" },
-	{ CZG_PFEM,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "ičky" },
+	{ CZG_PFEM,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "i\xC4\x8Dky" },
 	{ CZG_PNEUT, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "na" },
 	{ CZG_SNEUT, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "no" },
-	{ CZG_SNEUT,                          CZA_LONG, CZC_ANY, "iště" },
+	{ CZG_SNEUT,                          CZA_LONG, CZC_ANY, "i\xC5\xA1t\xC4\x9B" },
 };
 
 static const char * const _name_czech_suffix[] = {
 	"nad Cidlinou",
-	"nad Dyjí",
+	"nad Dyj\xC3\xAD",
 	"nad Jihlavou",
 	"nad Labem",
 	"nad Lesy",
 	"nad Moravou",
 	"nad Nisou",
 	"nad Odrou",
-	"nad Ostravicí",
-	"nad Sázavou",
+	"nad Ostravic\xC3\xAD",
+	"nad S\xC3\xA1zavou",
 	"nad Vltavou",
-	"pod Pradědem",
-	"pod Radhoštěm",
-	"pod Řípem",
-	"pod Sněžkou",
-	"pod Špičákem",
+	"pod Prad\xC4\x9B""dem",
+	"pod Radho\xC5\xA1t\xC4\x9Bm",
+	"pod \xC5\x98\xC3\xADpem",
+	"pod Sn\xC4\x9B\xC5\xBEkou",
+	"pod \xC5\xA0pi\xC4\x8D\xC3\xA1kem",
 	"pod Sedlem",
-	"v Čechách",
-	"na Moravě",
+	"v \xC4\x8C""ech\xC3\xA1""ch",
+	"na Morav\xC4\x9B",
 };
 
 
@@ -1935,24 +1935,24 @@ static const char * const _name_romanian_real[] = {
 	"Alba Iulia",
 	"Alexandria",
 	"Babadag",
-	"Bacãu",
+	"Bac\xC3\xA3u",
 	"Baia Mare",
-	"Bãile Herculane",
-	"Bãilesti",
-	"Bârlad",
+	"B\xC3\xA3ile Herculane",
+	"B\xC3\xA3ilesti",
+	"B\xC3\xA2rlad",
 	"Bicaz",
 	"Bistrita",
 	"Blaj",
 	"Borsec",
 	"Botosani",
-	"Brãila",
+	"Br\xC3\xA3ila",
 	"Brasov",
 	"Bucuresti",
 	"Buftea",
-	"Buzãu",
-	"Cãlãrasi",
+	"Buz\xC3\xA3u",
+	"C\xC3\xA3l\xC3\xA3rasi",
 	"Caransebes",
-	"Cernavodã",
+	"Cernavod\xC3\xA3",
 	"Cluj-Napoca",
 	"Constanta",
 	"Covasna",
@@ -1961,29 +1961,29 @@ static const char * const _name_romanian_real[] = {
 	"Deva",
 	"Dorohoi",
 	"Dr.-Tr. Severin",
-	"Drãgãsani",
-	"Fãgãras",
-	"Fãlticeni",
+	"Dr\xC3\xA3g\xC3\xA3sani",
+	"F\xC3\xA3g\xC3\xA3ras",
+	"F\xC3\xA3lticeni",
 	"Fetesti",
 	"Focsani",
 	"Galati",
 	"Gheorgheni",
 	"Giurgiu",
-	"Hârsova",
+	"H\xC3\xA2rsova",
 	"Hunedoara",
 	"Husi",
 	"Iasi",
 	"Isaccea",
 	"Lugoj",
-	"Mãcin",
+	"M\xC3\xA3""cin",
 	"Mangalia",
 	"Medgidia",
 	"Medias",
 	"Miercurea Ciuc",
 	"Mizil",
 	"Motru",
-	"Nãsãud",
-	"Nãvodari",
+	"N\xC3\xA3s\xC3\xA3ud",
+	"N\xC3\xA3vodari",
 	"Odobesti",
 	"Oltenita",
 	"Onesti",
@@ -1994,14 +1994,14 @@ static const char * const _name_romanian_real[] = {
 	"Pitesti",
 	"Ploiesti",
 	"Predeal",
-	"Râmnicu Vâlcea",
+	"R\xC3\xA2mnicu V\xC3\xA2lcea",
 	"Reghin",
 	"Resita",
 	"Roman",
 	"Rosiorii de Vede",
 	"Satu Mare",
 	"Sebes",
-	"Sfântu Gheorghe",
+	"Sf\xC3\xA2ntu Gheorghe",
 	"Sibiu",
 	"Sighisoara",
 	"Sinaia",
@@ -2010,21 +2010,21 @@ static const char * const _name_romanian_real[] = {
 	"Sovata",
 	"Suceava",
 	"Sulina",
-	"Tãndãrei",
-	"Târgoviste",
-	"Târgu Jiu",
-	"Târgu Mures",
+	"T\xC3\xA3nd\xC3\xA3rei",
+	"T\xC3\xA2rgoviste",
+	"T\xC3\xA2rgu Jiu",
+	"T\xC3\xA2rgu Mures",
 	"Tecuci",
 	"Timisoara",
 	"Tulcea",
 	"Turda",
-	"Turnu Mãgurele",
+	"Turnu M\xC3\xA3gurele",
 	"Urziceni",
 	"Vaslui",
 	"Vatra Dornei",
 	"Victoria",
 	"Videle",
-	"Zalãu",
+	"Zal\xC3\xA3u",
 };
 
 static const char * const _name_slovak_real[] = {
@@ -2120,12 +2120,12 @@ static const char * const _name_slovak_real[] = {
 static const char * const _name_norwegian_1[] = {
 	"Arna",
 	"Aust",
-	"Bjørk",
-	"Bjørn",
+	"Bj\xC3\xB8rk",
+	"Bj\xC3\xB8rn",
 	"Brand",
-	"Bøver",
+	"B\xC3\xB8ver",
 	"Drag",
-	"Drø",
+	"Dr\xC3\xB8",
 	"Eids",
 	"Egge",
 	"Fager",
@@ -2138,12 +2138,12 @@ static const char * const _name_norwegian_1[] = {
 	"Gaus",
 	"Galte",
 	"Geir",
-	"Gløs",
+	"Gl\xC3\xB8s",
 	"Gran",
 	"Grind",
 	"Grims",
-	"Grøn",
-	"Grøt",
+	"Gr\xC3\xB8n",
+	"Gr\xC3\xB8t",
 	"Gulle",
 	"Haka",
 	"Hammer",
@@ -2158,7 +2158,7 @@ static const char * const _name_norwegian_1[] = {
 	"Kjerring",
 	"Knatte",
 	"Krok",
-	"Køy",
+	"K\xC3\xB8y",
 	"Lang",
 	"Lauv",
 	"Leir",
@@ -2166,7 +2166,7 @@ static const char * const _name_norwegian_1[] = {
 	"Logn",
 	"Lo",
 	"Lyng",
-	"Løn",
+	"L\xC3\xB8n",
 	"Mesna",
 	"Mel",
 	"Mo",
@@ -2186,9 +2186,9 @@ static const char * const _name_norwegian_1[] = {
 	"Sel",
 	"Sol",
 	"Sjur",
-	"Skår",
-	"Slått",
-	"Stjør",
+	"Sk\xC3\xA5r",
+	"Sl\xC3\xA5tt",
+	"Stj\xC3\xB8r",
 	"Stor",
 	"Svart",
 	"Svens",
@@ -2201,7 +2201,7 @@ static const char * const _name_norwegian_1[] = {
 	"Vest",
 	"Vesle",
 	"Vik",
-	"Våg",
+	"V\xC3\xA5g",
 };
 
 static const char * const _name_norwegian_2[] = {
@@ -2216,7 +2216,7 @@ static const char * const _name_norwegian_2[] = {
 	"bugen",
 	"by",
 	"bygd",
-	"bø",
+	"b\xC3\xB8",
 	"dal",
 	"egga",
 	"eid",
@@ -2234,10 +2234,10 @@ static const char * const _name_norwegian_2[] = {
 	"heim",
 	"hella",
 	"hovda",
-	"høa",
-	"høgda",
+	"h\xC3\xB8""a",
+	"h\xC3\xB8gda",
 	"kampen",
-	"kjølen",
+	"kj\xC3\xB8len",
 	"kollen",
 	"kroken",
 	"land",
@@ -2252,7 +2252,7 @@ static const char * const _name_norwegian_2[] = {
 	"rud",
 	"sand",
 	"set",
-	"sjøen",
+	"sj\xC3\xB8""en",
 	"skogen",
 	"slette",
 	"snipa",
@@ -2261,7 +2261,7 @@ static const char * const _name_norwegian_2[] = {
 	"stulen",
 	"sund",
 	"svingen",
-	"sætra",
+	"s\xC3\xA6tra",
 	"tinden",
 	"tun",
 	"vang",
@@ -2269,9 +2269,9 @@ static const char * const _name_norwegian_2[] = {
 	"veid",
 	"vik",
 	"voll",
-	"våg",
+	"v\xC3\xA5g",
 	"um",
-	"åsen",
+	"\xC3\xA5sen",
 };
 
 static const char * const _name_norwegian_real[] = {
@@ -2279,12 +2279,12 @@ static const char * const _name_norwegian_real[] = {
 	"Arendal",
 	"Askim",
 	"Bergen",
-	"Bodø",
+	"Bod\xC3\xB8",
 	"Brevik",
 	"Bryne",
-	"Brønnøysund",
+	"Br\xC3\xB8nn\xC3\xB8ysund",
 	"Drammen",
-	"Drøbak",
+	"Dr\xC3\xB8""bak",
 	"Egersund",
 	"Elverum",
 	"Farsund",
@@ -2292,10 +2292,10 @@ static const char * const _name_norwegian_real[] = {
 	"Finnsnes",
 	"Flekkefjord",
 	"Flora",
-	"Fosnavåg",
+	"Fosnav\xC3\xA5g",
 	"Fredrikstad",
-	"Førde",
-	"Gjøvik",
+	"F\xC3\xB8rde",
+	"Gj\xC3\xB8vik",
 	"Grimstad",
 	"Halden",
 	"Hamar",
@@ -2304,13 +2304,13 @@ static const char * const _name_norwegian_real[] = {
 	"Haugesund",
 	"Holmestrand",
 	"Horten",
-	"Jørpeland",
+	"J\xC3\xB8rpeland",
 	"Kirkenes",
 	"Kolvereid",
 	"Kongsberg",
 	"Kongsvinger",
 	"Kopervik",
-	"Kragerø",
+	"Krager\xC3\xB8",
 	"Kristiansand",
 	"Kristiansund",
 	"Langesund",
@@ -2320,16 +2320,16 @@ static const char * const _name_norwegian_real[] = {
 	"Levanger",
 	"Lillehammer",
 	"Lillesand",
-	"Lillestrøm",
+	"Lillestr\xC3\xB8m",
 	"Lyngdal",
-	"Lørenskog",
+	"L\xC3\xB8renskog",
 	"Mandal",
 	"Mo i Rana",
 	"Molde",
-	"Mosjøen",
+	"Mosj\xC3\xB8""en",
 	"Moss",
 	"Mysen",
-	"Måløy",
+	"M\xC3\xA5l\xC3\xB8y",
 	"Namsos",
 	"Narvik",
 	"Notodden",
@@ -2338,11 +2338,11 @@ static const char * const _name_norwegian_real[] = {
 	"Otta",
 	"Porsgrunn",
 	"Ringerike",
-	"Risør",
+	"Ris\xC3\xB8r",
 	"Rjukan",
 	"Sandefjord",
 	"Sandnes",
-	"Sandnessjøen",
+	"Sandnessj\xC3\xB8""en",
 	"Sandvika",
 	"Sarpsborg",
 	"Sauda",
@@ -2353,152 +2353,152 @@ static const char * const _name_norwegian_real[] = {
 	"Stathelle",
 	"Stavanger",
 	"Steinkjer",
-	"Stjørdal",
+	"Stj\xC3\xB8rdal",
 	"Stokmarknes",
 	"Stord",
 	"Svelvik",
-	"Svolvær",
-	"Tromsø",
+	"Svolv\xC3\xA6r",
+	"Troms\xC3\xB8",
 	"Trondheim",
 	"Tvedestrand",
-	"Tønsberg",
+	"T\xC3\xB8nsberg",
 	"Ulsteinvik",
-	"Vadsø",
-	"Vardø",
-	"Verdalsøra",
-	"Åkrehamn",
-	"Ålesund",
-	"Åndalsnes",
+	"Vads\xC3\xB8",
+	"Vard\xC3\xB8",
+	"Verdals\xC3\xB8ra",
+	"\xC3\x85krehamn",
+	"\xC3\x85lesund",
+	"\xC3\x85ndalsnes",
 };
 
 static const char * const _name_hungarian_1[] = {
 	"Nagy-",
 	"Kis-",
-	"Felső-",
-	"Alsó-",
-	"Új-",
+	"Fels\xC5\x91-",
+	"Als\xC3\xB3-",
+	"\xC3\x9Aj-",
 };
 
 static const char * const _name_hungarian_2[] = {
 	"Bodrog",
-	"Dráva",
+	"Dr\xC3\xA1va",
 	"Duna",
-	"Hejő",
-	"Hernád",
-	"Rába",
-	"Sajó",
+	"Hej\xC5\x91",
+	"Hern\xC3\xA1""d",
+	"R\xC3\xA1""ba",
+	"Saj\xC3\xB3",
 	"Szamos",
 	"Tisza",
 	"Zala",
 	"Balaton",
-	"Fertő",
+	"Fert\xC5\x91",
 	"Bakony",
-	"Cserhát",
+	"Cserh\xC3\xA1t",
 	"Bihar",
-	"Hajdú",
-	"Jász",
+	"Hajd\xC3\xBA",
+	"J\xC3\xA1sz",
 	"Kun",
 	"Magyar",
-	"Nógrád",
-	"Nyír",
+	"N\xC3\xB3gr\xC3\xA1""d",
+	"Ny\xC3\xADr",
 	"Somogy",
-	"Székely",
+	"Sz\xC3\xA9kely",
 	"Buda",
-	"Győr",
+	"Gy\xC5\x91r",
 	"Pest",
-	"Fehér",
-	"Cserép",
-	"Erdő",
+	"Feh\xC3\xA9r",
+	"Cser\xC3\xA9p",
+	"Erd\xC5\x91",
 	"Hegy",
 	"Homok",
-	"Mező",
+	"Mez\xC5\x91",
 	"Puszta",
-	"Sár",
-	"Császár",
+	"S\xC3\xA1r",
+	"Cs\xC3\xA1sz\xC3\xA1r",
 	"Herceg",
-	"Király",
+	"Kir\xC3\xA1ly",
 	"Nemes",
-	"Püspök",
+	"P\xC3\xBCsp\xC3\xB6k",
 	"Szent",
-	"Almás",
-	"Szilvás",
+	"Alm\xC3\xA1s",
+	"Szilv\xC3\xA1s",
 	"Agg",
 	"Aranyos",
-	"Békés",
-	"Egyházas",
+	"B\xC3\xA9k\xC3\xA9s",
+	"Egyh\xC3\xA1zas",
 	"Gagy",
 	"Heves",
 	"Kapos",
-	"Tápió",
+	"T\xC3\xA1pi\xC3\xB3",
 	"Torna",
 	"Vas",
-	"Vámos",
-	"Vásáros",
+	"V\xC3\xA1mos",
+	"V\xC3\xA1s\xC3\xA1ros",
 };
 
 static const char * const _name_hungarian_3[] = {
-	"apáti",
-	"bába",
+	"ap\xC3\xA1ti",
+	"b\xC3\xA1""ba",
 	"bikk",
 	"dob",
 	"fa",
-	"föld",
+	"f\xC3\xB6ld",
 	"hegyes",
 	"kak",
 	"kereszt",
-	"kürt",
-	"ladány",
-	"mérges",
+	"k\xC3\xBCrt",
+	"lad\xC3\xA1ny",
+	"m\xC3\xA9rges",
 	"szalonta",
 	"telek",
 	"vas",
-	"völgy",
+	"v\xC3\xB6lgy",
 };
 
 static const char * const _name_hungarian_4[] = {
 	"alja",
-	"egyháza",
-	"háza",
-	"úr",
-	"vár",
+	"egyh\xC3\xA1za",
+	"h\xC3\xA1za",
+	"\xC3\xBAr",
+	"v\xC3\xA1r",
 };
 
 static const char * const _name_hungarian_real[] = {
 	"Ajka",
-	"Aszód",
+	"Asz\xC3\xB3""d",
 	"Badacsony",
 	"Baja",
 	"Budapest",
 	"Debrecen",
 	"Eger",
-	"Fonyód",
-	"Gödöllő",
-	"Győr",
+	"Fony\xC3\xB3""d",
+	"G\xC3\xB6""d\xC3\xB6ll\xC5\x91",
+	"Gy\xC5\x91r",
 	"Gyula",
 	"Karcag",
-	"Kecskemét",
+	"Kecskem\xC3\xA9t",
 	"Keszthely",
-	"Kisköre",
+	"Kisk\xC3\xB6re",
 	"Kocsord",
-	"Komárom",
-	"Kőszeg",
-	"Makó",
-	"Mohács",
+	"Kom\xC3\xA1rom",
+	"K\xC5\x91szeg",
+	"Mak\xC3\xB3",
+	"Moh\xC3\xA1""cs",
 	"Miskolc",
-	"Ózd",
+	"\xC3\x93zd",
 	"Paks",
-	"Pápa",
-	"Pécs",
-	"Polgár",
+	"P\xC3\xA1pa",
+	"P\xC3\xA9""cs",
+	"Polg\xC3\xA1r",
 	"Sarkad",
-	"Siófok",
+	"Si\xC3\xB3""fok",
 	"Szeged",
 	"Szentes",
 	"Szolnok",
 	"Tihany",
 	"Tokaj",
-	"Vác",
-	"Záhony",
+	"V\xC3\xA1""c",
+	"Z\xC3\xA1hony",
 	"Zirc",
 };
 
@@ -2509,7 +2509,7 @@ static const char * const _name_swiss_real[] = {
 	"Arosa",
 	"Appenzell",
 	"Arbon",
-	"Altstätten",
+	"Altst\xC3\xA4tten",
 	"Baar",
 	"Baden",
 	"Bellinzona",
@@ -2520,20 +2520,20 @@ static const char * const _name_swiss_real[] = {
 	"Burgdorf",
 	"Bern",
 	"Basel",
-	"Bülach",
+	"B\xC3\xBClach",
 	"Carouge",
 	"Cham",
 	"Chiasso",
 	"Chur",
 	"Davos",
-	"Delémont",
+	"Del\xC3\xA9mont",
 	"Dietikon",
-	"Dübendorf",
+	"D\xC3\xBC""bendorf",
 	"Emmen",
-	"Freienbach-Pfäffikon",
+	"Freienbach-Pf\xC3\xA4""ffikon",
 	"Fribourg",
 	"Frauenfeld",
-	"Genève",
+	"Gen\xC3\xA8ve",
 	"Glarus",
 	"Gossau",
 	"Grenchen",
@@ -2545,9 +2545,9 @@ static const char * const _name_swiss_real[] = {
 	"Jona",
 	"Kriens",
 	"Kloten",
-	"Köniz",
+	"K\xC3\xB6niz",
 	"Kreuzlingen",
-	"Küsnacht",
+	"K\xC3\xBCsnacht",
 	"Agen",
 	"Lancy",
 	"La Chaux-de-Fonds",
@@ -2564,7 +2564,7 @@ static const char * const _name_swiss_real[] = {
 	"Lyss",
 	"Luzern",
 	"Martigny",
-	"Münchenstein",
+	"M\xC3\xBCnchenstein",
 	"Meyrin",
 	"Montreux",
 	"Monthey",
@@ -2572,7 +2572,7 @@ static const char * const _name_swiss_real[] = {
 	"Murten",
 	"Moutier",
 	"Muttenz",
-	"Neuchâtel",
+	"Neuch\xC3\xA2tel",
 	"Neuhausen am Rheinfall",
 	"Nyon",
 	"Olten",
@@ -2601,7 +2601,7 @@ static const char * const _name_swiss_real[] = {
 	"St. Moritz",
 	"Sion",
 	"Spiez",
-	"Stäfa",
+	"St\xC3\xA4""fa",
 	"Sursee",
 	"Schwyz",
 	"Thalwil",
@@ -2613,7 +2613,7 @@ static const char * const _name_swiss_real[] = {
 	"Volketswil",
 	"Versoix",
 	"Vevey",
-	"Wädenswil",
+	"W\xC3\xA4""denswil",
 	"Wettingen",
 	"Wil",
 	"Wallisellen",
@@ -2624,7 +2624,7 @@ static const char * const _name_swiss_real[] = {
 	"Yverdon-les-Bains",
 	"Zollikon",
 	"Zofingen",
-	"Zürich",
+	"Z\xC3\xBCrich",
 	"Zug",
 };
 
@@ -2634,12 +2634,12 @@ static const char * const _name_danish_1[] = {
 	"Nye ",
 	"Store ",
 	"Kirke ",
-	"Nørre ",
+	"N\xC3\xB8rre ",
 	"Vester ",
-	"Sønder ",
-	"Øster ",
+	"S\xC3\xB8nder ",
+	"\xC3\x98ster ",
 	"Hvide ",
-	"Høje ",
+	"H\xC3\xB8je ",
 	"Kongens ",
 };
 
@@ -2651,7 +2651,7 @@ static const char * const _name_danish_2[] = {
 	"Bede",
 	"Birke",
 	"Bjerring",
-	"Bjæver",
+	"Bj\xC3\xA6ver",
 	"Blommens",
 	"Blok",
 	"Bolder",
@@ -2664,7 +2664,7 @@ static const char * const _name_danish_2[] = {
 	"Fredens",
 	"Frederiks",
 	"Fugle",
-	"Fåre",
+	"F\xC3\xA5re",
 	"Gille",
 	"Gis",
 	"Givs",
@@ -2681,11 +2681,11 @@ static const char * const _name_danish_2[] = {
 	"Hol",
 	"Horn",
 	"Humle",
-	"Høj",
-	"Hør",
+	"H\xC3\xB8j",
+	"H\xC3\xB8r",
 	"Is",
 	"Jyde",
-	"Jægers",
+	"J\xC3\xA6gers",
 	"Karls",
 	"Klov",
 	"Kokke",
@@ -2697,24 +2697,24 @@ static const char * const _name_danish_2[] = {
 	"Ny",
 	"Oks",
 	"Ring",
-	"Røde",
+	"R\xC3\xB8""de",
 	"Rung",
-	"Rør",
+	"R\xC3\xB8r",
 	"Rud",
 	"Saks",
 	"Salt",
 	"Skam",
 	"Silke",
 	"Skod",
-	"Skæl",
-	"Skær",
+	"Sk\xC3\xA6l",
+	"Sk\xC3\xA6r",
 	"Sol",
 	"Svend",
 	"Svine",
 	"Strand",
 	"Stubbe",
 	"Ting",
-	"Tjære",
+	"Tj\xC3\xA6re",
 	"Tore",
 	"Uger",
 	"Ulf",
@@ -2722,9 +2722,9 @@ static const char * const _name_danish_2[] = {
 	"Vand",
 	"Vej",
 	"Vor",
-	"Vær",
-	"Ør",
-	"Ål",
+	"V\xC3\xA6r",
+	"\xC3\x98r",
+	"\xC3\x85l",
 };
 
 static const char * const _name_danish_3[] = {
@@ -2737,21 +2737,21 @@ static const char * const _name_danish_3[] = {
 	"strup",
 	"holm",
 	"hus",
-	"købing",
+	"k\xC3\xB8""bing",
 	"lund",
 	"lunde",
 	"sund",
 	"ovre",
-	"høj",
+	"h\xC3\xB8j",
 	"dal",
 	"sted",
 	"sten",
-	"løse",
-	"rød",
+	"l\xC3\xB8se",
+	"r\xC3\xB8""d",
 	"magle",
-	"sø",
+	"s\xC3\xB8",
 	"bjerg",
-	"bæk",
+	"b\xC3\xA6k",
 	"drup",
 	"lev",
 	"bo",
@@ -2761,32 +2761,32 @@ static const char * const _name_danish_3[] = {
 };
 
 static const char * const _name_turkish_prefix[] = {
-	"Akça",
-	"Altın",
-	"Bahçe",
+	"Ak\xC3\xA7""a",
+	"Alt\xC4\xB1n",
+	"Bah\xC3\xA7""e",
 	"Boz",
-	"Büyük",
-	"Çay",
-	"Doğu",
+	"B\xC3\xBCy\xC3\xBCk",
+	"\xC3\x87""ay",
+	"Do\xC4\x9Fu",
 	"Eski",
-	"Güzel",
-	"Kızıl",
-	"Küçük",
+	"G\xC3\xBCzel",
+	"K\xC4\xB1z\xC4\xB1l",
+	"K\xC3\xBC\xC3\xA7\xC3\xBCk",
 	"Orta",
-	"Sarı",
+	"Sar\xC4\xB1",
 	"Sultan",
 	"Ulu",
 	"Yeni",
 };
 
 static const char * const _name_turkish_middle[] = {
-	"agaç",
+	"aga\xC3\xA7",
 	"ayva",
-	"çam",
+	"\xC3\xA7""am",
 	"elma",
 	"kurt",
 	"pazar",
-	"yalı",
+	"yal\xC4\xB1",
 };
 
 static const char * const _name_turkish_suffix[] = {
@@ -2795,10 +2795,10 @@ static const char * const _name_turkish_suffix[] = {
 	"kale",
 	"kaya",
 	"kent",
-	"köy",
+	"k\xC3\xB6y",
 	"ova",
-	"özü",
-	"ören",
+	"\xC3\xB6z\xC3\xBC",
+	"\xC3\xB6ren",
 	"pazar",
 	"saray",
 	"tepe",
@@ -2808,48 +2808,48 @@ static const char * const _name_turkish_suffix[] = {
 
 static const char * const _name_turkish_real[] = {
 	"Adana",
-	"Adıyaman",
+	"Ad\xC4\xB1yaman",
 	"Afyon",
-	"Ağrı",
+	"A\xC4\x9Fr\xC4\xB1",
 	"Amasya",
 	"Antalya",
 	"Artvin",
-	"Balıkesir",
+	"Bal\xC4\xB1kesir",
 	"Bilecik",
 	"Bitlis",
 	"Bolu",
 	"Burdur",
 	"Bursa",
-	"Çanakkale",
-	"Çankırı",
+	"\xC3\x87""anakkale",
+	"\xC3\x87""ank\xC4\xB1r\xC4\xB1",
 	"Denizli",
-	"Diyarbakır",
+	"Diyarbak\xC4\xB1r",
 	"Edirne",
-	"Elazığ",
+	"Elaz\xC4\xB1\xC4\x9F",
 	"Erzurum",
 	"Eskisehir",
 	"Giresun",
-	"Gümüşhane",
+	"G\xC3\xBCm\xC3\xBC\xC5\x9Fhane",
 	"Hatay",
 	"Isparta",
-	"İçel",
-	"İstanbul",
-	"İzmir",
+	"\xC4\xB0\xC3\xA7""el",
+	"\xC4\xB0stanbul",
+	"\xC4\xB0zmir",
 	"Kars",
 	"Kastamonu",
 	"Kayseri",
 	"Kirklareli",
 	"Kocaeli",
 	"Konya",
-	"Kütahya",
+	"K\xC3\xBCtahya",
 	"Malatya",
 	"Manisa",
-	"Kahramanmaraş",
+	"Kahramanmara\xC5\x9F",
 	"Mardin",
-	"Muğla",
-	"Muş",
-	"Nevşehir",
-	"Niğde",
+	"Mu\xC4\x9Fla",
+	"Mu\xC5\x9F",
+	"Nev\xC5\x9F""ehir",
+	"Ni\xC4\x9F""de",
 	"Rize",
 	"Sakarya",
 	"Samsun",
@@ -2857,21 +2857,21 @@ static const char * const _name_turkish_real[] = {
 	"Sinop",
 	"Sivas",
 	"Trabzon",
-	"Şanlıurfa",
+	"\xC5\x9E""anl\xC4\xB1urfa",
 	"Van",
 	"Yozgat",
 	"Zonguldak",
 	"Aksaray",
 	"Bayburt",
 	"Karaman",
-	"Şırnak",
-	"Bartın",
+	"\xC5\x9E\xC4\xB1rnak",
+	"Bart\xC4\xB1n",
 	"Ardahan",
-	"Iğdır",
+	"I\xC4\x9F""d\xC4\xB1r",
 	"Yalova",
-	"Karabük",
+	"Karab\xC3\xBCk",
 	"Osmaniye",
-	"Düzce",
+	"D\xC3\xBCzce",
 };
 
 static const char * const _name_italian_real[] = {
@@ -3163,7 +3163,7 @@ static const char * const _name_catalan_real[] = {
 	"Banyoles",
 	"Figueres",
 	"Balaguer",
-	"Vilafranca del Penedès",
+	"Vilafranca del Pened\xC3\xA8s",
 	"La seu d'Urgell",
 	"Pont de Suert",
 	"Igualada",
@@ -3179,21 +3179,21 @@ static const char * const _name_catalan_real[] = {
 	"Ripoll",
 	"Cervera",
 	"Gandesa",
-	"Mataró",
+	"Matar\xC3\xB3",
 	"Montblanc",
-	"Vilanova i la Geltrú",
-	"Tàrrega",
+	"Vilanova i la Geltr\xC3\xBA",
+	"T\xC3\xA0rrega",
 	"Camprodon",
-	"Campdevànol",
+	"Campdev\xC3\xA0nol",
 	"Cambrils",
 	"Begur",
 	"Set Cases",
 	"Palafrugell",
 	"Begues",
 	"El Bruc",
-	"Cadaqués",
-	"Collbató",
-	"Cervelló",
+	"Cadaqu\xC3\xA9s",
+	"Collbat\xC3\xB3",
+	"Cervell\xC3\xB3",
 	"Esparraguera",
 	"Abrera",
 	"Alp",
@@ -3204,7 +3204,7 @@ static const char * const _name_catalan_real[] = {
 	"Molins de rei",
 	"Monistrol",
 	"Rocallaura",
-	"Rubí",
+	"Rub\xC3\xAD",
 	"Ripollet",
 	"Sitges",
 	"Roses",
@@ -3234,14 +3234,14 @@ static const char * const _name_catalan_pref[] = {
 	"Sant Joan de ",
 	"Sant Feliu de ",
 	"Sant Quirze de ",
-	"Sant Sadurní de ",
+	"Sant Sadurn\xC3\xAD de ",
 	"Santa Coloma de ",
 	"Santa Margarida de ",
 	"Santa Maria de ",
-	"Sant Martí de ",
+	"Sant Mart\xC3\xAD de ",
 	"Sant Pere de ",
-	"Sant Julià de ",
-	"Sant Vicenç de ",
+	"Sant Juli\xC3\xA0 de ",
+	"Sant Vicen\xC3\xA7 de ",
 
 };
 
@@ -3270,7 +3270,7 @@ static const char * const _name_catalan_2m[] = {
 	"baix",
 	"fosc",
 	"pelat",
-	"ventós",
+	"vent\xC3\xB3s",
 	"negre",
 	"roig",
 	"gris",
@@ -3288,14 +3288,14 @@ static const char * const _name_catalan_2f[] = {
 };
 
 static const char * const _name_catalan_3[] = {
-	" despí",
+	" desp\xC3\xAD",
 	" desvern",
-	" del camí",
+	" del cam\xC3\xAD",
 	" de Mar",
 	" de Dalt",
 	" de Baix",
-	" del Vallès",
-	" de Berguedà",
+	" del Vall\xC3\xA8s",
+	" de Bergued\xC3\xA0",
 	" de Conflent",
 	" de la plana",
 };
@@ -3306,5 +3306,5 @@ static const char * const _name_catalan_river1[] = {
 	" de Llobregat",
 	" d'Ebre",
 	" de Segre",
-	" de Francolí",
+	" de Francol\xC3\xAD",
 };