dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2019-01-29 02:28:14 +00:00
parent 37adf9be4a 310fa1af88
commit 281d346fe2
101 changed files with 8211 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/table/townname.h
View File

@@ -762,7 +762,7 @@ static const char * const _name_french_real[] = {
"Blois",
"Troyes",
"Charolles",
"Grenoble",
"Toulouse",
"Chamb\xC3\xA9ry",
"Tours",
"St. Brieuc",
@@ -773,7 +773,7 @@ static const char * const _name_french_real[] = {
"Vichy",
"St. Valery",
"Beaujolais",
"Narbonne",
"Reims",
"Albi",
"Paris",
"Biarritz",
@@ -2041,8 +2041,8 @@ static const char * const _name_romanian_real[] = {
static const char * const _name_slovak_real[] = {
"Bratislava",
"Banovce nad Bebravou",
"Banska Bystrica",
"Banska Stiavnica",
"Bansk\xC3\xA1 Bystrica",
"Bansk\xC3\xA1 \xC5\xA0tiavnica",
"Bardejov",
"Brezno",
"Brezova pod Bradlom",
@@ -2050,9 +2050,9 @@ static const char * const _name_slovak_real[] = {
"Cadca",
"Cierna nad Tisou",
"Detva",
"Detva",
"Dolny Kubin",
"Pre\xC5\xA1ov",
"Dolny Kubin",
"Spi\xC5\xA1sk\xC3\xA1 Nov\xC3\xA1 Ves",
"Dunajska Streda",
"Gabcikovo",
"Galanta",
@@ -2064,8 +2064,8 @@ static const char * const _name_slovak_real[] = {
"Humenne",
"Hurbanovo",
"Kezmarok",
"Komarno",
"Kosice",
"Kom\xC3\xA1rno",
"Ko\xC5\xA1ice",
"Kremnica",
"Krompachy",
"Kuty",
@@ -2081,15 +2081,15 @@ static const char * const _name_slovak_real[] = {
"Myjava",
"Namestovo",
"Nitra",
"Nova Bana",
"Nove Mesto nad Vahom",
"Nove Zamky",
"Nov\xC3\xA1 Ba\xC5\x88""a",
"Nov\xC3\xA9"" Mesto nad V\xC3\xA1hom",
"Nov\xC3\xA9"" Z\xC3\xA1""mky",
"Partizanske",
"Pezinok",
"Piestany",
"Poltar",
"Poprad",
"Povazska Bystrica",
"Pova\xC5\xBEsk\xC3\xA1 Bystrica",
"Prievidza",
"Puchov",
"Revuca",
@@ -2123,7 +2123,7 @@ static const char * const _name_slovak_real[] = {
"Zahorska Bystrica",
"Zdiar",
"Ziar nad Hronom",
"Zilina",
"\xC5\xBDilina",
"Zlate Moravce",
"Zvolen",
};