Commit Graph

26 Commits

Author SHA1 Message Date
Jonathan G Rennison
0d93ecb6bf Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/alloc_type.hpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/map_sl.cpp
#	src/station_cmd.cpp
2019-04-16 18:03:08 +01:00
stormcone
79343762a4 Fix: Typos. (#7517) 2019-04-15 22:06:41 +02:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
2019-03-13 03:38:26 +00:00
nikolas
a7e335c0b3 Fix: spelling for a few real town names (#7338)
Added special characters to mostly Slovak towns, a few Spanish, and one Turkish.
2019-03-07 17:52:57 +00:00
Jonathan G Rennison
255b6adfc9 Merge branch 'master' into jgrpp
# Conflicts:
#	src/vehicle_cmd.cpp
2019-01-31 02:04:02 +00:00
nikolas
8334a57332 Fix: unicode characters in Romanian town names (#7141)
Many of these town names were using the 'a with ~ above it' character,
which should actually by 'a with u above it'. There were other missing
accents as well which I've added.
2019-01-30 14:52:56 +01:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp
# 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
2019-01-29 02:28:14 +00:00
Nikolas Nyby
4158c077cd Fix: Remove duplicate French and Slovak town names
I've replaced some of the duplicate real town names with new real town
names in the French and Slovak sets.

Also, some Slovak town names were missing accents, so I've fixed those.
2019-01-24 21:47:13 +00:00
Jonathan G Rennison
0bed63b77f Merge branch 'master' into cpp-11 2019-01-13 22:49:55 +00:00
nikolas
82e530b517 Fix: Remove duplicate town name "Huacho" (#7038)
Huacho appears twice in the Spanish town names list. This change removes
the second one, and replaces it with a new one: Medellin.
2019-01-12 08:33:13 +01:00
Nikolas Nyby
65746a0275 Fix: Spelling fixes on some Latin American town names 2019-01-11 20:24:12 +00:00
Jonathan G Rennison
f7af8b8bdc Silence -Wunused-variable warnings in src/table/townname.h 2016-09-05 23:16:47 +01:00
rubidium
fddeeb5e49 (svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param 2014-10-12 18:26:54 +00:00
rubidium
26574124b1 (svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param 2014-10-12 18:26:54 +00:00
planetmaker
5cc4d240f1 (svn r25775) -Fix [FS#5746]: Some spelling corrections to Catalan town names (juanjo) 2013-09-15 15:48:38 +00:00
planetmaker
68486be675 (svn r25775) -Fix [FS#5746]: Some spelling corrections to Catalan town names (juanjo) 2013-09-15 15:48:38 +00:00
planetmaker
eecb4b3506 (svn r25774) -Fix [FS#5746]: Some spelling corrections to Latin American town names (juanjo) 2013-09-15 15:46:19 +00:00
planetmaker
768d0ac008 (svn r25774) -Fix [FS#5746]: Some spelling corrections to Latin American town names (juanjo) 2013-09-15 15:46:19 +00:00
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
17e6201d33 (svn r20787) -Fix: Spelling mistake in slovak real town names. (mek2) 2010-09-12 14:45:46 +00:00
frosch
9aba4a66b6 (svn r20787) -Fix: Spelling mistake in slovak real town names. (mek2) 2010-09-12 14:45:46 +00:00
smatz
53aaabe6e9 (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
smatz
d2e99657fa (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
smatz
662ef3173b (svn r17597) -Codechange: rename namegen* to townname* 2009-09-21 11:01:16 +00:00
smatz
a9d0dde464 (svn r17597) -Codechange: rename namegen* to townname* 2009-09-21 11:01:16 +00:00