(svn r22469) -Release: 1.1.1-RC1

2025-08-13 01:29:10 +00:00 · 2011-05-15 18:38:02 +00:00
224 changed files with 1961 additions and 4385 deletions
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -42,8 +42,8 @@ NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nfo
 MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")

 # Some "should not be changed" settings.
-NFO_FILES    := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo
-PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png
+NFO_FILES    := $(GRF_DIR)/*.nfo
+PNG_FILES    := $(GRF_DIR)/*.png

 # Build the GRF.
 all: $(BIN_DIR)/openttd.grf
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -27,21 +27,9 @@ SRC_DIR     = "$(ROOT_DIR)/src"
 BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
 TTD         = openttd.exe
-PDB         = openttd.pdb
-MODE        = Release
 TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")

 all:
-	$(Q)cp objs/$(TARGET)/$(MODE)/$(TTD) $(BIN_DIR)/$(TTD)
+	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)

 include Makefile.bundle.in
-
-bundle_pdb:
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).pdb.xz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cp objs/$(TARGET)/Release/$(PDB) $(BUNDLES_DIR)/$(BUNDLE_NAME).pdb
-	$(Q)xz -9 $(BUNDLES_DIR)/$(BUNDLE_NAME).pdb
-
-regression: all
-	$(Q)cp bin/$(TTD) bin/openttd
-	$(Q)cd bin && sh ai/regression/run.sh
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -28,7 +28,6 @@ else
 	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
 fi

-ret=0
 if [ -z "$gdb" ]; then
 	res="`diff -ub ai/regression/regression.txt tmp.regression`"
 	if [ -z "$res" ]; then
@@ -36,7 +35,6 @@ if [ -z "$gdb" ]; then
 	else
 		echo "Regression test failed! Difference:"
 		echo "$res"
-		ret=1
 	fi
 	echo ""
 	echo "Regression test done"
@@ -51,5 +49,3 @@ fi
 if [ "$1" != "-k" ]; then
 	rm -f tmp.regression
 fi
-
-exit $ret
--- a/bin/data/openttd.grf
+++ b/bin/data/openttd.grf
--- a/bin/data/orig_dos.obg
+++ b/bin/data/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = f99b8f65d32a8883a2b0979eb2f6729f
+OPENTTD.GRF  = 066f0ce5500e0e8f5332aee42e2451a2

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = f99b8f65d32a8883a2b0979eb2f6729f
+OPENTTD.GRF  = 066f0ce5500e0e8f5332aee42e2451a2

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = f99b8f65d32a8883a2b0979eb2f6729f
+OPENTTD.GRF  = 066f0ce5500e0e8f5332aee42e2451a2

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,110 +1,3 @@
-1.1.3 (2011-09-15)
------------------------------------------------------------------------
- Fix: Prevent authentication bypass for the admin port when a new game is started [FS#4771] (r22934)
- Fix: TTO savegames with any aircraft not in an hangar caused crashes during load (r22915)
- Fix: Windows 2000 and XP without service pack 3 must use the win9x binary/installer; the newer MSVC compiler of the compile farm does not support those versions of Windows anymore [FS#4749] (r22909)
-
-
-1.1.3-RC1 (2011-09-04)
------------------------------------------------------------------------
- Add: River graphics for the original base set (r22766)
- Fix: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash [FS#4758] (r22882)
- Fix: Harden memory allocation (r22881, r22880, r22875)
- Fix: Miscalculation of train curve speed limits (r22879)
- Fix: Validate image dimensions before loading [CVE-2011-3343] [FS#4747] (r22878, r22877, r22874, r22873)
- Fix: Report an error in the news if autoreplace/renew fails due to the engine type being no longer available [FS#4712] (r22876)
- Fix: Perform stricter checks on RLE compressed BMP images [CVE-2011-3343] [FS#4746] (r22872, r22871)
- Fix: [NewGRF] Variables 40 and 81 of callback 18 are not the same as 80 (r22867)
- Fix: [NewGRF] Generic callbacks shall chain to the next GRF when the callback fails (r22866, r22865)
- Fix: Perform stricter checks on some commands [CVE-2011-3341] [FS#4745] (r22845)
- Fix: Harden savegame load against too many AI config settings [CVE-2011-3342] [FS#4748] (r22843)
- Fix: Compilation with GCC 4.7 (r22832, r22728, r22719)
- Fix: Allow to demolish aqueducts built in the scenario editor [FS#4741] (r22821)
- Fix: Towns expanding from the "wrong" side of a tunnel or bridge [FS#4731] (r22810, r22809)
- Fix: [NewGRF] String codes for dates should use unsigned words, like old OpenTTD did before it learned dates before 1920 (r22774)
- Fix: [NoAI] Clarify the meaning of AIStation::IsWithinTownInfluence(), AITile::IsWithinTownInfluence() and AITown::IsWithinTownInfluence() [FS#4702] (r22763)
- Fix: [NewGRF] Also free allocated depot tables of NewGRF airports (r22760)
- Fix: [NewGRF] Invalid memory access when querying the grfID of the default objects [FS#4730] (r22757)
- Fix: When marking tile selections dirty, use the height information of the corners instead of the surface slope. This is more accurate when the foundation is kind of undefined [FS#4727] (r22755)
- Fix: Make aircraft point to the exit when leaving the hangar [FS#4696] (r22743, r22742, r22741)
- Fix: Display the size of the leveled platform in the measurement tooltip of terraforming operations [FS#4708] (r22740, r22739)
- Fix: Setting company passwords via the GUI on servers (including starting a company with the default password) failed, so no client could join that company [FS#4722] (r22738)
- Fix: [NewGRF] The construction stage sprites were incorrectly selected in cases other than 1 or 4 sprites per set (r22731)
- Fix: [NoAI] AITile::GetCargoAcceptance, AITile::GetCargoProduction and AIRail::BuildNewGRFRailStation did not check the cargo argument for validity (r22726)
- Fix: [NewGRF] Always draw NewGRF supplied texts with a default colour (r22725)
- Fix: [NewGRF] Do not restrict AdvVarAct2 to 255 operations (r22723)
- Fix: If there is no point in opening the rail/air toolbar, do not open it for people who use hotkeys either rather than only for those using GUI elements (r22716, r22715, r22714)
- Fix: [NoAI] Allow AIAirport::GetNoiseLevelIncrease() also for expired airports [FS#4704] (r22710)
-
-
-1.1.2 (2011-08-14)
------------------------------------------------------------------------
- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [CVE-2011-3342] [FS#4717] (r22737, r22736)
- Fix: [NewGRF] Triggering NOT_REACHED when playing with a NewGRF that supplies genders/cases for a language that was not installed [FS#4718] (r22735)
-
-
-1.1.2-RC2 (2011-07-30)
------------------------------------------------------------------------
- Fix: Cost of adding an extra road type to a bridge or tunnel was undercalculated [FS#4680, FS#4681] (r22700, r22699)
- Fix: Only insert cleared object tiles into _cleared_object_areas if clearing actually succeeds, else subsequential tests of the same tile will be skipped and considered successful [FS#4694] (r22698)
- Fix: When building a house it could be built at the wrong place if multitile houses failed some tests (r22697)
- Fix: [Network] Failed network address resolving could trigger temporary freezes [FS#4697] (r22696, r22695)
- Fix: [NewGRF] The override managers were not reset in some cases like creating a new scenario [FS#4691] (r22693)
- Fix: [NewGRF] Aircrafts defined with IDs above the default aircrafts always defaulted to passenger cargo (r22690)
-
-
-1.1.2-RC1 (2011-07-24)
------------------------------------------------------------------------
- Change: [NewGRF] Only allow access (via hotkey and menu) to the bounding box visualisation when NewGRF developer tools are enabled (r22675)
- Fix: [NewGRF] Disallow accessing variable 1B in network games due to desync reasons (r22682)
- Fix: Switching from a red to a white highlight (by switching to another tool) without switching the highlight mode (HT_RECT etc.) did not mark the selection dirty [FS#4670] (r22649)
- Fix: [NewGRF] Parameters from NewGRFs were not properly parsed in all cases [FS#4599] (r22648, r22630, r22629, r22628, r22627)
- Fix: GetSection() does not return a LockPart [FS#4678] (r22645)
- Fix: [NewGRF] Disallow building NewObjects on water tiles owned by another company (r22643)
- Fix: [NewGRF] Disable the 'set parameters' button in the NewGRF GUI, if the GRF specifies to have no parameters and one would not be able to set any parameters anyway (r22642)
- Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water (r22638)
- Fix: [NewGRF] Airports should not expose the tile specific random bits of the north tile. Only airport tiles should access those (r22636)
- Fix: [NewGRF] Correctly reseed random bits of industries and industry tiles (r22635, r22634)
- Fix: [NewGRF] Implement variables 25 and 7F for railtypes (r22633)
- Fix: [NewGRF] Additional text in fund industry window is NewGRF supplied and thus should have a default colour (r22631)
- Fix: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings [FS#4622] (r22626)
- Fix: Do not zero the orders of disaster vehicles when converting savegames [FS#4642] (r22625)
- Fix: When closing an AI company the local player cheated to, we need to cheat him to another company [FS#4654] (r22624, r22623)
- Fix: When closing down companies their shares in other companies must be sold even if share trading is disabled at that point of time (r22622)
- Fix: When asking the user to confirm an unsafe unpausing, there is no need to execute a command if 'no' is choosed. This also prevents crashing when clicking unpause while the confirm window is shown (r22621)
- Fix: Enforce refit orders to be 'always go to depot' orders; service-only and stop-in-depot orders make no sense with refitting [FS#4651] (r22620)
- Fix: Consider the size of the vehicle sprite for the lineheight in the company GUI. This also makes the widget containing the sprite not skip drawing it, if the bounds of the widget are outside of the drawing area though the sprite actually needs drawing [FS#4662] (r22619)
- Fix: When changing difficulty settings over the network, do not just reopen the difficulty window if any game options window is opened; instead invalidate them properly [FS#4653] (r22618, r22617)
- Fix: [NewGRF] If callback 33 returns a value out of range, no sound effect shall be played [FS#4656] (r22614)
- Fix: Use rotated heightmap sizes for reporting scaling problems [FS#4663] (r22608)
- Fix: Do not show cargo accepted/produced in the new station window when no tiles are selected (mouse hovering a window or toolbar) [FS#4647] (r22595, r22593)
- Fix: Add active NewGRFs to the list of available ones when selecting the empty preset [FS#4644] (r22594)
- Fix: Reading of heightmaps with uncommon BMP formats failed due to uninitialised variables [FS#4645] (r22592)
- Fix: PBS order forecasting modified the current order index in case of a goto-nearest-depot order and no depot could be found [FS#4641] (r22589)
- Fix: Remove BaseStorageArrays from _changed_storage_arrays on destruction (r22583, r22551)
- Fix: Do not increment STL iterators after they have been invalidated (r22582)
- Fix: Do not lower the arrow buttons in the NewGRF/AI parameter windows if they are clicked when disabled (r22553, r22499)
- Fix: Clear airport persistent storage on construction/removal of airports (r22552)
- Fix: Possible crash when opening the airport build window for the first time [FS#4619] (r22538)
- Fix: Replace the half small airport structure on the intercontinental airport with some grass [FS#3494] (r22537)
- Fix: Documentation omission regarding admin protocol [FS#4632] (r22536)
- Fix: [NoAI] Doing rescan_ai in a game with running AIs caused a crash [FS#4631] (r22534)
- Fix: Do not create an implicit order if the current order is the first order in the order list and we visit the station of the last entry of the order list (r22532)
- Fix: MinGW 64 related compilation issues [FS#4623] (r22522, r22491, r22490, r22489)
- Fix: The layout selectors of the airport build GUI did not latch properly (r22497, r22495)
- Fix: Callback result for airport layout name was incorrectly used (r22496)
- Fix: Airport preview sprite can depend on the layout, so update the cached SpriteID when the layout changes (r22494)
- Fix: Engine IDs for coal and mail wagons were swapped in the TTO savegame conversion [FS#4622] (r22487)
- Fix: The caption of centered windows could be moved out of the main window and thus become inaccessible when resizing the main window (r22485, r22484)
- Fix: No client error packet was sent to the admin bots [FS#4585] (r22384)
-
-
-1.1.1 (2011-06-01)
------------------------------------------------------------------------
- Change: Automatic orders are better called implicit orders as no real order influencing path finding is added (r22474, r22473)
- Fix: Only try to insert implicit orders for ground vehicles. Aircraft may reach unscheduled terminals when skipping orders [FS#4624] (r22492)
-
-
 1.1.1-RC1 (2011-05-15)
 ------------------------------------------------------------------------
 - Feature: [NewGRF] Allow to filter by town of the current industry when using industry variable 0x68 [FS#4591] (r22434)
@@ -128,6 +21,7 @@
 - Fix: When a game uses a lot of NewGRFs the buffer for storing that information in the PNG is too small (r22388)
 - Fix: Windows' recv seems to return 'graceful closed' before having passed the remaining buffer which causes OpenTTD to think all connections are 'incorrectly' terminated, i.e. without the 'I am leaving' packet from the client. So let the client wait a tiny bit after sending the 'I am leaving' packet and before gracefully closing the connection [FS#4601] (r22387)
 - Fix: When the last AI company gets removed, the 'dead' state was not reset in the AI debug window [FS#4602] (r22386)
+- Fix: No client error packet was sent to the admin bots [FS#4585] (r22384)
 - Fix: Recolouring of silicon bridge was done incorrectly (r22380, r22379, r22378)
 - Fix: Crash when clicking a removed company in the vehicle list dropdowns [FS#4592] (r22373)
 - Fix: Keep better accounting of the order in which clients joined; client cannot be starved from joining and they get shown the amount of clients waiting in front of them (r22372, r22370, r22369, r22368, r22367, r22366, r22365, r22364, r22363, r22362, r22361)
--- a/config.lib
+++ b/config.lib
@@ -59,8 +59,8 @@ set_default() {
 	enable_translator="0"
 	enable_unicode="1"
 	enable_console="1";
-	enable_assert="0"
-	enable_strip="1"
+	enable_assert="1"
+	enable_strip="0"
 	enable_universal="0"
 	enable_osx_g5="0"
 	enable_cocoa_quartz="1"
@@ -1296,15 +1296,6 @@ make_compiler_cflags() {
 			cxxflags="$cxxflags -std=gnu++0x"
 		fi

-		if [ $cc_version -ge 47 ]; then
-			# Disable -Wnarrowing which gives many warnings, such as:
-			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
-			# They are valid according to the C++ standard, but useless.
-			cxxflags="$cxxflags -Wno-narrowing"
-			# Disable bogus 'attempt to free a non-heap object' warning
-			flags="$flags -Wno-free-nonheap-object"
-		fi
-
 		if [ "$enable_lto" != "0" ]; then
 			# GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
 			has_lto=`$1 -dumpspecs | grep '\%{flto'`
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-09-15
-Release version: 1.1.3
+Last updated:    2011-05-15
+Release version: 1.1.1-RC1
 ------------------------------------------------------------------------


@@ -39,8 +39,6 @@ officially supporting Mac OS X again. For now it remains unsupported and
 we only apply bug fixes provided by the community but we are unable to fix
 these bugs ourselves.

- 4744  [OSX] Crash when switching to full screen with OS X Lion
- 4689  [OSX] Crash when hiding window after coming from full screen
 - 4594  [Windows] Minimizing the windows when a modal error message is
        shown makes it difficult to exit the game
 - 4420  [OSX] OS' mouse pointer still shows
@@ -267,7 +265,7 @@ OpenTTD hangs when started on 32 bits Windows [FS#4083]
 	default we are not able to detect this failure, except when Windows'
 	music initialisation function returns after several hours and then
 	there is no point in switching the music driver anymore.
-	The reason we still use the "win32" music driver as default are
+	The reason we do not use the "win32" music driver as default are
 	described in the "Long delay between switching music/song" section
 	of this document.

@@ -303,38 +301,3 @@ Can't run OpenTTD with the -d option from a MSYS console [FS#4587]
 	debugging output. Compiling OpenTTD with the --enable-console
 	configure option prevents this issue and allows the -d option to use
 	the MSYS console for its output.
-
-Unreadable characters for non-latin locales [FS#4607]
-	OpenTTD does not ship a non-latin font in its graphics files. As a
-	result OpenTTD needs to acquire the font from somewhere else. What
-	OpenTTD does is ask the operating system, or a system library, for
-	the best font for a given language if the currently loaded font
-	does not provide all characters of the chosen translation. This
-	means that OpenTTD has no influence over the quality of the chosen
-	font; it just does the best it can do.
-
-	If the text is unreadable there are several steps that you can take
-	to improve this. The first step is finding a good font and configure
-	this in the configuration file. See section 9.0 of readme.txt for
-	more information. You can also increase the font size to make the
-	characters bigger and possible better readable.
-
-	If the problem is with the clarity of the font you might want to
-	enable anti-aliasing by setting the small_aa/medium_aa/large_aa
-	settings to "true". However, anti-aliasing only works when a 32 bits
-	blitter has been selected, e.g. blitter = "32bpp-anim", as with the
-	8 bits blitter there are not enough colours to properly perform the
-	anti-aliasing.
-
-Train does not crash with itself [FS#4635]:
-	When a train drives in a circle the front engine passes through
-	wagons of the same train without crashing. This is intentional.
-	Signals are only aware of tracks, they do not consider the train
-	length and whether there would be enough room for a train in some
-	circle it might drive on. Also the path a train might take is not
-	necessarily known when passing a signal.
-	Checking all circumstances would take a lot of additional computational
-	power for signals, which is not considered worth the effort, as
-	it does not add anything to gameplay.
-	Nevertheless trains shall not crash in normal operation, so making
-	a train not crash with itself is the best solution for everyone.
--- a/media/extra_grf/airport_preview.png
+++ b/media/extra_grf/airport_preview.png
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -80,7 +80,6 @@
             "David Dallaston: tram tracks" 0D
             "Jonathan G. Rennison: aqueducts" 0D
             "Bilbo, Jasper Vries: font" 0D
-             "Andrew Parkhouse: rivers" 0D
             "OpenTTD developers: other graphics" 00

 //
@@ -105,8 +104,3 @@
 #include "chars.nfo"
 #include "overrides.nfo"
 #include "fix_graphics.nfo"
-#include "rivers/rapids.nfo"
-#include "rivers/temperate.nfo"
-#include "rivers/arctic.nfo"
-#include "rivers/tropic.nfo"
-#include "rivers/toyland.nfo"
--- a/media/extra_grf/rivers/arctic.nfo
+++ b/media/extra_grf/rivers/arctic.nfo
@@ -1,282 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "Arctic river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380  10 09  5 12  -5  0
-
-   -1 sprites/arctic_snowy.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380  40 09  4 15  -7  0
-
-   -1 sprites/arctic_snowy.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/arctic_snowy.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 100 09  4 15  -6  0
-
-   -1 sprites/arctic_snowy.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 30 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380  10 09  5 12  -5  0
-
-   -1 sprites/arctic_brown.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380  40 09  4 15  -7  0
-
-   -1 sprites/arctic_brown.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/arctic_brown.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 100 09  4 15  -6  0
-
-   -1 sprites/arctic_brown.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 31 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380 210 09  5 12  -5  0
-
-   -1 sprites/arctic_snowy.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380 240 09  4 15  -7  0
-
-   -1 sprites/arctic_snowy.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/arctic_snowy.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 300 09  4 15  -6  0
-
-   -1 sprites/arctic_snowy.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 32 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380 210 09  5 12  -5  0
-
-   -1 sprites/arctic_brown.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380 240 09  4 15  -7  0
-
-   -1 sprites/arctic_brown.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/arctic_brown.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 300 09  4 15  -6  0
-
-   -1 sprites/arctic_brown.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 33 01 00 00 00
-
-   -1 * 14	 02 05 34 81 81 00 FF 01 30 00 04 04 31 00
-   -1 * 14	 02 05 35 81 81 00 FF 01 32 00 04 04 33 00
-   -1 * 14	 02 05 36 81 80 00 FF 01 34 00 00 00 35 00
-   -1 * 6	 07 83 01 \7! 01 01
-   -1 * 7	 03 05 01 06 00 36 00
--- a/media/extra_grf/rivers/arctic_brown.png
+++ b/media/extra_grf/rivers/arctic_brown.png
--- a/media/extra_grf/rivers/arctic_snowy.png
+++ b/media/extra_grf/rivers/arctic_snowy.png
--- a/media/extra_grf/rivers/rapids.nfo
+++ b/media/extra_grf/rivers/rapids.nfo
@@ -1,139 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "Rapid graphics"
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  10 09 23 64 -31  0
-   -1 sprites/rapids.png  90  10 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  10 09 23 64 -31  0
-   -1 sprites/rapids.png 250  10 09 39 64 -31 -8
-   -1 * 7	 02 05 00 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  60 09 23 64 -31  0
-   -1 sprites/rapids.png  90  60 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  60 09 23 64 -31  0
-   -1 sprites/rapids.png 250  60 09 39 64 -31 -8
-   -1 * 7	 02 05 01 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 110 09 23 64 -31  0
-   -1 sprites/rapids.png  90 110 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 110 09 23 64 -31  0
-   -1 sprites/rapids.png 250 110 09 39 64 -31 -8
-   -1 * 7	 02 05 02 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 160 09 23 64 -31  0
-   -1 sprites/rapids.png  90 160 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 160 09 23 64 -31  0
-   -1 sprites/rapids.png 250 160 09 39 64 -31 -8
-   -1 * 7	 02 05 03 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 210 09 23 64 -31  0
-   -1 sprites/rapids.png  90 210 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 210 09 23 64 -31  0
-   -1 sprites/rapids.png 250 210 09 39 64 -31 -8
-   -1 * 7	 02 05 04 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 260 09 23 64 -31  0
-   -1 sprites/rapids.png  90 260 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 260 09 23 64 -31  0
-   -1 sprites/rapids.png 250 260 09 39 64 -31 -8
-   -1 * 7	 02 05 05 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 310 09 23 64 -31  0
-   -1 sprites/rapids.png  90 310 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 310 09 23 64 -31  0
-   -1 sprites/rapids.png 250 310 09 39 64 -31 -8
-   -1 * 7	 02 05 06 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 360 09 23 64 -31  0
-   -1 sprites/rapids.png  90 360 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 360 09 23 64 -31  0
-   -1 sprites/rapids.png 250 360 09 39 64 -31 -8
-   -1 * 7	 02 05 07 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 410 09 23 64 -31  0
-   -1 sprites/rapids.png  90 410 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 410 09 23 64 -31  0
-   -1 sprites/rapids.png 250 410 09 39 64 -31 -8
-   -1 * 7	 02 05 08 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 460 09 23 64 -31  0
-   -1 sprites/rapids.png  90 460 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 460 09 23 64 -31  0
-   -1 sprites/rapids.png 250 460 09 39 64 -31 -8
-   -1 * 7	 02 05 09 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 510 09 23 64 -31  0
-   -1 sprites/rapids.png  90 510 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 510 09 23 64 -31  0
-   -1 sprites/rapids.png 250 510 09 39 64 -31 -8
-   -1 * 7	 02 05 0A 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 560 09 23 64 -31  0
-   -1 sprites/rapids.png  90 560 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 560 09 23 64 -31  0
-   -1 sprites/rapids.png 250 560 09 39 64 -31 -8
-   -1 * 7	 02 05 0B 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 610 09 23 64 -31  0
-   -1 sprites/rapids.png  90 610 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 610 09 23 64 -31  0
-   -1 sprites/rapids.png 250 610 09 39 64 -31 -8
-   -1 * 7	 02 05 0C 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 660 09 23 64 -31  0
-   -1 sprites/rapids.png  90 660 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 660 09 23 64 -31  0
-   -1 sprites/rapids.png 250 660 09 39 64 -31 -8
-   -1 * 7	 02 05 0D 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 710 09 23 64 -31  0
-   -1 sprites/rapids.png  90 710 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 710 09 23 64 -31  0
-   -1 sprites/rapids.png 250 710 09 39 64 -31 -8
-   -1 * 7	 02 05 0E 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 760 09 23 64 -31  0
-   -1 sprites/rapids.png  90 760 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 760 09 23 64 -31  0
-   -1 sprites/rapids.png 250 760 09 39 64 -31 -8
-   -1 * 7	 02 05 0F 01 00 00 00
-
-   -1 * 39	 02 05 10 80 00 01 10
-            00 00
-            01 00
-            02 00
-            03 00
-            04 00
-            05 00
-            06 00
-            07 00
-            08 00
-            09 00
-            0A 00
-            0B 00
-            0C 00
-            0D 00
-            0E 00
-            0F 00
-   -1 * 7	 03 05 01 05 00 10 00
--- a/media/extra_grf/rivers/rapids.png
+++ b/media/extra_grf/rivers/rapids.png
--- a/media/extra_grf/rivers/temperate.nfo
+++ b/media/extra_grf/rivers/temperate.nfo
@@ -1,146 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "Temperate river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10  10 09 19 38  -5  0
-   -1 sprites/temperate.png  58  10 09 18 38  -5 13
-   -1 sprites/temperate.png 106  10 09 18 38 -31 13
-   -1 sprites/temperate.png 154  10 09 19 38 -31  0
-   -1 sprites/temperate.png 202  10 09  9 19  14 11
-   -1 sprites/temperate.png 234  10 09  9 16  -7 22
-   -1 sprites/temperate.png 266  10 09  9 19 -31 11
-   -1 sprites/temperate.png 298  10 09  9 16  -7  0
-   -1 sprites/temperate.png 330  10 09  6  8  25 13
-   -1 sprites/temperate.png 346  10 09  4 12  -5 27
-   -1 sprites/temperate.png 364  10 09  6  8 -31 13
-   -1 sprites/temperate.png 380  10 09  5 12  -5  0
-
-   -1 sprites/temperate.png  10  40 09 11 40  -7  0
-   -1 sprites/temperate.png  58  40 09 18 39  -6  5
-   -1 sprites/temperate.png 106  40 09 11 38 -31 12
-   -1 sprites/temperate.png 154  40 09 18 39 -31  0
-   -1 sprites/temperate.png 202  40 09  6 20  13  5
-   -1 sprites/temperate.png 234  40 09  7 13  -6 16
-   -1 sprites/temperate.png 266  40 09  6 20 -31 12
-   -1 sprites/temperate.png 298  40 09  7 13  -5  0
-   -1 sprites/temperate.png 330  40 09  5  8  25  6
-   -1 sprites/temperate.png 346  40 09  3 12  -5 20
-   -1 sprites/temperate.png 364  40 09  4  8 -31 13
-   -1 sprites/temperate.png 380  40 09  4 15  -7  0
-
-   -1 sprites/temperate.png  10  70 09 20 38  -5 -8
-   -1 sprites/temperate.png  58  70 09 26 38  -5  5
-   -1 sprites/temperate.png 106  70 09 20 37 -31 11
-   -1 sprites/temperate.png 154  70 09 27 38 -31 -8
-   -1 sprites/temperate.png 202  70 09  9 16  17  3
-   -1 sprites/temperate.png 234  70 09  9 15  -7 22
-   -1 sprites/temperate.png 266  70 09  9 16 -31 11
-   -1 sprites/temperate.png 298  70 09  9 15  -6 -8
-   -1 sprites/temperate.png 330  70 09  7  8  25  5
-   -1 sprites/temperate.png 346  70 09  5 10  -4 27
-   -1 sprites/temperate.png 364  70 09  7  8 -31 11
-   -1 sprites/temperate.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/temperate.png  10 100 09 18 39  -6  0
-   -1 sprites/temperate.png  58 100 09 11 38  -5 12
-   -1 sprites/temperate.png 106 100 09 18 39 -31  5
-   -1 sprites/temperate.png 154 100 09 11 40 -32  0
-   -1 sprites/temperate.png 202 100 09  6 20  13 12
-   -1 sprites/temperate.png 234 100 09  7 13  -5 16
-   -1 sprites/temperate.png 266 100 09  6 20 -31  5
-   -1 sprites/temperate.png 298 100 09  7 13  -6  0
-   -1 sprites/temperate.png 330 100 09  4  8  26 13
-   -1 sprites/temperate.png 346 100 09  3 12  -5 20
-   -1 sprites/temperate.png 364 100 09  5  8 -31  6
-   -1 sprites/temperate.png 380 100 09  4 15  -6  0
-
-   -1 sprites/temperate.png  10 130 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 130 09 20 37  -4 11
-   -1 sprites/temperate.png 106 130 09 26 37 -31  5
-   -1 sprites/temperate.png 154 130 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 130 09  9 16  17 11
-   -1 sprites/temperate.png 234 130 09  9 15  -6 22
-   -1 sprites/temperate.png 266 130 09  9 16 -31  3
-   -1 sprites/temperate.png 298 130 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 130 09  7  8  25 11
-   -1 sprites/temperate.png 346 130 09  5 10  -4 26
-   -1 sprites/temperate.png 364 130 09  7  8 -31  5
-   -1 sprites/temperate.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 20 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10 210 09 19 38  -5  0
-   -1 sprites/temperate.png  58 210 09 18 38  -5 13
-   -1 sprites/temperate.png 106 210 09 18 38 -31 13
-   -1 sprites/temperate.png 154 210 09 19 38 -31  0
-   -1 sprites/temperate.png 202 210 09  9 19  14 11
-   -1 sprites/temperate.png 234 210 09  9 16  -7 22
-   -1 sprites/temperate.png 266 210 09  9 19 -31 11
-   -1 sprites/temperate.png 298 210 09  9 16  -7  0
-   -1 sprites/temperate.png 330 210 09  6  8  25 13
-   -1 sprites/temperate.png 346 210 09  4 12  -5 27
-   -1 sprites/temperate.png 364 210 09  6  8 -31 13
-   -1 sprites/temperate.png 380 210 09  5 12  -5  0
-
-   -1 sprites/temperate.png  10 240 09 11 40  -7  0
-   -1 sprites/temperate.png  58 240 09 18 39  -6  5
-   -1 sprites/temperate.png 106 240 09 11 38 -31 12
-   -1 sprites/temperate.png 154 240 09 18 39 -31  0
-   -1 sprites/temperate.png 202 240 09  6 20  13  5
-   -1 sprites/temperate.png 234 240 09  7 13  -6 16
-   -1 sprites/temperate.png 266 240 09  6 20 -31 12
-   -1 sprites/temperate.png 298 240 09  7 13  -5  0
-   -1 sprites/temperate.png 330 240 09  5  8  25  6
-   -1 sprites/temperate.png 346 240 09  3 12  -5 20
-   -1 sprites/temperate.png 364 240 09  4  8 -31 13
-   -1 sprites/temperate.png 380 240 09  4 15  -7  0
-
-   -1 sprites/temperate.png  10 270 09 20 38  -5 -8
-   -1 sprites/temperate.png  58 270 09 26 38  -5  5
-   -1 sprites/temperate.png 106 270 09 20 37 -31 11
-   -1 sprites/temperate.png 154 270 09 27 38 -31 -8
-   -1 sprites/temperate.png 202 270 09  9 16  17  3
-   -1 sprites/temperate.png 234 270 09  9 15  -7 22
-   -1 sprites/temperate.png 266 270 09  9 16 -31 11
-   -1 sprites/temperate.png 298 270 09  9 15  -6 -8
-   -1 sprites/temperate.png 330 270 09  7  8  25  5
-   -1 sprites/temperate.png 346 270 09  5 10  -4 27
-   -1 sprites/temperate.png 364 270 09  7  8 -31 11
-   -1 sprites/temperate.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/temperate.png  10 300 09 18 39  -6  0
-   -1 sprites/temperate.png  58 300 09 11 38  -5 12
-   -1 sprites/temperate.png 106 300 09 18 39 -31  5
-   -1 sprites/temperate.png 154 300 09 11 40 -32  0
-   -1 sprites/temperate.png 202 300 09  6 20  13 12
-   -1 sprites/temperate.png 234 300 09  7 13  -5 16
-   -1 sprites/temperate.png 266 300 09  6 20 -31  5
-   -1 sprites/temperate.png 298 300 09  7 13  -6  0
-   -1 sprites/temperate.png 330 300 09  4  8  26 13
-   -1 sprites/temperate.png 346 300 09  3 12  -5 20
-   -1 sprites/temperate.png 364 300 09  5  8 -31  6
-   -1 sprites/temperate.png 380 300 09  4 15  -6  0
-
-   -1 sprites/temperate.png  10 330 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 330 09 20 37  -4 11
-   -1 sprites/temperate.png 106 330 09 26 37 -31  5
-   -1 sprites/temperate.png 154 330 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 330 09  9 16  17 11
-   -1 sprites/temperate.png 234 330 09  9 15  -6 22
-   -1 sprites/temperate.png 266 330 09  9 16 -31  3
-   -1 sprites/temperate.png 298 330 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 330 09  7  8  25 11
-   -1 sprites/temperate.png 346 330 09  5 10  -4 26
-   -1 sprites/temperate.png 364 330 09  7  8 -31  5
-   -1 sprites/temperate.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 21 01 00 00 00
-
-   -1 * 14	 02 05 22 81 80 00 FF 01 20 00 00 00 21 00
-   -1 * 6	 07 83 01 \7! 00 01
-   -1 * 7	 03 05 01 06 00 22 00
--- a/media/extra_grf/rivers/temperate.png
+++ b/media/extra_grf/rivers/temperate.png
--- a/media/extra_grf/rivers/toyland.nfo
+++ b/media/extra_grf/rivers/toyland.nfo
@@ -1,146 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10  10 09 19 38  -5  0
-   -1 sprites/toyland.png  58  10 09 18 38  -5 13
-   -1 sprites/toyland.png 106  10 09 18 38 -31 13
-   -1 sprites/toyland.png 154  10 09 19 38 -31  0
-   -1 sprites/toyland.png 202  10 09  9 19  14 11
-   -1 sprites/toyland.png 234  10 09  9 16  -7 22
-   -1 sprites/toyland.png 266  10 09  9 19 -31 11
-   -1 sprites/toyland.png 298  10 09  9 16  -7  0
-   -1 sprites/toyland.png 330  10 09  6  8  25 13
-   -1 sprites/toyland.png 346  10 09  4 12  -5 27
-   -1 sprites/toyland.png 364  10 09  6  8 -31 13
-   -1 sprites/toyland.png 380  10 09  5 12  -5  0
-
-   -1 sprites/toyland.png  10  40 09 11 40  -7  0
-   -1 sprites/toyland.png  58  40 09 18 39  -6  5
-   -1 sprites/toyland.png 106  40 09 11 38 -31 12
-   -1 sprites/toyland.png 154  40 09 18 39 -31  0
-   -1 sprites/toyland.png 202  40 09  6 20  13  5
-   -1 sprites/toyland.png 234  40 09  7 13  -6 16
-   -1 sprites/toyland.png 266  40 09  6 20 -31 12
-   -1 sprites/toyland.png 298  40 09  7 13  -5  0
-   -1 sprites/toyland.png 330  40 09  5  8  25  6
-   -1 sprites/toyland.png 346  40 09  3 12  -5 20
-   -1 sprites/toyland.png 364  40 09  4  8 -31 13
-   -1 sprites/toyland.png 380  40 09  4 15  -7  0
-
-   -1 sprites/toyland.png  10  70 09 20 38  -5 -8
-   -1 sprites/toyland.png  58  70 09 26 38  -5  5
-   -1 sprites/toyland.png 106  70 09 20 37 -31 11
-   -1 sprites/toyland.png 154  70 09 27 38 -31 -8
-   -1 sprites/toyland.png 202  70 09  9 16  17  3
-   -1 sprites/toyland.png 234  70 09  9 15  -7 22
-   -1 sprites/toyland.png 266  70 09  9 16 -31 11
-   -1 sprites/toyland.png 298  70 09  9 15  -6 -8
-   -1 sprites/toyland.png 330  70 09  7  8  25  5
-   -1 sprites/toyland.png 346  70 09  5 10  -4 27
-   -1 sprites/toyland.png 364  70 09  7  8 -31 11
-   -1 sprites/toyland.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/toyland.png  10 100 09 18 39  -6  0
-   -1 sprites/toyland.png  58 100 09 11 38  -5 12
-   -1 sprites/toyland.png 106 100 09 18 39 -31  5
-   -1 sprites/toyland.png 154 100 09 11 40 -32  0
-   -1 sprites/toyland.png 202 100 09  6 20  13 12
-   -1 sprites/toyland.png 234 100 09  7 13  -5 16
-   -1 sprites/toyland.png 266 100 09  6 20 -31  5
-   -1 sprites/toyland.png 298 100 09  7 13  -6  0
-   -1 sprites/toyland.png 330 100 09  4  8  26 13
-   -1 sprites/toyland.png 346 100 09  3 12  -5 20
-   -1 sprites/toyland.png 364 100 09  5  8 -31  6
-   -1 sprites/toyland.png 380 100 09  4 15  -6  0
-
-   -1 sprites/toyland.png  10 130 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 130 09 20 37  -4 11
-   -1 sprites/toyland.png 106 130 09 26 37 -31  5
-   -1 sprites/toyland.png 154 130 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 130 09  9 16  17 11
-   -1 sprites/toyland.png 234 130 09  9 15  -6 22
-   -1 sprites/toyland.png 266 130 09  9 16 -31  3
-   -1 sprites/toyland.png 298 130 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 130 09  7  8  25 11
-   -1 sprites/toyland.png 346 130 09  5 10  -4 26
-   -1 sprites/toyland.png 364 130 09  7  8 -31  5
-   -1 sprites/toyland.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 50 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10 210 09 19 38  -5  0
-   -1 sprites/toyland.png  58 210 09 18 38  -5 13
-   -1 sprites/toyland.png 106 210 09 18 38 -31 13
-   -1 sprites/toyland.png 154 210 09 19 38 -31  0
-   -1 sprites/toyland.png 202 210 09  9 19  14 11
-   -1 sprites/toyland.png 234 210 09  9 16  -7 22
-   -1 sprites/toyland.png 266 210 09  9 19 -31 11
-   -1 sprites/toyland.png 298 210 09  9 16  -7  0
-   -1 sprites/toyland.png 330 210 09  6  8  25 13
-   -1 sprites/toyland.png 346 210 09  4 12  -5 27
-   -1 sprites/toyland.png 364 210 09  6  8 -31 13
-   -1 sprites/toyland.png 380 210 09  5 12  -5  0
-
-   -1 sprites/toyland.png  10 240 09 11 40  -7  0
-   -1 sprites/toyland.png  58 240 09 18 39  -6  5
-   -1 sprites/toyland.png 106 240 09 11 38 -31 12
-   -1 sprites/toyland.png 154 240 09 18 39 -31  0
-   -1 sprites/toyland.png 202 240 09  6 20  13  5
-   -1 sprites/toyland.png 234 240 09  7 13  -6 16
-   -1 sprites/toyland.png 266 240 09  6 20 -31 12
-   -1 sprites/toyland.png 298 240 09  7 13  -5  0
-   -1 sprites/toyland.png 330 240 09  5  8  25  6
-   -1 sprites/toyland.png 346 240 09  3 12  -5 20
-   -1 sprites/toyland.png 364 240 09  4  8 -31 13
-   -1 sprites/toyland.png 380 240 09  4 15  -7  0
-
-   -1 sprites/toyland.png  10 270 09 20 38  -5 -8
-   -1 sprites/toyland.png  58 270 09 26 38  -5  5
-   -1 sprites/toyland.png 106 270 09 20 37 -31 11
-   -1 sprites/toyland.png 154 270 09 27 38 -31 -8
-   -1 sprites/toyland.png 202 270 09  9 16  17  3
-   -1 sprites/toyland.png 234 270 09  9 15  -7 22
-   -1 sprites/toyland.png 266 270 09  9 16 -31 11
-   -1 sprites/toyland.png 298 270 09  9 15  -6 -8
-   -1 sprites/toyland.png 330 270 09  7  8  25  5
-   -1 sprites/toyland.png 346 270 09  5 10  -4 27
-   -1 sprites/toyland.png 364 270 09  7  8 -31 11
-   -1 sprites/toyland.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/toyland.png  10 300 09 18 39  -6  0
-   -1 sprites/toyland.png  58 300 09 11 38  -5 12
-   -1 sprites/toyland.png 106 300 09 18 39 -31  5
-   -1 sprites/toyland.png 154 300 09 11 40 -32  0
-   -1 sprites/toyland.png 202 300 09  6 20  13 12
-   -1 sprites/toyland.png 234 300 09  7 13  -5 16
-   -1 sprites/toyland.png 266 300 09  6 20 -31  5
-   -1 sprites/toyland.png 298 300 09  7 13  -6  0
-   -1 sprites/toyland.png 330 300 09  4  8  26 13
-   -1 sprites/toyland.png 346 300 09  3 12  -5 20
-   -1 sprites/toyland.png 364 300 09  5  8 -31  6
-   -1 sprites/toyland.png 380 300 09  4 15  -6  0
-
-   -1 sprites/toyland.png  10 330 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 330 09 20 37  -4 11
-   -1 sprites/toyland.png 106 330 09 26 37 -31  5
-   -1 sprites/toyland.png 154 330 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 330 09  9 16  17 11
-   -1 sprites/toyland.png 234 330 09  9 15  -6 22
-   -1 sprites/toyland.png 266 330 09  9 16 -31  3
-   -1 sprites/toyland.png 298 330 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 330 09  7  8  25 11
-   -1 sprites/toyland.png 346 330 09  5 10  -4 26
-   -1 sprites/toyland.png 364 330 09  7  8 -31  5
-   -1 sprites/toyland.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 51 01 00 00 00
-
-   -1 * 14	 02 05 52 81 80 00 FF 01 50 00 00 00 51 00
-   -1 * 6	 07 83 01 \7! 03 01
-   -1 * 7	 03 05 01 06 00 52 00
--- a/media/extra_grf/rivers/toyland.png
+++ b/media/extra_grf/rivers/toyland.png
--- a/media/extra_grf/rivers/tropic.nfo
+++ b/media/extra_grf/rivers/tropic.nfo
@@ -1,282 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "Tropic river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png  10  10 09 19 38  -5  0
-   -1 sprites/tropic_desert.png  58  10 09 18 38  -5 13
-   -1 sprites/tropic_desert.png 106  10 09 18 38 -31 13
-   -1 sprites/tropic_desert.png 154  10 09 19 38 -31  0
-   -1 sprites/tropic_desert.png 202  10 09  9 19  14 11
-   -1 sprites/tropic_desert.png 234  10 09  9 16  -7 22
-   -1 sprites/tropic_desert.png 266  10 09  9 19 -31 11
-   -1 sprites/tropic_desert.png 298  10 09  9 16  -7  0
-   -1 sprites/tropic_desert.png 330  10 09  6  8  25 13
-   -1 sprites/tropic_desert.png 346  10 09  4 12  -5 27
-   -1 sprites/tropic_desert.png 364  10 09  6  8 -31 13
-   -1 sprites/tropic_desert.png 380  10 09  5 12  -5  0
-
-   -1 sprites/tropic_desert.png  10  40 09 11 40  -7  0
-   -1 sprites/tropic_desert.png  58  40 09 18 39  -6  5
-   -1 sprites/tropic_desert.png 106  40 09 11 38 -31 12
-   -1 sprites/tropic_desert.png 154  40 09 18 39 -31  0
-   -1 sprites/tropic_desert.png 202  40 09  6 20  13  5
-   -1 sprites/tropic_desert.png 234  40 09  7 13  -6 16
-   -1 sprites/tropic_desert.png 266  40 09  6 20 -31 12
-   -1 sprites/tropic_desert.png 298  40 09  7 13  -5  0
-   -1 sprites/tropic_desert.png 330  40 09  5  8  25  6
-   -1 sprites/tropic_desert.png 346  40 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364  40 09  4  8 -31 13
-   -1 sprites/tropic_desert.png 380  40 09  4 15  -7  0
-
-   -1 sprites/tropic_desert.png  10  70 09 20 38  -5 -8
-   -1 sprites/tropic_desert.png  58  70 09 26 38  -5  5
-   -1 sprites/tropic_desert.png 106  70 09 20 37 -31 11
-   -1 sprites/tropic_desert.png 154  70 09 27 38 -31 -8
-   -1 sprites/tropic_desert.png 202  70 09  9 16  17  3
-   -1 sprites/tropic_desert.png 234  70 09  9 15  -7 22
-   -1 sprites/tropic_desert.png 266  70 09  9 16 -31 11
-   -1 sprites/tropic_desert.png 298  70 09  9 15  -6 -8
-   -1 sprites/tropic_desert.png 330  70 09  7  8  25  5
-   -1 sprites/tropic_desert.png 346  70 09  5 10  -4 27
-   -1 sprites/tropic_desert.png 364  70 09  7  8 -31 11
-   -1 sprites/tropic_desert.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/tropic_desert.png  10 100 09 18 39  -6  0
-   -1 sprites/tropic_desert.png  58 100 09 11 38  -5 12
-   -1 sprites/tropic_desert.png 106 100 09 18 39 -31  5
-   -1 sprites/tropic_desert.png 154 100 09 11 40 -32  0
-   -1 sprites/tropic_desert.png 202 100 09  6 20  13 12
-   -1 sprites/tropic_desert.png 234 100 09  7 13  -5 16
-   -1 sprites/tropic_desert.png 266 100 09  6 20 -31  5
-   -1 sprites/tropic_desert.png 298 100 09  7 13  -6  0
-   -1 sprites/tropic_desert.png 330 100 09  4  8  26 13
-   -1 sprites/tropic_desert.png 346 100 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 100 09  5  8 -31  6
-   -1 sprites/tropic_desert.png 380 100 09  4 15  -6  0
-
-   -1 sprites/tropic_desert.png  10 130 09 27 38  -5 -8
-   -1 sprites/tropic_desert.png  58 130 09 20 37  -4 11
-   -1 sprites/tropic_desert.png 106 130 09 26 37 -31  5
-   -1 sprites/tropic_desert.png 154 130 09 20 38 -31 -8
-   -1 sprites/tropic_desert.png 202 130 09  9 16  17 11
-   -1 sprites/tropic_desert.png 234 130 09  9 15  -6 22
-   -1 sprites/tropic_desert.png 266 130 09  9 16 -31  3
-   -1 sprites/tropic_desert.png 298 130 09  9 15  -7 -8
-   -1 sprites/tropic_desert.png 330 130 09  7  8  25 11
-   -1 sprites/tropic_desert.png 346 130 09  5 10  -4 26
-   -1 sprites/tropic_desert.png 364 130 09  7  8 -31  5
-   -1 sprites/tropic_desert.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 40 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png  10  10 09 19 38  -5  0
-   -1 sprites/tropic_forest.png  58  10 09 18 38  -5 13
-   -1 sprites/tropic_forest.png 106  10 09 18 38 -31 13
-   -1 sprites/tropic_forest.png 154  10 09 19 38 -31  0
-   -1 sprites/tropic_forest.png 202  10 09  9 19  14 11
-   -1 sprites/tropic_forest.png 234  10 09  9 16  -7 22
-   -1 sprites/tropic_forest.png 266  10 09  9 19 -31 11
-   -1 sprites/tropic_forest.png 298  10 09  9 16  -7  0
-   -1 sprites/tropic_forest.png 330  10 09  6  8  25 13
-   -1 sprites/tropic_forest.png 346  10 09  4 12  -5 27
-   -1 sprites/tropic_forest.png 364  10 09  6  8 -31 13
-   -1 sprites/tropic_forest.png 380  10 09  5 12  -5  0
-
-   -1 sprites/tropic_forest.png  10  40 09 11 40  -7  0
-   -1 sprites/tropic_forest.png  58  40 09 18 39  -6  5
-   -1 sprites/tropic_forest.png 106  40 09 11 38 -31 12
-   -1 sprites/tropic_forest.png 154  40 09 18 39 -31  0
-   -1 sprites/tropic_forest.png 202  40 09  6 20  13  5
-   -1 sprites/tropic_forest.png 234  40 09  7 13  -6 16
-   -1 sprites/tropic_forest.png 266  40 09  6 20 -31 12
-   -1 sprites/tropic_forest.png 298  40 09  7 13  -5  0
-   -1 sprites/tropic_forest.png 330  40 09  5  8  25  6
-   -1 sprites/tropic_forest.png 346  40 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364  40 09  4  8 -31 13
-   -1 sprites/tropic_forest.png 380  40 09  4 15  -7  0
-
-   -1 sprites/tropic_forest.png  10  70 09 20 38  -5 -8
-   -1 sprites/tropic_forest.png  58  70 09 26 38  -5  5
-   -1 sprites/tropic_forest.png 106  70 09 20 37 -31 11
-   -1 sprites/tropic_forest.png 154  70 09 27 38 -31 -8
-   -1 sprites/tropic_forest.png 202  70 09  9 16  17  3
-   -1 sprites/tropic_forest.png 234  70 09  9 15  -7 22
-   -1 sprites/tropic_forest.png 266  70 09  9 16 -31 11
-   -1 sprites/tropic_forest.png 298  70 09  9 15  -6 -8
-   -1 sprites/tropic_forest.png 330  70 09  7  8  25  5
-   -1 sprites/tropic_forest.png 346  70 09  5 10  -4 27
-   -1 sprites/tropic_forest.png 364  70 09  7  8 -31 11
-   -1 sprites/tropic_forest.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/tropic_forest.png  10 100 09 18 39  -6  0
-   -1 sprites/tropic_forest.png  58 100 09 11 38  -5 12
-   -1 sprites/tropic_forest.png 106 100 09 18 39 -31  5
-   -1 sprites/tropic_forest.png 154 100 09 11 40 -32  0
-   -1 sprites/tropic_forest.png 202 100 09  6 20  13 12
-   -1 sprites/tropic_forest.png 234 100 09  7 13  -5 16
-   -1 sprites/tropic_forest.png 266 100 09  6 20 -31  5
-   -1 sprites/tropic_forest.png 298 100 09  7 13  -6  0
-   -1 sprites/tropic_forest.png 330 100 09  4  8  26 13
-   -1 sprites/tropic_forest.png 346 100 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 100 09  5  8 -31  6
-   -1 sprites/tropic_forest.png 380 100 09  4 15  -6  0
-
-   -1 sprites/tropic_forest.png  10 130 09 27 38  -5 -8
-   -1 sprites/tropic_forest.png  58 130 09 20 37  -4 11
-   -1 sprites/tropic_forest.png 106 130 09 26 37 -31  5
-   -1 sprites/tropic_forest.png 154 130 09 20 38 -31 -8
-   -1 sprites/tropic_forest.png 202 130 09  9 16  17 11
-   -1 sprites/tropic_forest.png 234 130 09  9 15  -6 22
-   -1 sprites/tropic_forest.png 266 130 09  9 16 -31  3
-   -1 sprites/tropic_forest.png 298 130 09  9 15  -7 -8
-   -1 sprites/tropic_forest.png 330 130 09  7  8  25 11
-   -1 sprites/tropic_forest.png 346 130 09  5 10  -4 26
-   -1 sprites/tropic_forest.png 364 130 09  7  8 -31  5
-   -1 sprites/tropic_forest.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 41 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png  10 210 09 19 38  -5  0
-   -1 sprites/tropic_desert.png  58 210 09 18 38  -5 13
-   -1 sprites/tropic_desert.png 106 210 09 18 38 -31 13
-   -1 sprites/tropic_desert.png 154 210 09 19 38 -31  0
-   -1 sprites/tropic_desert.png 202 210 09  9 19  14 11
-   -1 sprites/tropic_desert.png 234 210 09  9 16  -7 22
-   -1 sprites/tropic_desert.png 266 210 09  9 19 -31 11
-   -1 sprites/tropic_desert.png 298 210 09  9 16  -7  0
-   -1 sprites/tropic_desert.png 330 210 09  6  8  25 13
-   -1 sprites/tropic_desert.png 346 210 09  4 12  -5 27
-   -1 sprites/tropic_desert.png 364 210 09  6  8 -31 13
-   -1 sprites/tropic_desert.png 380 210 09  5 12  -5  0
-
-   -1 sprites/tropic_desert.png  10 240 09 11 40  -7  0
-   -1 sprites/tropic_desert.png  58 240 09 18 39  -6  5
-   -1 sprites/tropic_desert.png 106 240 09 11 38 -31 12
-   -1 sprites/tropic_desert.png 154 240 09 18 39 -31  0
-   -1 sprites/tropic_desert.png 202 240 09  6 20  13  5
-   -1 sprites/tropic_desert.png 234 240 09  7 13  -6 16
-   -1 sprites/tropic_desert.png 266 240 09  6 20 -31 12
-   -1 sprites/tropic_desert.png 298 240 09  7 13  -5  0
-   -1 sprites/tropic_desert.png 330 240 09  5  8  25  6
-   -1 sprites/tropic_desert.png 346 240 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 240 09  4  8 -31 13
-   -1 sprites/tropic_desert.png 380 240 09  4 15  -7  0
-
-   -1 sprites/tropic_desert.png  10 270 09 20 38  -5 -8
-   -1 sprites/tropic_desert.png  58 270 09 26 38  -5  5
-   -1 sprites/tropic_desert.png 106 270 09 20 37 -31 11
-   -1 sprites/tropic_desert.png 154 270 09 27 38 -31 -8
-   -1 sprites/tropic_desert.png 202 270 09  9 16  17  3
-   -1 sprites/tropic_desert.png 234 270 09  9 15  -7 22
-   -1 sprites/tropic_desert.png 266 270 09  9 16 -31 11
-   -1 sprites/tropic_desert.png 298 270 09  9 15  -6 -8
-   -1 sprites/tropic_desert.png 330 270 09  7  8  25  5
-   -1 sprites/tropic_desert.png 346 270 09  5 10  -4 27
-   -1 sprites/tropic_desert.png 364 270 09  7  8 -31 11
-   -1 sprites/tropic_desert.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/tropic_desert.png  10 300 09 18 39  -6  0
-   -1 sprites/tropic_desert.png  58 300 09 11 38  -5 12
-   -1 sprites/tropic_desert.png 106 300 09 18 39 -31  5
-   -1 sprites/tropic_desert.png 154 300 09 11 40 -32  0
-   -1 sprites/tropic_desert.png 202 300 09  6 20  13 12
-   -1 sprites/tropic_desert.png 234 300 09  7 13  -5 16
-   -1 sprites/tropic_desert.png 266 300 09  6 20 -31  5
-   -1 sprites/tropic_desert.png 298 300 09  7 13  -6  0
-   -1 sprites/tropic_desert.png 330 300 09  4  8  26 13
-   -1 sprites/tropic_desert.png 346 300 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 300 09  5  8 -31  6
-   -1 sprites/tropic_desert.png 380 300 09  4 15  -6  0
-
-   -1 sprites/tropic_desert.png  10 330 09 27 38  -5 -8
-   -1 sprites/tropic_desert.png  58 330 09 20 37  -4 11
-   -1 sprites/tropic_desert.png 106 330 09 26 37 -31  5
-   -1 sprites/tropic_desert.png 154 330 09 20 38 -31 -8
-   -1 sprites/tropic_desert.png 202 330 09  9 16  17 11
-   -1 sprites/tropic_desert.png 234 330 09  9 15  -6 22
-   -1 sprites/tropic_desert.png 266 330 09  9 16 -31  3
-   -1 sprites/tropic_desert.png 298 330 09  9 15  -7 -8
-   -1 sprites/tropic_desert.png 330 330 09  7  8  25 11
-   -1 sprites/tropic_desert.png 346 330 09  5 10  -4 26
-   -1 sprites/tropic_desert.png 364 330 09  7  8 -31  5
-   -1 sprites/tropic_desert.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 42 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png  10 210 09 19 38  -5  0
-   -1 sprites/tropic_forest.png  58 210 09 18 38  -5 13
-   -1 sprites/tropic_forest.png 106 210 09 18 38 -31 13
-   -1 sprites/tropic_forest.png 154 210 09 19 38 -31  0
-   -1 sprites/tropic_forest.png 202 210 09  9 19  14 11
-   -1 sprites/tropic_forest.png 234 210 09  9 16  -7 22
-   -1 sprites/tropic_forest.png 266 210 09  9 19 -31 11
-   -1 sprites/tropic_forest.png 298 210 09  9 16  -7  0
-   -1 sprites/tropic_forest.png 330 210 09  6  8  25 13
-   -1 sprites/tropic_forest.png 346 210 09  4 12  -5 27
-   -1 sprites/tropic_forest.png 364 210 09  6  8 -31 13
-   -1 sprites/tropic_forest.png 380 210 09  5 12  -5  0
-
-   -1 sprites/tropic_forest.png  10 240 09 11 40  -7  0
-   -1 sprites/tropic_forest.png  58 240 09 18 39  -6  5
-   -1 sprites/tropic_forest.png 106 240 09 11 38 -31 12
-   -1 sprites/tropic_forest.png 154 240 09 18 39 -31  0
-   -1 sprites/tropic_forest.png 202 240 09  6 20  13  5
-   -1 sprites/tropic_forest.png 234 240 09  7 13  -6 16
-   -1 sprites/tropic_forest.png 266 240 09  6 20 -31 12
-   -1 sprites/tropic_forest.png 298 240 09  7 13  -5  0
-   -1 sprites/tropic_forest.png 330 240 09  5  8  25  6
-   -1 sprites/tropic_forest.png 346 240 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 240 09  4  8 -31 13
-   -1 sprites/tropic_forest.png 380 240 09  4 15  -7  0
-
-   -1 sprites/tropic_forest.png  10 270 09 20 38  -5 -8
-   -1 sprites/tropic_forest.png  58 270 09 26 38  -5  5
-   -1 sprites/tropic_forest.png 106 270 09 20 37 -31 11
-   -1 sprites/tropic_forest.png 154 270 09 27 38 -31 -8
-   -1 sprites/tropic_forest.png 202 270 09  9 16  17  3
-   -1 sprites/tropic_forest.png 234 270 09  9 15  -7 22
-   -1 sprites/tropic_forest.png 266 270 09  9 16 -31 11
-   -1 sprites/tropic_forest.png 298 270 09  9 15  -6 -8
-   -1 sprites/tropic_forest.png 330 270 09  7  8  25  5
-   -1 sprites/tropic_forest.png 346 270 09  5 10  -4 27
-   -1 sprites/tropic_forest.png 364 270 09  7  8 -31 11
-   -1 sprites/tropic_forest.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/tropic_forest.png  10 300 09 18 39  -6  0
-   -1 sprites/tropic_forest.png  58 300 09 11 38  -5 12
-   -1 sprites/tropic_forest.png 106 300 09 18 39 -31  5
-   -1 sprites/tropic_forest.png 154 300 09 11 40 -32  0
-   -1 sprites/tropic_forest.png 202 300 09  6 20  13 12
-   -1 sprites/tropic_forest.png 234 300 09  7 13  -5 16
-   -1 sprites/tropic_forest.png 266 300 09  6 20 -31  5
-   -1 sprites/tropic_forest.png 298 300 09  7 13  -6  0
-   -1 sprites/tropic_forest.png 330 300 09  4  8  26 13
-   -1 sprites/tropic_forest.png 346 300 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 300 09  5  8 -31  6
-   -1 sprites/tropic_forest.png 380 300 09  4 15  -6  0
-
-   -1 sprites/tropic_forest.png  10 330 09 27 38  -5 -8
-   -1 sprites/tropic_forest.png  58 330 09 20 37  -4 11
-   -1 sprites/tropic_forest.png 106 330 09 26 37 -31  5
-   -1 sprites/tropic_forest.png 154 330 09 20 38 -31 -8
-   -1 sprites/tropic_forest.png 202 330 09  9 16  17 11
-   -1 sprites/tropic_forest.png 234 330 09  9 15  -6 22
-   -1 sprites/tropic_forest.png 266 330 09  9 16 -31  3
-   -1 sprites/tropic_forest.png 298 330 09  9 15  -7 -8
-   -1 sprites/tropic_forest.png 330 330 09  7  8  25 11
-   -1 sprites/tropic_forest.png 346 330 09  5 10  -4 26
-   -1 sprites/tropic_forest.png 364 330 09  7  8 -31  5
-   -1 sprites/tropic_forest.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 43 01 00 00 00
-
-   -1 * 14	 02 05 44 81 81 00 FF 01 40 00 01 01 41 00
-   -1 * 14	 02 05 45 81 81 00 FF 01 42 00 01 01 43 00
-   -1 * 14	 02 05 46 81 80 00 FF 01 44 00 00 00 45 00
-   -1 * 6	 07 83 01 \7! 02 01
-   -1 * 7	 03 05 01 06 00 46 00
--- a/media/extra_grf/rivers/tropic_desert.png
+++ b/media/extra_grf/rivers/tropic_desert.png
--- a/media/extra_grf/rivers/tropic_forest.png
+++ b/media/extra_grf/rivers/tropic_forest.png
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,39 +1,3 @@
-openttd (1.1.3) unstable; urgency=low
-
-  * New upstream release 1.1.3
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 15 Sep 2011 21:00:00 +0200
-
-openttd (1.1.3-RC1) unstable; urgency=low
-
-  * New upstream release 1.1.3-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Sep 2011 17:00:00 +0200
-
-openttd (1.1.2) unstable; urgency=low
-
-  * New upstream release 1.1.2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Aug 2011 17:00:00 +0200
-
-openttd (1.1.2~RC2) unstable; urgency=low
-
-  * New upstream release 1.1.2-RC2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 30 Jul 2011 21:00:00 +0200
-
-openttd (1.1.2~RC1) unstable; urgency=low
-
-  * New upstream release 1.1.2-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 24 Jul 2011 21:00:00 +0200
-
-openttd (1.1.1) unstable; urgency=low
-
-  * New upstream release 1.1.1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Jun 2011 00:00:00 +0200
-
 openttd (1.1.1~RC1) unstable; urgency=low

  * New upstream release 1.1.1-RC1
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.1.3
+set OPENTTD_VERSION=1.1.1-RC1
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -2,7 +2,7 @@

 %define binname         openttd

-%define srcver          1.1.3
+%define srcver          1.1.1

 %if %{dedicated}
 Name:           %{binname}-dedicated
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
 !define APPV_MINOR 1
-!define APPV_MAINT 3
-!define APPV_BUILD 1
-!define APPV_EXTRA ""
+!define APPV_MAINT 1
+!define APPV_BUILD 0
+!define APPV_EXTRA "-RC1"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -57,7 +57,6 @@ Var CDDRIVE
 ; Modern interface settings
 !include "MUI2.nsh"
 !include "InstallOptions.nsh"
-!include "WinVer.nsh"

 !define MUI_ABORTWARNING
 !define MUI_WELCOMEPAGE_TITLE_3LINES
@@ -519,17 +518,17 @@ hasCD:
 FunctionEnd

 ;-------------------------------------------------------------------------------
-; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
+; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
 Function GetWindowsVersion
 	ClearErrors
+	StrCpy $R0 "winnt"
+
+	GetVersion::WindowsPlatformId
+	Pop $R0
+	IntCmp $R0 2 WinNT 0
 	StrCpy $R0 "win9x"
-	${If} ${IsNT}
-		${If} ${IsWinXP}
-		${AndIf} ${AtLeastServicePack} 3
-		${OrIf} ${AtLeastWin2003}
-			StrCpy $R0 "winnt"
-		${EndIf}
-	${EndIf}
+WinNT:
+	ClearErrors
 	Push $R0
 FunctionEnd

@@ -541,12 +540,12 @@ Function CheckProcessorArchitecture
 	IntCmp $R0 64 Win64 0
 	ClearErrors
 	IntCmp ${APPBITS} 64 0 Done
-	MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
+	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 	GoTo Done
 Win64:
 	ClearErrors
 	IntCmp ${APPBITS} 64 Done 0
-	MessageBox MB_YESNO|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
+	MessageBox MB_OKCANCEL|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 	GoTo Done
 Abort:
 	Quit
@@ -561,12 +560,12 @@ Function CheckWindowsVersion
 	StrCmp $R0 "win9x" 0 WinNT
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" Done 0
-	MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the Windows XP SP3, Vista and 7 version on Windows 95, 98, ME, 2000 and XP without SP3. This is will not work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
+	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 	GoTo Done
 WinNT:
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" 0 Done
-	MessageBox MB_YESNO|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98, 2000 and XP without SP3 version on Windows XP SP3, Vista or 7. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
+	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 Abort:
 	Quit
 Done:
@@ -675,7 +674,8 @@ WelcomeToSetup:
 	ReadRegStr $OLDVERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion"
 	; Gets the older version then displays it in a message box
 	MessageBox MB_OK|MB_ICONINFORMATION \
-		"Welcome to ${APPNAMEANDVERSION} Setup.$\nThis will allow you to upgrade from version $OLDVERSION."
+		"Welcome to ${APPNAMEANDVERSION} Setup.$\n \
+		This will allow you to upgrade from version $OLDVERSION."
 	SectionSetFlags ${Section2} 0x80 ; set bit 7
 	SectionSetFlags ${Section3} 0x80 ; set bit 7
 	SectionSetFlags ${Section4} 0x80 ; set bit 7
@@ -686,7 +686,8 @@ VersionsAreEqual:
 	ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString"
 	IfFileExists "$UninstallString" "" FinishCallback
 	MessageBox MB_YESNO|MB_ICONQUESTION \
-		"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\nAre you trying to uninstall it?" \
+		"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\n \
+		Are you trying to uninstall it?" \
 		IDYES DoUninstall IDNO FinishCallback
 DoUninstall: ; You have the same version as this installer.  This allows you to uninstall.
 	Exec "$UninstallString"
@@ -694,7 +695,8 @@ DoUninstall: ; You have the same version as this installer.  This allows you to

 InstallerIsOlder:
 	MessageBox MB_OK|MB_ICONSTOP \
-		"You have a newer version of ${APPNAME}.$\nSetup will now exit."
+		"You have a newer version of ${APPNAME}.$\n \
+		Setup will now exit."
 	Quit

 FinishCallback:
--- a/os/windows/installer/version_win32.txt
+++ b/os/windows/installer/version_win32.txt
@@ -1,5 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "XP SP3, Vista and 7"
+!define EXTRA_VERSION "2000, XP, Vista and 7"
 !define APPARCH "win32"     ; Define the application architecture
 !define BINARY_DIR "${PATH_ROOT}objs\win32\Release"
 InstallDir "$PROGRAMFILES32\OpenTTD\"
--- a/os/windows/installer/version_win9x.txt
+++ b/os/windows/installer/version_win9x.txt
@@ -1,5 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "95, 98, ME, 2000 and XP without SP3"
+!define EXTRA_VERSION "95, 98 and ME"
 !define APPARCH "win9x"     ; Define the application architecture
 !define BINARY_DIR "${PATH_ROOT}bin"
 InstallDir "$PROGRAMFILES32\OpenTTD\"
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
--- a/projects/openttd_vs100.vcxproj.in
+++ b/projects/openttd_vs100.vcxproj.in
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2011-09-15
-Release version: 1.1.3
+Last updated:    2011-05-15
+Release version: 1.1.1-RC1
 ------------------------------------------------------------------------


@@ -249,12 +249,9 @@ wait for an error message to pop up. The error message will tell you

 4.2) OpenTTD directories
 ---- -------------------
-OpenTTD uses its own directory to store its required 3rd party base set files (see section
-4.1 "Required 3rd party files") and non-compulsory extension and configuration files. See
-below for their proper place within this OpenTTD main data directory.
-
-The main OpenTTD directories can be found in various locations, depending on your operating
-system:
+The required 3rd party files listed in the section 4.1 "(Required) 3rd party files"
+as well as other non-compulsory extensions (NewGRFs, AI, heightmaps, scenarios) can be
+placed in a few different locations:
 	1. The current working directory (from where you started OpenTTD)
 		For non-Windows operating systems OpenTTD will not scan for files in this
 		directory if it is your personal directory, i.e. "~/", or when it is the
@@ -276,26 +273,7 @@ system:
 	5. The installation directory (Linux only)
 		Linux:   /usr/share/games/openttd
 	6. The application bundle (Mac OSX only)
-		It includes the OpenTTD files (grf+lng) and it will work as long as they aren't
-		touched
-
-Different types of data or extensions go into different subdirectories of the chosen main
-OpenTTD directory:
-	Config File:         (no subdirectory)
-	Screenshots:         (no subdirectory)
-	Base Graphics:       data                    (or a subdirectory thereof)
-	Sound Sets:          data                    (or a subdirectory thereof)
-	NewGRFs:             data                    (or a subdirectory thereof)
-	32bpp Sets:          data                    (or a subdirectory thereof)
-	Music Sets:          gm                      (or a subdirectory thereof)
-	AIs:                 ai                      (or a subdirectory thereof)
-	AI Libraries:        ai/libraries            (or a subdirectory thereof)
-	Savegames:           save
-	Automatic Savegames: save/autosave
-	Scenarios:           scenario
-
-The (automatically created) directory content_download is for OpenTTD's internal use and
-no files should be added to it or its subdirectories manually.
+		It includes the OpenTTD files (grf+lng) and it will work as long as they aren't touched

 Notes:
 	- Linux in the previous list means .deb, but most paths should be similar for others.
@@ -379,7 +357,7 @@ OpenTTD in debug mode.
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
 .INI format. It's mostly undocumented. Almost all settings can be changed
 ingame by using the 'Advanced Settings' window.
-When you cannot find openttd.cfg you should look in the directories as
+When you can not find openttd.cfg you should look in the directories as
 described in section 4.2. If you do not have an openttd.cfg OpenTTD will
 create one after closing.

@@ -441,8 +419,7 @@ DOS:
 ---- ---------------------------
 The following libraries are used by OpenTTD for:
  - libSDL/liballegro: hardware access (video, sound, mouse)
-  - zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads,
-    heightmaps
+  - zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads, heightmaps
  - liblzo2: (de)compressing of old (pre 0.3.0) savegames
  - liblzma: (de)compressing of savegames (1.1.0 and later)
  - libpng: making screenshots and loading heightmaps
@@ -470,8 +447,7 @@ The following compilers are known to compile OpenTTD:
    Version 2005 gives bogus warnings about scoping issues.
  - GNU Compiler Collection (GCC) 3.3 - 4.7.
    Versions 4.1 and earlier give bogus warnings about uninitialised variables.
-    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
-    Versions 4.5 and later give invalid warnings when lto is enabled.
+    Versions 4.4 and later give bogus warnings about freeing non-heap objects.
  - Intel C++ Compiler (ICC) 12.0.

 The following compilers are known not to compile OpenTTD:
@@ -479,8 +455,7 @@ The following compilers are known not to compile OpenTTD:
  - GNU Compiler Collection (GCC) 3.2 and earlier.
    These old versions fail due to OpenTTD's template usage.
  - Intel C++ Compiler (ICC) 11.1 and earlier.
-    Version 10.0 and earlier fail a configure check and fail with recent system
-        headers.
+    Version 10.0 and earlier fail a configure check and fail with recent system headers.
    Version 10.1 fails to compile station_gui.cpp.
    Version 11.1 fails with internal error when compiling network.cpp.
  - Clang/LLVM 2.8 and earlier.
@@ -567,76 +542,66 @@ Under Windows 98 and lower it is impossible to use a dedicated server; it will
 fail to start. Perhaps this is for the better because those OSes are not known
 for their stability.

-With the added support for font-based text selecting a non-latin language can
-result in lots of question marks ('?') being shown on screen. Please open your
-configuration file (openttd.cfg - see Section 4.2 for where to find it)
-and add a suitable font for the small, medium and / or large font, e.g.:
-	small_font = "Tahoma"
-	medium_font = "Tahoma"
-	large_font = "Tahoma"
-You should use a font name like "Tahoma" or a path to the desired font.
+With the added support for font-based text selecting a non-latin language will
+result in garbage (lots of '?') shown on screen. Please open your configuration
+file and add a desired font for small/medium/-and large_font. This can be a font
+name like "Tahoma" or a path to a font.

 Any NewGRF file used in a game is stored inside the savegame and will refuse
 to load if you don't have that NewGRF file available. A list of missing files
-can be viewed in the NewGRF window accessible from the file load dialogue window.
-
-You can try to obtain the missing files from that NewGRF dialogue or - if they
-are not available online - you can search manually through our forum's graphics
-development section (http://www.tt-forums.net/viewforum.php?f=66) or GrfCrawler
-(http://grfcrawler.tt-forums.net/). Put the NewGRF files in OpenTTD's data folder
-(see section 4.2 "OpenTTD directories") and rescan the list of available NewGRFs.
-Once you have all missing files, you are set to go.
+will be output to the console at the moment, so use the '-d' flag (on windows)
+to see this list. You just have to find the files (http://grfcrawler.tt-forums.net/)
+put them in the data/ folder and you're set to go.


 X.X) Credits
 ---- -------
 The OpenTTD team (in alphabetical order):
-  Albert Hofkamp (Alberth)        - GUI expert
-  Jean-François Claeys (Belugas)  - GUI, newindustries and more
-  Matthijs Kooijman (blathijs)    - Pathfinder-guru, pool rework
-  Christoph Elsenhans (frosch)    - General coding
-  Loï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
-  Ingo von Borstel (planetmaker)  - Support
-  Remko Bijker (Rubidium)         - Lead coder and way more
-  Zdeněk Sojka (SmatZ)            - Bug finder and fixer
-  José Soler (Terkhen)            - General coding
-  Thijs Marinussen (Yexo)         - AI Framework
+  Albert Hofkamp (Alberth)       - GUI expert
+  Jean-François Claeys (Belugas) - GUI, newindustries and more
+  Matthijs Kooijman (blathijs)   - Pathfinder-guru, pool rework
+  Christoph Elsenhans (frosch)   - General coding
+  Loï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
+  Ingo von Borstel (planetmaker) - Support
+  Remko Bijker (Rubidium)        - Lead coder and way more
+  Zdeněk Sojka (SmatZ)           - Bug finder and fixer
+  José Soler (Terkhen)           - General coding
+  Thijs Marinussen (Yexo)        - AI Framework

 Inactive Developers:
-  Bjarni Corfitzen (Bjarni)       - MacOSX port, coder and vehicles
-  Victor Fischer (Celestar)       - Programming everywhere you need him to
-  Tamás Faragó (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 1 and 2
-  Christoph Mallon (Tron)         - Programmer, code correctness police
+  Bjarni Corfitzen (Bjarni)      - MacOSX port, coder and vehicles
+  Victor Fischer (Celestar)      - Programming everywhere you need him to
+  Tamás Faragó (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 1 and 2
+  Christoph Mallon (Tron)        - Programmer, code correctness police

 Retired Developers:
-  Ludvig Strigeus (ludde)         - OpenTTD author, main coder (0.1 - 0.3.3)
-  Serge Paquet (vurlix)           - Assistant project manager, coder (0.1 - 0.3.3)
-  Dominik Scherer (dominik81)     - Lead programmer, GUI expert (0.3.0 - 0.3.6)
-  Benedikt Brüggemeier (skidd13)  - Bug fixer and code reworker
-  Patric Stout (TrueLight)        - Programmer (0.3 - pre0.7), sys op (active)
+  Ludvig Strigeus (ludde)        - OpenTTD author, main coder (0.1 - 0.3.3)
+  Serge Paquet (vurlix)          - Assistant project manager, coder (0.1 - 0.3.3)
+  Dominik Scherer (dominik81)    - Lead programmer, GUI expert (0.3.0 - 0.3.6)
+  Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
+  Patric Stout (TrueLight)       - Programmer (0.3 - pre0.7), sys op (active)

 Thanks to:
-  Josef Drexler                   - For his great work on TTDPatch.
-  Marcin Grzegorczyk              - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
-  Petr Baudiš (pasky)             - Many patches, newgrf support, etc.
-  Simon Sasburg (HackyKid)        - For the many bugfixes he has blessed us with
-  Stefan Meißner (sign_de)        - For his work on the console
-  Mike Ragsdale                   - OpenTTD installer
-  Cian Duffy (MYOB)               - BeOS port / manual writing
-  Christian Rosentreter (tokai)   - MorphOS / AmigaOS port
-  Richard Kempton (RichK67)       - Additional airports, initial TGP implementation
-  Alberto Demichelis              - Squirrel scripting language
-  L. Peter Deutsch                - MD5 implementation
-  Michael Blunck                  - For revolutionizing TTD with awesome graphics
-  George                          - Canal graphics
-  Andrew Parkhouse (andythenorth) - River graphics
-  David Dallaston (Pikka)         - Tram tracks
-  All Translators                 - For their support to make OpenTTD a truly international game
-  Bug Reporters                   - Thanks for all bug reports
-  Chris Sawyer                    - For an amazing game!
+  Josef Drexler                  - For his great work on TTDPatch.
+  Marcin Grzegorczyk             - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
+  Petr Baudiš (pasky)            - Many patches, newgrf support, etc.
+  Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with
+  Stefan Meißner (sign_de)       - For his work on the console
+  Mike Ragsdale                  - OpenTTD installer
+  Cian Duffy (MYOB)              - BeOS port / manual writing
+  Christian Rosentreter (tokai)  - MorphOS / AmigaOS port
+  Richard Kempton (RichK67)      - Additional airports, initial TGP implementation
+  Alberto Demichelis             - Squirrel scripting language
+  L. Peter Deutsch               - MD5 implementation
+  Michael Blunck                 - For revolutionizing TTD with awesome graphics
+  George                         - Canal graphics
+  David Dallaston (Pikka)        - Tram tracks
+  All Translators                - For their support to make OpenTTD a truly international game
+  Bug Reporters                  - Thanks for all bug reports
+  Chris Sawyer                   - For an amazing game!
--- a/src/3rdparty/squirrel/include/squirrel.h
+++ b/src/3rdparty/squirrel/include/squirrel.h
@@ -54,10 +54,6 @@ extern "C" {
 typedef __int64 SQInteger;
 typedef unsigned __int64 SQUnsignedInteger;
 typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
-#elif defined(_WIN32)
-typedef long long SQInteger;
-typedef unsigned long long SQUnsignedInteger;
-typedef unsigned long long SQHash; /*should be the same size of a pointer*/
 #else
 typedef long SQInteger;
 typedef unsigned long SQUnsignedInteger;
@@ -81,8 +77,6 @@ typedef float SQFloat;
 #if defined(SQUSEDOUBLE) && !defined(_SQ64)
 #ifdef _MSC_VER
 typedef __int64 SQRawObjectVal; //must be 64bits
-#elif defined(_WIN32)
-typedef long long SQRawObjectVal; //must be 64bits
 #else
 typedef long SQRawObjectVal; //must be 64bits
 #endif
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -75,9 +75,9 @@ AIInfo *AIConfig::GetInfo() const
 	return this->info;
 }

-bool AIConfig::ResetInfo(bool force_exact_match)
+bool AIConfig::ResetInfo()
 {
-	this->info = AI::FindInfo(this->name, force_exact_match ? this->version : -1, force_exact_match);
+	this->info = AI::FindInfo(this->name, -1, false);
 	return this->info != NULL;
 }

--- a/src/ai/ai_config.hpp
+++ b/src/ai/ai_config.hpp
@@ -57,12 +57,10 @@ public:
 	/**
 	 * When ever the AI Scanner is reloaded, all infos become invalid. This
 	 *  function tells AIConfig about this.
-	 * @param force_exact_match If true try to find the exact same version
-	 *   as specified. If false any version is ok.
 	 * @return \c true if the reset was successful, \c false if the AI was no longer
 	 *  found.
 	 */
-	bool ResetInfo(bool force_exact_match);
+	bool ResetInfo();

 	/**
 	 * Get the AIInfo linked to this AIConfig.
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -170,24 +170,13 @@
 	 *  a random new AI on reload). */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
 		if (_settings_game.ai_config[c] != NULL && _settings_game.ai_config[c]->HasAI()) {
-			if (!_settings_game.ai_config[c]->ResetInfo(true)) {
+			if (!_settings_game.ai_config[c]->ResetInfo()) {
 				DEBUG(ai, 0, "After a reload, the AI by the name '%s' was no longer found, and removed from the list.", _settings_game.ai_config[c]->GetName());
 				_settings_game.ai_config[c]->ChangeAI(NULL);
-				if (Company::IsValidAiID(c)) {
-					/* The code belonging to an already running AI was deleted. We can only do
-					 * one thing here to keep everything sane and that is kill the AI. After
-					 * killing the offending AI we start a random other one in it's place, just
-					 * like what would happen if the AI was missing during loading. */
-					AI::Stop(c);
-					AI::StartNew(c, false);
-				}
-			} else if (Company::IsValidAiID(c)) {
-				/* Update the reference in the Company struct. */
-				Company::Get(c)->ai_info = _settings_game.ai_config[c]->GetInfo();
 			}
 		}
 		if (_settings_newgame.ai_config[c] != NULL && _settings_newgame.ai_config[c]->HasAI()) {
-			if (!_settings_newgame.ai_config[c]->ResetInfo(false)) {
+			if (!_settings_newgame.ai_config[c]->ResetInfo()) {
 				DEBUG(ai, 0, "After a reload, the AI by the name '%s' was no longer found, and removed from the list.", _settings_newgame.ai_config[c]->GetName());
 				_settings_newgame.ai_config[c]->ChangeAI(NULL);
 			}
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -374,7 +374,6 @@ struct AISettingsWindow : public Window {
 				/* One of the arrows is clicked (or green/red rect in case of bool value) */
 				if (IsInsideMM(x, 0, 21)) {
 					int new_val = this->ai_config->GetSetting(config_item.name);
-					int old_val = new_val;
 					if (bool_item) {
 						new_val = !new_val;
 					} else if (x >= 10) {
@@ -389,19 +388,18 @@ struct AISettingsWindow : public Window {
 						this->clicked_increase = false;
 					}

-					if (new_val != old_val) {
-						this->ai_config->SetSetting(config_item.name, new_val);
-						this->clicked_button = num;
-						this->timeout = 5;
+					this->ai_config->SetSetting(config_item.name, new_val);
+					this->clicked_button = num;
+					this->timeout = 5;

-						this->CheckDifficultyLevel();
-					}
+					this->CheckDifficultyLevel();
 				} else if (!bool_item) {
 					/* Display a query box so users can enter a custom value. */
 					this->clicked_row = num;
 					SetDParam(0, this->ai_config->GetSetting(config_item.name));
 					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, 100, this, CS_NUMERAL, QSF_NONE);
 				}
+
 				this->SetDirty();
 				break;
 			}
--- a/src/ai/api/ai_airport.cpp
+++ b/src/ai/api/ai_airport.cpp
@@ -131,7 +131,7 @@
 	extern uint8 GetAirportNoiseLevelForTown(const AirportSpec *as, TileIndex town_tile, TileIndex tile);

 	if (!::IsValidTile(tile)) return -1;
-	if (!IsAirportInformationAvailable(type)) return -1;
+	if (!IsValidAirportType(type)) return -1;

 	if (_settings_game.economy.station_noise_level) {
 		const AirportSpec *as = ::AirportSpec::Get(type);
--- a/src/ai/api/ai_airport.hpp
+++ b/src/ai/api/ai_airport.hpp
@@ -180,7 +180,6 @@ public:
 	 *  built at this tile.
 	 * @param tile The tile to check.
 	 * @param type The AirportType to check.
-	 * @pre IsAirportInformationAvailable(type).
 	 * @return The amount of noise added to the nearest town.
 	 * @note The noise will be added to the town with TownID GetNearestTown(tile, type).
 	 */
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -15,14 +15,6 @@
 * functions may still be available if you return an older API version
 * in GetAPIVersion() in info.nut.
 *
- * \b 1.1.3
- *
- * No changes
- *
- * \b 1.1.2
- *
- * No changes
- *
 * \b 1.1.1
 *
 * No changes
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -66,11 +66,11 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
 		if (order_position == AIOrder::ORDER_INVALID) return NULL;
 	}
 	const Order *order = v->orders.list->GetFirstOrder();
-	while (order->GetType() == OT_IMPLICIT) order = order->next;
+	while (order->GetType() == OT_AUTOMATIC) order = order->next;
 	while (order_position > 0) {
 		order_position = (AIOrder::OrderPosition)(order_position - 1);
 		order = order->next;
-		while (order->GetType() == OT_IMPLICIT) order = order->next;
+		while (order->GetType() == OT_AUTOMATIC) order = order->next;
 	}
 	return order;
 }
@@ -135,12 +135,12 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
 		int cur_order_pos = ::Vehicle::Get(vehicle_id)->cur_real_order_index;
 		const Order *order = ::Vehicle::Get(vehicle_id)->GetOrder(0);
 		if (order == NULL) return ORDER_INVALID;
-		int num_implicit_orders = 0;
+		int num_automatic_orders = 0;
 		for (int i = 0; i < cur_order_pos; i++) {
-			if (order->GetType() == OT_IMPLICIT) num_implicit_orders++;
+			if (order->GetType() == OT_AUTOMATIC) num_automatic_orders++;
 			order = order->next;
 		}
-		return (AIOrder::OrderPosition)(cur_order_pos - num_implicit_orders);
+		return (AIOrder::OrderPosition)(cur_order_pos - num_automatic_orders);
 	}
 	return (order_position >= 0 && order_position < ::Vehicle::Get(vehicle_id)->GetNumManualOrders()) ? order_position : ORDER_INVALID;
 }
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -14,7 +14,6 @@
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_industrytype.hpp"
-#include "ai_cargo.hpp"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
@@ -171,7 +170,6 @@
 	EnforcePrecondition(false, platform_length > 0 && platform_length <= 0xFF);
 	EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType()));
 	EnforcePrecondition(false, station_id == AIStation::STATION_NEW || station_id == AIStation::STATION_JOIN_ADJACENT || AIStation::IsValidStation(station_id));
-	EnforcePrecondition(false, AICargo::IsValidCargo(cargo_id));
 	EnforcePrecondition(false, source_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(source_industry));
 	EnforcePrecondition(false, goal_industry   == AIIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry   == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(goal_industry));

--- a/src/ai/api/ai_rail.hpp
+++ b/src/ai/api/ai_rail.hpp
@@ -279,7 +279,6 @@ public:
 	 * @pre num_platforms > 0 && num_platforms <= 255.
 	 * @pre platform_length > 0 && platform_length <= 255.
 	 * @pre station_id == AIStation::STATION_NEW || station_id == AIStation::STATION_JOIN_ADJACENT || AIStation::IsValidStation(station_id).
-	 * @pre AICargo::IsValidCargo(cargo_type)
 	 * @pre source_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(source_industry).
 	 * @pre goal_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(goal_industry).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
--- a/src/ai/api/ai_station.hpp
+++ b/src/ai/api/ai_station.hpp
@@ -117,8 +117,7 @@ public:

 	/**
 	 * Find out if this station is within the rating influence of a town.
-	 *  The service quality of stations with signs within this radius
-	 *  influences the rating of the town.
+	 *  Stations within the radius influence the rating of the town.
 	 * @param station_id The station to check.
 	 * @param town_id The town to check.
 	 * @return True if the tile is within the rating influence of the town.
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -13,7 +13,6 @@
 #include "ai_tile.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "ai_cargo.hpp"
 #include "../../station_func.h"
 #include "../../company_func.h"
 #include "../../water_map.h"
@@ -193,7 +192,7 @@

 /* static */ int32 AITile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, int width, int height, int radius)
 {
-	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !AICargo::IsValidCargo(cargo_type)) return -1;
+	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0) return -1;

 	CargoArray acceptance = ::GetAcceptanceAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
 	return acceptance[cargo_type];
@@ -201,7 +200,7 @@

 /* static */ int32 AITile::GetCargoProduction(TileIndex tile, CargoID cargo_type, int width, int height, int radius)
 {
-	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !AICargo::IsValidCargo(cargo_type)) return -1;
+	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0) return -1;

 	CargoArray produced = ::GetProductionAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
 	return produced[cargo_type];
--- a/src/ai/api/ai_tile.hpp
+++ b/src/ai/api/ai_tile.hpp
@@ -319,7 +319,6 @@ public:
 	 * @param height The height of the station.
 	 * @param radius The radius of the station.
 	 * @pre AIMap::IsValidTile(tile).
-	 * @pre AICargo::IsValidCargo(cargo_type)
 	 * @pre width > 0.
 	 * @pre height > 0.
 	 * @pre radius >= 0.
@@ -336,7 +335,6 @@ public:
 	 * @param height The height of the station.
 	 * @param radius The radius of the station.
 	 * @pre AIMap::IsValidTile(tile).
-	 * @pre AICargo::IsValidCargo(cargo_type)
 	 * @pre width > 0.
 	 * @pre height > 0.
 	 * @pre radius >= 0.
@@ -441,8 +439,7 @@ public:

 	/**
 	 * Find out if this tile is within the rating influence of a town.
-	 *  If a station sign would be on this tile, the servicing quality of the station would
-	 *  influence the rating of the town.
+	 *  Stations on this tile influence the rating of the town.
 	 * @param tile The tile to check.
 	 * @param town_id The town to check.
 	 * @return True if the tile is within the rating influence of the town.
--- a/src/ai/api/ai_town.hpp
+++ b/src/ai/api/ai_town.hpp
@@ -209,8 +209,7 @@ public:

 	/**
 	 * Find out if this tile is within the rating influence of a town.
-	 *  If a station sign would be on this tile, the servicing quality of the station would
-	 *  influence the rating of the town.
+	 *  Stations on this tile influence the rating of the town.
 	 * @param town_id The town to check.
 	 * @param tile The tile to check.
 	 * @pre IsValidTown(town_id).
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -31,7 +31,7 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height);
 void UpdateAirplanesOnNewStation(const Station *st);
 void UpdateAircraftCache(Aircraft *v);

-void AircraftLeaveHangar(Aircraft *v, Direction exit_dir);
+void AircraftLeaveHangar(Aircraft *v);
 void AircraftNextAirportPos_and_Order(Aircraft *v);
 void SetAircraftPosition(Aircraft *v, int x, int y, int z);
 byte GetAircraftFlyingAltitude(const Aircraft *v);
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -1243,20 +1243,12 @@ void AircraftNextAirportPos_and_Order(Aircraft *v)
 	v->pos = v->previous_pos = AircraftGetEntryPoint(v, apc, rotation);
 }

-/**
- * Aircraft is about to leave the hangar.
- * @param v Aircraft leaving.
- * @param exit_dir The direction the vehicle leaves the hangar.
- * @note This function is called in AfterLoadGame for old savegames, so don't rely
- *       on any data to be valid, especially don't rely on the fact that the vehicle
- *       is actually on the ground inside a depot.
- */
-void AircraftLeaveHangar(Aircraft *v, Direction exit_dir)
+void AircraftLeaveHangar(Aircraft *v)
 {
 	v->cur_speed = 0;
 	v->subspeed = 0;
 	v->progress = 0;
-	v->direction = exit_dir;
+	v->direction = DIR_SE;
 	v->vehstatus &= ~VS_HIDDEN;
 	{
 		Vehicle *u = v->Next();
@@ -1341,8 +1333,7 @@ static void AircraftEventHandler_InHangar(Aircraft *v, const AirportFTAClass *ap
 		/* airplane goto state takeoff, helicopter to helitakeoff */
 		v->state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF;
 	}
-	const Station *st = Station::GetByTile(v->tile);
-	AircraftLeaveHangar(v, st->airport.GetHangarExitDirection(v->tile));
+	AircraftLeaveHangar(v);
 	AirportMove(v, apc);
 }

--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -26,7 +26,6 @@
 #include "widgets/dropdown_type.h"
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
-#include "vehicle_func.h"
 #include "sprite.h"

 #include "table/strings.h"
@@ -196,7 +195,6 @@ Window *ShowBuildAirToolbar()

 EventState AirportToolbarGlobalHotkeys(uint16 key, uint16 keycode)
 {
-	if (!CanBuildVehicleInfrastructure(VEH_AIRCRAFT)) return ES_NOT_HANDLED;
 	int num = CheckHotkeyMatch<BuildAirToolbarWindow>(_airtoolbar_hotkeys, keycode, NULL, true);
 	if (num == -1) return ES_NOT_HANDLED;
 	Window *w = ShowBuildAirToolbar();
@@ -424,6 +422,11 @@ public:
 		_selected_airport_index = airport_index;
 		_selected_airport_layout = 0;

+		if (_selected_airport_index != -1) {
+			const AirportSpec *as = AirportClass::Get(_selected_airport_class, _selected_airport_index);
+			this->preview_sprite = GetCustomAirportSprite(as, _selected_airport_layout);
+		}
+
 		this->UpdateSelectSize();
 		this->SetDirty();
 	}
@@ -442,8 +445,6 @@ public:
 			if (rotation == DIR_E || rotation == DIR_W) Swap(w, h);
 			SetTileSelectSize(w, h);

-			this->preview_sprite = GetCustomAirportSprite(as, _selected_airport_layout);
-
 			this->SetWidgetDisabledState(BAIRW_LAYOUT_DECREASE, _selected_airport_layout == 0);
 			this->SetWidgetDisabledState(BAIRW_LAYOUT_INCREASE, _selected_airport_layout + 1 >= as->num_table);

@@ -577,7 +578,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = {
 static const WindowDesc _build_airport_desc(
 	WDP_AUTO, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
-	WDF_CONSTRUCTION | WDF_UNCLICK_BUTTONS,
+	WDF_CONSTRUCTION,
 	_nested_build_airport_widgets, lengthof(_nested_build_airport_widgets)
 );

@@ -589,5 +590,4 @@ static void ShowBuildAirportPicker(Window *parent)
 void InitializeAirportGui()
 {
 	_selected_airport_class = APC_BEGIN;
-	_selected_airport_index = -1;
 }
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -213,35 +213,29 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
 * Get the EngineID of the replacement for a vehicle
 * @param v The vehicle to find a replacement for
 * @param c The vehicle's owner (it's faster to forward the pointer than refinding it)
- * @param [out] e the EngineID of the replacement. INVALID_ENGINE if no replacement is found
- * @return Error if the engine to build is not available
+ * @return the EngineID of the replacement. INVALID_ENGINE if no buildable replacement is found
 */
-static CommandCost GetNewEngineType(const Vehicle *v, const Company *c, EngineID &e)
+static EngineID GetNewEngineType(const Vehicle *v, const Company *c)
 {
 	assert(v->type != VEH_TRAIN || !v->IsArticulatedPart());

-	e = INVALID_ENGINE;
-
 	if (v->type == VEH_TRAIN && Train::From(v)->IsRearDualheaded()) {
 		/* we build the rear ends of multiheaded trains with the front ones */
-		return CommandCost();
+		return INVALID_ENGINE;
 	}

-	e = EngineReplacementForCompany(c, v->engine_type, v->group_id);
+	EngineID e = EngineReplacementForCompany(c, v->engine_type, v->group_id);

-	/* Autoreplace, if engine is available */
 	if (e != INVALID_ENGINE && IsEngineBuildable(e, v->type, _current_company)) {
-		return CommandCost();
+		return e;
 	}

-	/* Autorenew if needed */
-	if (v->NeedsAutorenewing(c)) e = v->engine_type;
+	if (v->NeedsAutorenewing(c) && // replace if engine is too old
+	    IsEngineBuildable(v->engine_type, v->type, _current_company)) { // engine can still be build
+		return v->engine_type;
+	}

-	/* Nothing to do or all is fine? */
-	if (e == INVALID_ENGINE || IsEngineBuildable(e, v->type, _current_company)) return CommandCost();
-
-	/* The engine we need is not available. Report error to user */
-	return CommandCost(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + v->type);
+	return INVALID_ENGINE;
 }

 /**
@@ -258,9 +252,7 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic

 	/* Shall the vehicle be replaced? */
 	const Company *c = Company::Get(_current_company);
-	EngineID e;
-	CommandCost cost = GetNewEngineType(old_veh, c, e);
-	if (cost.Failed()) return cost;
+	EngineID e = GetNewEngineType(old_veh, c);
 	if (e == INVALID_ENGINE) return CommandCost(); // neither autoreplace is set, nor autorenew is triggered

 	/* Does it need to be refitted */
@@ -268,7 +260,7 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
 	if (refit_cargo == CT_INVALID) return CommandCost(); // incompatible cargos

 	/* Build the new vehicle */
-	cost = DoCommand(old_veh->tile, e, 0, DC_EXEC | DC_AUTOREPLACE, GetCmdBuildVeh(old_veh));
+	CommandCost cost = DoCommand(old_veh->tile, e, 0, DC_EXEC | DC_AUTOREPLACE, GetCmdBuildVeh(old_veh));
 	if (cost.Failed()) return cost;

 	Vehicle *new_veh = Vehicle::Get(_new_vehicle_id);
@@ -670,11 +662,8 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
 	/* Test whether any replacement is set, before issuing a whole lot of commands that would end in nothing changed */
 	Vehicle *w = v;
 	bool any_replacements = false;
-	while (w != NULL) {
-		EngineID e;
-		CommandCost cost = GetNewEngineType(w, c, e);
-		if (cost.Failed()) return cost;
-		any_replacements |= (e != INVALID_ENGINE);
+	while (w != NULL && !any_replacements) {
+		any_replacements = (GetNewEngineType(w, c) != INVALID_ENGINE);
 		w = (!free_wagon && w->type == VEH_TRAIN ? Train::From(w)->GetNextUnit() : NULL);
 	}

@@ -742,7 +731,7 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
 	GroupID id_g = GB(p1, 16, 16);
 	CommandCost cost;

-	if (Group::IsValidID(id_g) ? Group::Get(id_g)->owner != _current_company : !IsAllGroupID(id_g) && !IsDefaultGroupID(id_g)) return CMD_ERROR;
+	if (!Group::IsValidID(id_g) && !IsAllGroupID(id_g) && !IsDefaultGroupID(id_g)) return CMD_ERROR;
 	if (!Engine::IsValidID(old_engine_type)) return CMD_ERROR;

 	if (new_engine_type != INVALID_ENGINE) {
--- a/src/bmp.cpp
+++ b/src/bmp.cpp
@@ -13,7 +13,6 @@
 #include "bmp.h"
 #include "core/bitmath_func.hpp"
 #include "core/alloc_func.hpp"
-#include "core/mem_func.hpp"

 void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file)
 {
@@ -130,63 +129,53 @@ static inline bool BmpRead4(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 */
 static inline bool BmpRead4Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 {
+	uint i;
 	uint x = 0;
 	uint y = info->height - 1;
+	byte n, c, b;
 	byte *pixel = &data->bitmap[y * info->width];
 	while (y != 0 || x < info->width) {
 		if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-
-		byte n = ReadByte(buffer);
-		byte c = ReadByte(buffer);
+		n = ReadByte(buffer);
+		c = ReadByte(buffer);
 		if (n == 0) {
 			switch (c) {
-				case 0: // end of line
-					x = 0;
-					if (y == 0) return false;
-					pixel = &data->bitmap[--y * info->width];
-					break;
-
-				case 1: // end of bitmap
-					return true;
-
-				case 2: { // delta
-					if (EndOfBuffer(buffer)) return false;
-					byte dx = ReadByte(buffer);
-					byte dy = ReadByte(buffer);
-
-					/* Check for over- and underflow. */
-					if (x + dx >= info->width || x + dx < x || dy > y) return false;
-
-					x += dx;
-					y -= dy;
-					pixel = &data->bitmap[y * info->width + x];
-					break;
-				}
-
-				default: { // uncompressed
-					uint i = 0;
-					while (i++ < c) {
-						if (EndOfBuffer(buffer) || x >= info->width) return false;
-						byte b = ReadByte(buffer);
-						*pixel++ = GB(b, 4, 4);
+			case 0: // end of line
+				x = 0;
+				pixel = &data->bitmap[--y * info->width];
+				break;
+			case 1: // end of bitmap
+				x = info->width;
+				y = 0;
+				pixel = NULL;
+				break;
+			case 2: // delta
+				x += ReadByte(buffer);
+				i = ReadByte(buffer);
+				if (x >= info->width || (y == 0 && i > 0)) return false;
+				y -= i;
+				pixel = &data->bitmap[y * info->width + x];
+				break;
+			default: // uncompressed
+				i = 0;
+				while (i++ < c) {
+					if (EndOfBuffer(buffer) || x >= info->width) return false;
+					b = ReadByte(buffer);
+					*pixel++ = GB(b, 4, 4);
+					x++;
+					if (x < info->width && i++ < c) {
+						*pixel++ = GB(b, 0, 4);
 						x++;
-						if (i++ < c) {
-							if (x >= info->width) return false;
-							*pixel++ = GB(b, 0, 4);
-							x++;
-						}
 					}
-					/* Padding for 16 bit align */
-					SkipBytes(buffer, ((c + 1) / 2) % 2);
-					break;
 				}
+				/* Padding for 16 bit align */
+				SkipBytes(buffer, ((c + 1) / 2) % 2);
+				break;
 			}
 		} else {
-			/* Apparently it is common to encounter BMPs where the count of
-			 * pixels to be written is higher than the remaining line width.
-			 * Ignore the superfluous pixels instead of reporting an error. */
-			uint i = 0;
-			while (x < info->width && i++ < n) {
+			i = 0;
+			while (i++ < n) {
+				if (EndOfBuffer(buffer) || x >= info->width) return false;
 				*pixel++ = GB(c, 4, 4);
 				x++;
 				if (x < info->width && i++ < n) {
@@ -223,55 +212,43 @@ static inline bool BmpRead8(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 */
 static inline bool BmpRead8Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 {
+	uint i;
 	uint x = 0;
 	uint y = info->height - 1;
+	byte n, c;
 	byte *pixel = &data->bitmap[y * info->width];
 	while (y != 0 || x < info->width) {
 		if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-
-		byte n = ReadByte(buffer);
-		byte c = ReadByte(buffer);
+		n = ReadByte(buffer);
+		c = ReadByte(buffer);
 		if (n == 0) {
 			switch (c) {
-				case 0: // end of line
-					x = 0;
-					if (y == 0) return false;
-					pixel = &data->bitmap[--y * info->width];
-					break;
-
-				case 1: // end of bitmap
-					return true;
-
-				case 2: { // delta
-					if (EndOfBuffer(buffer)) return false;
-					byte dx = ReadByte(buffer);
-					byte dy = ReadByte(buffer);
-
-					/* Check for over- and underflow. */
-					if (x + dx >= info->width || x + dx < x || dy > y) return false;
-
-					x += dx;
-					y -= dy;
-					pixel = &data->bitmap[y * info->width + x];
-					break;
-				}
-
-				default: { // uncompressed
-					for (uint i = 0; i < c; i++) {
-						if (EndOfBuffer(buffer) || x >= info->width) return false;
-						*pixel++ = ReadByte(buffer);
-						x++;
-					}
-					/* Padding for 16 bit align */
-					SkipBytes(buffer, c % 2);
-					break;
-				}
+			case 0: // end of line
+				x = 0;
+				pixel = &data->bitmap[--y * info->width];
+				break;
+			case 1: // end of bitmap
+				x = info->width;
+				y = 0;
+				pixel = NULL;
+				break;
+			case 2: // delta
+				x += ReadByte(buffer);
+				i = ReadByte(buffer);
+				if (x >= info->width || (y == 0 && i > 0)) return false;
+				y -= i;
+				pixel = &data->bitmap[y * info->width + x];
+				break;
+			default: // uncompressed
+				if ((x += c) > info->width) return false;
+				for (i = 0; i < c; i++) *pixel++ = ReadByte(buffer);
+				/* Padding for 16 bit align */
+				SkipBytes(buffer, c % 2);
+				break;
 			}
 		} else {
-			/* Apparently it is common to encounter BMPs where the count of
-			 * pixels to be written is higher than the remaining line width.
-			 * Ignore the superfluous pixels instead of reporting an error. */
-			for (uint i = 0; x < info->width && i < n; i++) {
+			for (i = 0; i < n; i++) {
+				if (x >= info->width) return false;
 				*pixel++ = c;
 				x++;
 			}
@@ -310,7 +287,6 @@ bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 {
 	uint32 header_size;
 	assert(info != NULL);
-	MemSetT(info, 0);

 	/* Reading BMP header */
 	if (ReadWord(buffer) != 0x4D42) return false; // signature should be 'BM'
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -420,11 +420,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo

 		Money infra_cost = 0;
 		switch (transport_type) {
-			case TRANSPORT_ROAD:
-				infra_cost = (bridge_len + 2) * _price[PR_BUILD_ROAD] * 2;
-				/* In case we add a new road type as well, we must be aware of those costs. */
-				if (IsBridgeTile(start)) infra_cost *= CountBits(GetRoadTypes(start) | (RoadTypes)road_rail_type);
-				break;
+			case TRANSPORT_ROAD: infra_cost = (bridge_len + 2) * _price[PR_BUILD_ROAD] * 2; break;
 			case TRANSPORT_RAIL: infra_cost = (bridge_len + 2) * RailBuildCost((RailType)road_rail_type); break;
 			default: break;
 		}
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -740,7 +740,7 @@ static uint ShowAdditionalText(int left, int right, int y, EngineID engine)

 	/* STR_BLACK_STRING is used to start the string with {BLACK} */
 	SetDParam(0, GetGRFStringID(GetEngineGRFID(engine), 0xD000 + callback));
-	StartTextRefStackUsage(0);
+	PrepareTextRefStackUsage(0);
 	uint result = DrawStringMultiLine(left, right, y, INT32_MAX, STR_BLACK_STRING);
 	StopTextRefStackUsage();
 	return result;
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -216,7 +216,7 @@ void CargoList<Tinst>::Truncate(uint max_remaining)
 		CargoPacket *cp = *it;
 		if (max_remaining == 0) {
 			/* Nothing should remain, just remove the packets. */
-			it = this->packets.erase(it);
+			this->packets.erase(it++);
 			static_cast<Tinst *>(this)->RemoveFromCache(cp);
 			delete cp;
 			continue;
@@ -276,7 +276,7 @@ bool CargoList<Tinst>::MoveTo(Tother_inst *dest, uint max_move, MoveToAction mta
 		if (cp->count <= max_move) {
 			/* Can move the complete packet */
 			max_move -= cp->count;
-			it = this->packets.erase(it);
+			this->packets.erase(it++);
 			static_cast<Tinst *>(this)->RemoveFromCache(cp);
 			switch (mta) {
 				case MTA_FINAL_DELIVERY:
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -530,7 +530,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallbac
 		/* Only show the error when it's for us. */
 		StringID error_part1 = GB(cmd, 16, 16);
 		if (estimate_only || (IsLocalCompany() && error_part1 != 0 && my_cmd)) {
-			ShowErrorMessage(error_part1, res.GetErrorMessage(), WL_INFO, x, y, res.GetTextRefStackSize(), res.GetTextRefStack());
+			ShowErrorMessage(error_part1, res.GetErrorMessage(), WL_INFO, x, y);
 		}
 	} else if (estimate_only) {
 		ShowEstimatedCostOrIncome(res.GetCost(), x, y);
@@ -735,25 +735,3 @@ void CommandCost::AddCost(const CommandCost &ret)
 		this->success = false;
 	}
 }
-
-/**
- * Values to put on the #TextRefStack for the error message.
- * There is only one static instance of the array, just like there is only one
- * instance of normal DParams.
- */
-uint32 CommandCost::textref_stack[16];
-
-/**
- * Activate usage of the NewGRF #TextRefStack for the error message.
- * @param number of entries to copy from the temporary NewGRF registers
- */
-void CommandCost::UseTextRefStack(uint num_registers)
-{
-	extern TemporaryStorageArray<int32, 0x110> _temp_store;
-
-	assert(num_registers < lengthof(textref_stack));
-	this->textref_stack_size = num_registers;
-	for (uint i = 0; i < num_registers; i++) {
-		textref_stack[i] = _temp_store.Get(0x100 + i);
-	}
-}
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -25,33 +25,30 @@ class CommandCost {
 	Money cost;       ///< The cost of this action
 	StringID message; ///< Warning message for when success is unset
 	bool success;     ///< Whether the comment went fine up to this moment
-	uint textref_stack_size;   ///< Number of uint32 values to put on the #TextRefStack for the error message.
-
-	static uint32 textref_stack[16];

 public:
 	/**
 	 * Creates a command cost return with no cost and no error
 	 */
-	CommandCost() : expense_type(INVALID_EXPENSES), cost(0), message(INVALID_STRING_ID), success(true), textref_stack_size(0) {}
+	CommandCost() : expense_type(INVALID_EXPENSES), cost(0), message(INVALID_STRING_ID), success(true) {}

 	/**
 	 * Creates a command return value the is failed with the given message
 	 */
-	explicit CommandCost(StringID msg) : expense_type(INVALID_EXPENSES), cost(0), message(msg), success(false), textref_stack_size(0) {}
+	explicit CommandCost(StringID msg) : expense_type(INVALID_EXPENSES), cost(0), message(msg), success(false) {}

 	/**
 	 * Creates a command cost with given expense type and start cost of 0
 	 * @param ex_t the expense type
 	 */
-	explicit CommandCost(ExpensesType ex_t) : expense_type(ex_t), cost(0), message(INVALID_STRING_ID), success(true), textref_stack_size(0) {}
+	explicit CommandCost(ExpensesType ex_t) : expense_type(ex_t), cost(0), message(INVALID_STRING_ID), success(true) {}

 	/**
 	 * Creates a command return value with the given start cost and expense type
 	 * @param ex_t the expense type
 	 * @param cst the initial cost of this command
 	 */
-	CommandCost(ExpensesType ex_t, const Money &cst) : expense_type(ex_t), cost(cst), message(INVALID_STRING_ID), success(true), textref_stack_size(0) {}
+	CommandCost(ExpensesType ex_t, const Money &cst) : expense_type(ex_t), cost(cst), message(INVALID_STRING_ID), success(true) {}


 	/**
@@ -103,26 +100,6 @@ public:
 		this->message = message;
 	}

-	void UseTextRefStack(uint num_registers);
-
-	/**
-	 * Returns the number of uint32 values for the #TextRefStack of the error message.
-	 * @return number of uint32 values.
-	 */
-	uint GetTextRefStackSize() const
-	{
-		return this->textref_stack_size;
-	}
-
-	/**
-	 * Returns a pointer to the values for the #TextRefStack of the error message.
-	 * @return uint32 values for the #TextRefStack
-	 */
-	const uint32 *GetTextRefStack() const
-	{
-		return textref_stack;
-	}
-
 	/**
 	 * Returns the error message of a command
 	 * @return the error message, if succeeded #INVALID_STRING_ID
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -1824,15 +1824,6 @@ struct CompanyWindow : Window
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
 	{
 		switch (widget) {
-			case CW_WIDGET_DESC_COLOUR_SCHEME_EXAMPLE: {
-				Point offset;
-				Dimension d = GetSpriteSize(SPR_VEH_BUS_SW_VIEW, &offset);
-				d.width -= offset.x;
-				d.height -= offset.y;
-				*size = maxdim(*size, d);
-				break;
-			}
-
 			case CW_WIDGET_DESC_COMPANY_VALUE:
 				SetDParam(0, INT64_MAX); // Arguably the maximum company value
 				size->width = GetStringBoundingBox(STR_COMPANY_VIEW_COMPANY_VALUE).width;
@@ -1878,13 +1869,9 @@ struct CompanyWindow : Window
 				DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE, TC_FROMSTRING, SA_CENTER);
 				break;

-			case CW_WIDGET_DESC_COLOUR_SCHEME_EXAMPLE: {
-				Point offset;
-				Dimension d = GetSpriteSize(SPR_VEH_BUS_SW_VIEW, &offset);
-				d.height -= offset.y;
-				DrawSprite(SPR_VEH_BUS_SW_VIEW, COMPANY_SPRITE_COLOUR(c->index), r.left - offset.x, (r.top + r.bottom - d.height) / 2 - offset.y);
+			case CW_WIDGET_DESC_COLOUR_SCHEME_EXAMPLE:
+				DrawSprite(SPR_VEH_BUS_SW_VIEW, COMPANY_SPRITE_COLOUR(c->index), (r.left + r.right) / 2, r.top + FONT_HEIGHT_NORMAL / 10);
 				break;
-			}

 			case CW_WIDGET_DESC_VEHICLE_COUNTS: {
 				uint amounts[4];
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -1269,7 +1269,7 @@ DEF_CONSOLE_CMD(ConRescanNewGRF)

 	TarScanner::DoScan();
 	ScanNewGRFFiles();
-	InvalidateWindowData(WC_GAME_OPTIONS, 0, GOID_NEWGRF_RESCANNED);
+	InvalidateWindowData(WC_GAME_OPTIONS, 0, 1);

 	return true;
 }
@@ -1640,7 +1640,7 @@ DEF_CONSOLE_CMD(ConCompanyPassword)
 		return false;
 	}

-	password = NetworkChangeCompanyPassword(company_id, password);
+	password = NetworkChangeCompanyPassword(company_id, password, false);

 	if (StrEmpty(password)) {
 		IConsolePrintF(CC_WARNING, "Company password cleared");
--- a/src/core/alloc_func.hpp
+++ b/src/core/alloc_func.hpp
@@ -22,29 +22,6 @@
 void NORETURN MallocError(size_t size);
 void NORETURN ReallocError(size_t size);

-/**
- * Checks whether allocating memory would overflow size_t.
- *
- * @param element_size Size of the structure to allocate.
- * @param num_elements Number of elements to allocate.
- */
-static inline void CheckAllocationConstraints(size_t element_size, size_t num_elements)
-{
-	if (num_elements > SIZE_MAX / element_size) MallocError(SIZE_MAX);
-}
-
-/**
- * Checks whether allocating memory would overflow size_t.
- *
- * @tparam T Structure to allocate.
- * @param num_elements Number of elements to allocate.
- */
-template <typename T>
-static inline void CheckAllocationConstraints(size_t num_elements)
-{
-	CheckAllocationConstraints(sizeof(T), num_elements);
-}
-
 /**
 * Simplified allocation function that allocates the specified number of
 * elements of the given type. It also explicitly casts it to the requested
@@ -65,9 +42,6 @@ static FORCEINLINE T *MallocT(size_t num_elements)
 	 */
 	if (num_elements == 0) return NULL;

-	/* Ensure the size does not overflow. */
-	CheckAllocationConstraints<T>(num_elements);
-
 	T *t_ptr = (T*)malloc(num_elements * sizeof(T));
 	if (t_ptr == NULL) MallocError(num_elements * sizeof(T));
 	return t_ptr;
@@ -122,17 +96,12 @@ static FORCEINLINE T *ReallocT(T *t_ptr, size_t num_elements)
 		return NULL;
 	}

-	/* Ensure the size does not overflow. */
-	CheckAllocationConstraints<T>(num_elements);
-
 	t_ptr = (T*)realloc(t_ptr, num_elements * sizeof(T));
 	if (t_ptr == NULL) ReallocError(num_elements * sizeof(T));
 	return t_ptr;
 }

 /** alloca() has to be called in the parent function, so define AllocaM() as a macro */
-#define AllocaM(T, num_elements) \
-	(CheckAllocationConstraints<T>(num_elements), \
-	(T*)alloca((num_elements) * sizeof(T)))
+#define AllocaM(T, num_elements) ((T*)alloca((num_elements) * sizeof(T)))

 #endif /* ALLOC_FUNC_HPP */
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -292,21 +292,6 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 	/* In all cases, make spectators of clients connected to that company */
 	if (_networking) NetworkClientsToSpectators(old_owner);
 #endif /* ENABLE_NETWORK */
-	if (old_owner == _local_company) {
-		/* Single player cheated to AI company.
-		 * There are no specatators in single player, so we must pick some other company. */
-		assert(!_networking);
-		Backup<CompanyByte> cur_company(_current_company, FILE_LINE);
-		Company *c;
-		FOR_ALL_COMPANIES(c) {
-			if (c->index != old_owner) {
-				SetLocalCompany(c->index);
-				break;
-			}
-		}
-		cur_company.Restore();
-		assert(old_owner != _local_company);
-	}

 	Town *t;

@@ -321,7 +306,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 			for (i = 0; i < 4; i++) {
 				if (c->share_owners[i] == old_owner) {
 					/* Sell his shares */
-					CommandCost res = DoCommand(0, c->index, 0, DC_EXEC | DC_BANKRUPT, CMD_SELL_SHARE_IN_COMPANY);
+					CommandCost res = DoCommand(0, c->index, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
 					/* Because we are in a DoCommand, we can't just execute another one and
 					 *  expect the money to be removed. We need to do it ourself! */
 					SubtractMoneyFromCompany(res);
@@ -336,7 +321,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 			cur_company2.Change(c->share_owners[i]);
 			if (_current_company != INVALID_OWNER) {
 				/* Sell the shares */
-				CommandCost res = DoCommand(0, old_owner, 0, DC_EXEC | DC_BANKRUPT, CMD_SELL_SHARE_IN_COMPANY);
+				CommandCost res = DoCommand(0, old_owner, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
 				/* Because we are in a DoCommand, we can't just execute another one and
 				 *  expect the money to be removed. We need to do it ourself! */
 				SubtractMoneyFromCompany(res);
@@ -1515,6 +1500,16 @@ static void DoAcquireCompany(Company *c)
 		owner->current_loan += c->current_loan;
 	}

+	Money value = CalculateCompanyValue(c) >> 2;
+	Backup<CompanyByte> cur_company(_current_company, FILE_LINE);
+	for (int i = 0; i != 4; i++) {
+		if (c->share_owners[i] != COMPANY_SPECTATOR) {
+			cur_company.Change(c->share_owners[i]);
+			SubtractMoneyFromCompany(CommandCost(EXPENSES_OTHER, -value));
+		}
+	}
+	cur_company.Restore();
+
 	if (c->is_ai) AI::Stop(c->index);

 	DeleteCompanyWindows(ci);
@@ -1594,12 +1589,9 @@ CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1
 	CompanyID target_company = (CompanyID)p1;
 	Company *c = Company::GetIfValid(target_company);

-	/* Cannot sell own shares */
-	if (c == NULL || _current_company == target_company) return CMD_ERROR;
-
-	/* Check if selling shares is allowed (protection against modified clients).
-	 * However, we must sell shares of companies being closed down. */
-	if (!_settings_game.economy.allow_shares && !(flags & DC_BANKRUPT)) return CMD_ERROR;
+	/* Check if selling shares is allowed (protection against modified clients)
+	 * Cannot sell own shares */
+	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == target_company) return CMD_ERROR;

 	/* Those lines are here for network-protection (clients can be slow) */
 	if (GetAmountOwnedBy(c, _current_company) == 0) return CommandCost();
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -91,8 +91,6 @@ Engine::Engine(VehicleType type, EngineID base)
 		this->info.base_life = 0xFF;
 		/* Set road vehicle tractive effort to the default value */
 		if (type == VEH_ROAD) this->u.road.tractive_effort = 0x4C;
-		/* Aircraft must have CT_INVALID as default, as there is no property */
-		if (type == VEH_AIRCRAFT) this->info.cargo_type = CT_INVALID;
 		/* Set visual effect to the default value */
 		switch (type) {
 			case VEH_TRAIN: this->u.rail.visual_effect = VE_DEFAULT; break;
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -21,7 +21,9 @@
 #include <Path.h>
 #include <storage/FindDirectory.h>
 #else
+#if defined(OPENBSD) || defined(DOS)
 #include <unistd.h>
+#endif
 #include <pwd.h>
 #endif
 #include <sys/stat.h>
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -1034,9 +1034,6 @@ const Sprite *GetGlyph(FontSize size, WChar key)
 	width  = max(1, slot->bitmap.width + (size == FS_NORMAL));
 	height = max(1, slot->bitmap.rows  + (size == FS_NORMAL));

-	/* Limit glyph size to prevent overflows later on. */
-	if (width > 256 || height > 256) usererror("Font glyph is too large");
-
 	/* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
 	sprite.AllocateData(width * height);
 	sprite.width = width;
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -602,22 +602,12 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 				this->SetDirty();
 				break;

-			case GLAND_GENERATE_BUTTON: { // Generate
-				/* Get rotated map size. */
-				uint map_x;
-				uint map_y;
-				if (_settings_newgame.game_creation.heightmap_rotation == HM_CLOCKWISE) {
-					map_x = this->y;
-					map_y = this->x;
-				} else {
-					map_x = this->x;
-					map_y = this->y;
-				}
+			case GLAND_GENERATE_BUTTON: // Generate
 				if (mode == GLWM_HEIGHTMAP &&
-						(map_x * 2 < (1U << _settings_newgame.game_creation.map_x) ||
-						map_x / 2 > (1U << _settings_newgame.game_creation.map_x) ||
-						map_y * 2 < (1U << _settings_newgame.game_creation.map_y) ||
-						map_y / 2 > (1U << _settings_newgame.game_creation.map_y))) {
+						(this->x * 2 < (1U << _settings_newgame.game_creation.map_x) ||
+						this->x / 2 > (1U << _settings_newgame.game_creation.map_x) ||
+						this->y * 2 < (1U << _settings_newgame.game_creation.map_y) ||
+						this->y / 2 > (1U << _settings_newgame.game_creation.map_y))) {
 					ShowQuery(
 						STR_WARNING_HEIGHTMAP_SCALE_CAPTION,
 						STR_WARNING_HEIGHTMAP_SCALE_MESSAGE,
@@ -627,7 +617,6 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 					StartGeneratingLandscape(mode);
 				}
 				break;
-			}

 			case GLAND_START_DATE_DOWN:
 			case GLAND_START_DATE_UP: // Year buttons
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -1114,19 +1114,13 @@ skip_cont:;
 /**
 * Get the size of a sprite.
 * @param sprid Sprite to examine.
- * @param [out] offset Optionally returns the sprite position offset.
 * @return Sprite size in pixels.
 * @note The size assumes (0, 0) as top-left coordinate and ignores any part of the sprite drawn at the left or above that position.
 */
-Dimension GetSpriteSize(SpriteID sprid, Point *offset)
+Dimension GetSpriteSize(SpriteID sprid)
 {
 	const Sprite *sprite = GetSprite(sprid, ST_NORMAL);

-	if (offset != NULL) {
-		offset->x = sprite->x_offs;
-		offset->y = sprite->y_offs;
-	}
-
 	Dimension d;
 	d.width  = max<int>(0, sprite->x_offs + sprite->width);
 	d.height = max<int>(0, sprite->y_offs + sprite->height);
--- a/src/gfx_func.h
+++ b/src/gfx_func.h
@@ -88,7 +88,7 @@ static const int DRAW_STRING_BUFFER = 2048;
 void RedrawScreenRect(int left, int top, int right, int bottom);
 void GfxScroll(int left, int top, int width, int height, int xo, int yo);

-Dimension GetSpriteSize(SpriteID sprid, Point *offset = NULL);
+Dimension GetSpriteSize(SpriteID sprid);
 void DrawSprite(SpriteID img, PaletteID pal, int x, int y, const SubSprite *sub = NULL);

 /** How to align the to-be drawn text. */
--- a/src/ground_vehicle.hpp
+++ b/src/ground_vehicle.hpp
@@ -52,7 +52,7 @@ struct GroundVehicleCache {
 enum GroundVehicleFlags {
 	GVF_GOINGUP_BIT               = 0,  ///< Vehicle is currently going uphill. (Cached track information for acceleration)
 	GVF_GOINGDOWN_BIT             = 1,  ///< Vehicle is currently going downhill. (Cached track information for acceleration)
-	GVF_SUPPRESS_IMPLICIT_ORDERS = 2,  ///< Disable insertion and removal of automatic orders until the vehicle completes the real order.
+	GVF_SUPPRESS_AUTOMATIC_ORDERS = 2,  ///< Disable insertion and removal of automatic orders until the vehicle completes the real order.
 };

 /**
--- a/src/gui.h
+++ b/src/gui.h
@@ -63,7 +63,7 @@ enum WarningLevel {
 	WL_CRITICAL, ///< Critical errors, the MessageBox is shown in all cases
 };

-void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0, uint textref_stack_size = 0, const uint32 *textref_stack = NULL);
+void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0);

 void ShowExtraViewPortWindow(TileIndex tile = INVALID_TILE);
 void ShowExtraViewPortWindowForTileUnderCursor();
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -142,24 +142,13 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map)
 		return false;
 	}

-	uint width = png_get_image_width(png_ptr, info_ptr);
-	uint height = png_get_image_height(png_ptr, info_ptr);
-
-	/* Check if image dimensions don't overflow a size_t to avoid memory corruption. */
-	if ((uint64)width * height >= (size_t)-1) {
-		ShowErrorMessage(STR_ERROR_PNGMAP, STR_ERROR_HEIGHTMAP_TOO_LARGE, WL_ERROR);
-		fclose(fp);
-		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-		return false;
-	}
-
 	if (map != NULL) {
-		*map = MallocT<byte>(width * height);
+		*map = MallocT<byte>(png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr));
 		ReadHeightmapPNGImageData(*map, png_ptr, info_ptr);
 	}

-	*x = width;
-	*y = height;
+	*x = png_get_image_width(png_ptr, info_ptr);
+	*y = png_get_image_height(png_ptr, info_ptr);

 	fclose(fp);
 	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -254,14 +243,6 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
 		return false;
 	}

-	/* Check if image dimensions don't overflow a size_t to avoid memory corruption. */
-	if ((uint64)info.width * info.height >= (size_t)-1 / (info.bpp == 24 ? 3 : 1)) {
-		ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_HEIGHTMAP_TOO_LARGE, WL_ERROR);
-		fclose(f);
-		BmpDestroyData(&data);
-		return false;
-	}
-
 	if (map != NULL) {
 		if (!BmpReadBitmap(&buffer, &info, &data)) {
 			ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_BMPMAP_IMAGE_TYPE, WL_ERROR);
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -74,7 +74,7 @@ static void GetCargoSuffix(uint cargo, CargoSuffixType cst, const Industry *ind,
 	if (HasBit(indspec->callback_mask, CBM_IND_CARGO_SUFFIX)) {
 		uint16 callback = GetIndustryCallback(CBID_INDUSTRY_CARGO_SUFFIX, 0, (cst << 8) | cargo, const_cast<Industry *>(ind), ind_type, (cst != CST_FUND) ? ind->location.tile : INVALID_TILE);
 		if (GB(callback, 0, 8) != 0xFF) {
-			StartTextRefStackUsage(6);
+			PrepareTextRefStackUsage(6);
 			GetString(suffix, GetGRFStringID(indspec->grf_prop.grffile->grfid, 0xD000 + callback), suffix_last);
 			StopTextRefStackUsage();
 		}
@@ -458,8 +458,8 @@ public:
 					if (callback_res != CALLBACK_FAILED) {  // Did it fail?
 						str = GetGRFStringID(indsp->grf_prop.grffile->grfid, 0xD000 + callback_res);  // No. here's the new string
 						if (str != STR_UNDEFINED) {
-							StartTextRefStackUsage(6);
-							DrawStringMultiLine(left, right, y, bottom, str, TC_YELLOW);
+							PrepareTextRefStackUsage(6);
+							DrawStringMultiLine(left, right, y, bottom, str);
 							StopTextRefStackUsage();
 						}
 					}
@@ -788,11 +788,11 @@ public:
 				if (message != STR_NULL && message != STR_UNDEFINED) {
 					y += WD_PAR_VSEP_WIDE;

-					StartTextRefStackUsage(6);
+					PrepareTextRefStackUsage(6);
 					/* Use all the available space left from where we stand up to the
 					 * end of the window. We ALSO enlarge the window if needed, so we
 					 * can 'go' wild with the bottom of the window. */
-					y = DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, y, UINT16_MAX, message, TC_BLACK);
+					y = DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, y, UINT16_MAX, message);
 					StopTextRefStackUsage();
 				}
 			}
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -99,7 +99,7 @@ STR_QUANTITY_PASSENGERS                                         :{COMMA}راكب
 STR_QUANTITY_COAL                                               :{WEIGHT} من الفحم
 STR_QUANTITY_MAIL                                               :{COMMA} صندوق من البريد
 STR_QUANTITY_OIL                                                :{VOLUME} من النفط
-STR_QUANTITY_LIVESTOCK                                          :{COMMA}راس من الماشية
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}رأس من الماشية
 STR_QUANTITY_GOODS                                              :{COMMA} قفص من البضائع
 STR_QUANTITY_GRAIN                                              :{WEIGHT} من الحبوب
 STR_QUANTITY_WOOD                                               :{WEIGHT} من الخشب
@@ -117,7 +117,7 @@ STR_QUANTITY_WATER                                              :{VOLUME} من
 STR_QUANTITY_WHEAT                                              :{WEIGHT} من القمح
 STR_QUANTITY_RUBBER                                             :{VOLUME} من المطاط
 STR_QUANTITY_SUGAR                                              :{WEIGHT} من السكر
-STR_QUANTITY_TOYS                                               :{COMMA}الالعاب
+STR_QUANTITY_TOYS                                               :{COMMA}الألعاب
 STR_QUANTITY_SWEETS                                             :{COMMA} كيس من الحلويات
 STR_QUANTITY_COLA                                               :{VOLUME} من الكولا
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} من الحلاوة القطنية
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :صورة للش
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :صورة كبيرة لكامل الخريطة -Ctrl-G -
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :حول 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :موائم العفريتات
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :اضهار /اخفاء مربح الحوارات/الخيارات
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :عالي
 STR_SEA_LEVEL_CUSTOM                                            :مخصص
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :مخصص ({NUM}%)

-
 STR_DISASTER_NONE                                               :بدون
 STR_DISASTER_REDUCED                                            :قليل
 STR_DISASTER_NORMAL                                             :طبيعي
@@ -1225,7 +1223,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :طويل - 31
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :قصير - 31 - 12 - 2008
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ايزو 31-12-2008

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}إيقاف اللعبة تلقائيا عند بدأ لعبة جديدة: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}عندمل توقف أسمح: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :لا تصرف
@@ -1408,7 +1405,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK} ابح
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK} عرض اعدادات الذكاء الصناعي
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}اغلاق'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}انهاء
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}هل تود اغلاق النسخة المفتوحة و العودة لـ {STRING}?
@@ -1420,11 +1416,11 @@ STR_OSNAME_WINDOWS                                              :ويندوز
 STR_OSNAME_DOS                                                  :دوس
 STR_OSNAME_UNIX                                                 :يونكس
 STR_OSNAME_OSX                                                  :OS{NBSP}X
-STR_OSNAME_BEOS                                                 :بي او اس
+STR_OSNAME_BEOS                                                 :بي أو أس
 STR_OSNAME_HAIKU                                                :هايكو
-STR_OSNAME_MORPHOS                                              :مورف او اس
-STR_OSNAME_AMIGAOS                                              :اميقا
-STR_OSNAME_OS2                                                  :او اس/2
+STR_OSNAME_MORPHOS                                              :مورف أو أس
+STR_OSNAME_AMIGAOS                                              :أميقا
+STR_OSNAME_OS2                                                  :أو أس/2
 STR_OSNAME_SUNOS                                                :صن

 # Abandon game
@@ -2284,7 +2280,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :ارض مملو

 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}حول النسخة المفتوحة
-STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}الحقوق الاصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة
+STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}الحقوق الأصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة
 STR_ABOUT_VERSION                                               :{BLACK}النسخة المفتوحة رقم {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2011 فريق النسخة المفتوحة

@@ -2487,8 +2483,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :يحتوي على اوامر متعددة - 8 مدخلات
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :خطأ في قرائة البرمجة
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}ملف الرسوم المستخدم حاليا يفتقد لبعض الرسوم الاساسية.{}الرجاء حدث ملف الرسوم.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :معلومات الاضافة غير متاحة
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}تم تعطيلة بواسطة{4:STRING}

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}تحذير!
@@ -2525,8 +2519,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} لـ<ح
 STR_NEWGRF_INVALID_ENGINE                                       :<موديل العربة غير صالح>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<المصنع غير صالح>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}قائمة العلامات - {COMMA} علامة
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}طابق الحالة
@@ -3135,7 +3127,7 @@ STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}السع
 STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}السعة الجديدة: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}تكلفة اعادة التهيئة: {GOLD}{CURRENCY}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}اختر العربة لاعادة تهيئتها. اسحب بالفارة لاختيار عدة عربات. اضغط على مساحة خالية لاختيار كل العربات. اضغط + كنترول لاختيار العربة الحالية وما بعدها.

-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}اختر نوع البضاعة لينقلها القطار
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}أختر نوع البضاعة لينقلها القطار
 STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK} اختر نوع حمولة العربة
 STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}اختر نوع الحمولة للسفينة
 STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}اختر نوع الحمولة للطائرة
@@ -3194,8 +3186,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :توقف
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}تجاوز هذا الامر الا اذا لم تكن الصيانة مطلوبة

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}بيانات العربة لتعريف التجاوز الى
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :نسبة التحميل
 STR_ORDER_CONDITIONAL_RELIABILITY                               :الصلاحية
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :السرعة القصوى
@@ -3256,7 +3246,7 @@ STR_ORDER_STOP_ORDER                                            :توقف

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(تلقائى)
+STR_ORDER_AUTOMATIC                                             :(تلقائى)

 STR_ORDER_FULL_LOAD                                             :-تحميل بالكامل-
 STR_ORDER_FULL_LOAD_ANY                                         :-حمل اي بضاعة بالكامل-
@@ -3447,8 +3437,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}حدث
 STR_ERROR_BMPMAP                                                :{WHITE}لا يمكن تحميل الخريطة من BMP ...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}لايمكن تحويل نوع الصورة...

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}الصورة ضخمة جدا ...
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}تحذير
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}اعادة تحجيم الخريطة المصدر كثيرا غير مستحسن. هل تريد اكمال توليد الخريطة؟

@@ -4254,7 +4242,6 @@ STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLAC
 STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
-STR_TINY_BLACK_DECIMAL                                          :{TINYFONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -587,7 +587,7 @@ STR_SORT_BY_MAX_SPEED                                           :Максыма
 STR_SORT_BY_MODEL                                               :Мадэль
 STR_SORT_BY_VALUE                                               :Кошт
 STR_SORT_BY_LENGTH                                              :Даўжыня
-STR_SORT_BY_LIFE_TIME                                           :Рэшткавы тэрмін службы
+STR_SORT_BY_LIFE_TIME                                           :Астатні тэрмін службы
 STR_SORT_BY_TIMETABLE_DELAY                                     :Адставаньне ад графіку
 STR_SORT_BY_FACILITY                                            :Тып станцыі
 STR_SORT_BY_WAITING                                             :Коль-ць грузу на станцыі
@@ -760,7 +760,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Здымак э
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Здымак усёй мапы (Ctrl+G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Аб гульні OpenTTD
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Выраўноўваньне спрайтаў
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Пераключыць абмяжоўвальныя рамкі
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -1184,7 +1183,7 @@ STR_GAME_OPTIONS_CURRENCY_DEM                                   :Нямецка
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Дацкая крона (DKK)
 STR_GAME_OPTIONS_CURRENCY_ESP                                   :Гішпанская пэсэта (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Фінская марка (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Французскі франк (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Францускі франк (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Грэцкая драхма (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Вугорскі форынт (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Ісьляндзкая крона (ISK)
@@ -1374,7 +1373,6 @@ STR_SEA_LEVEL_HIGH                                              :Вялiкая
 STR_SEA_LEVEL_CUSTOM                                            :Зададзены
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Зададзены ({NUM}%)

-
 STR_DISASTER_NONE                                               :Выключаны
 STR_DISASTER_REDUCED                                            :Зьніжаныя
 STR_DISASTER_NORMAL                                             :Звычайныя
@@ -1725,7 +1723,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Прав
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Паказаць наладкi ШI/АІ
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Выйсьці з OpenTTD

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Выхад
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Вы ўпэўнены, што жадаеце перапыніць гульню й вярнуцца ў {STRING}?
@@ -2862,8 +2859,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} <нев
 STR_NEWGRF_INVALID_ENGINE                                       :<няправільная мадэль>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<невядомае прадпрыемства>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Сьпіс таблічак - {COMMA} табліч{P ка кi ак}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Рэгiстр
@@ -3551,8 +3546,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Стоп
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Прапусціць гэтае заданьне, калі абслугоўваньне не патрабуецца

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Парамэтр транспарту для параўнаньня
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Працэнт пагрузкі
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Надзейнасьць
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Макс. хуткасьць
@@ -3613,7 +3606,7 @@ STR_ORDER_STOP_ORDER                                            :(Стоп)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Аўтаматычна)
+STR_ORDER_AUTOMATIC                                             :(Аўтаматычна)

 STR_ORDER_FULL_LOAD                                             :(Поўная загрузка)
 STR_ORDER_FULL_LOAD_ANY                                         :(Поўная загрузка любым грузам)
@@ -3804,8 +3797,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... не
 STR_ERROR_BMPMAP                                                :{WHITE}Не атрымалася загрузіць ляндшафт з BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... немагчыма пераўтварыць тып вiдарысу.

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... выява занадта вялiкая
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Выхад за межы даступных значэньняў
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Змяненьне памераў зыходнай карты да такіх значэньняў не рэкамендуецца. Працягваць?

@@ -3899,7 +3890,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... мо
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... можна будаваць толькі ў гарадах
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... можна будаваць толькі ў нізінах
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... можа знаходзіцца толькі ля краю мапы
-STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... лес можна саджаць толькі вышэй за сьнегавую лiнiю
+STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... лес можна саджаць толькі вышэй за лінію сьнегу

 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Тут немагчыма пабудаваць чыгуначную станцыю...
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -38,12 +38,12 @@ STR_CARGO_PLURAL_GRAIN                                          :{G=m}Cereais
 STR_CARGO_PLURAL_WOOD                                           :{G=f}Madeira
 STR_CARGO_PLURAL_IRON_ORE                                       :{G=m}Minério de Ferro
 STR_CARGO_PLURAL_STEEL                                          :{G=m}Aço
-STR_CARGO_PLURAL_VALUABLES                                      :{G=f}Preciosidades
+STR_CARGO_PLURAL_VALUABLES                                      :{G=f}Objetos de Valor
 STR_CARGO_PLURAL_COPPER_ORE                                     :{G=m}Minério de Cobre
 STR_CARGO_PLURAL_MAIZE                                          :{G=m}Milho
 STR_CARGO_PLURAL_FRUIT                                          :{G=f}Fruta
 STR_CARGO_PLURAL_DIAMONDS                                       :{G=m}Diamantes
-STR_CARGO_PLURAL_FOOD                                           :{G=m}Alimento
+STR_CARGO_PLURAL_FOOD                                           :{G=m}Alimentos
 STR_CARGO_PLURAL_PAPER                                          :{G=m}Papel
 STR_CARGO_PLURAL_GOLD                                           :{G=m}Ouro
 STR_CARGO_PLURAL_WATER                                          :{G=f}Água
@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ampliado em cap
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Captura de tela do mapa inteiro
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Sobre 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alinhador de "sprites"
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Alternar caixas limítrofes
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -541,7 +540,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Exibir a

 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Chave para gráficos da empresa
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clique aqui para alternar a entrada da empresa no gráfico
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clique aqui para alternar a entrada da empresa no gráfico em ligado/desligado

 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Tabela da Liga das Empresas
@@ -708,7 +707,7 @@ STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Habilita
 STR_SMALLMAP_SHOW_HEIGHT                                        :{BLACK}Mostrar altitude
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES                     :{BLACK}Não exibir indústrias no mapa
 STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES                      :{BLACK}Exibir todas as indústrias no mapa
-STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT                                :{BLACK}Alternar a exibição de mapa topográfico
+STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT                                :{BLACK}Alternar a exibição de mapa de elevação
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES                      :{BLACK}Não exibir propriedade da empresa no mapa
 STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES                       :{BLACK}Exibir todas as propriedades da empresa no mapa

@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Alto
 STR_SEA_LEVEL_CUSTOM                                            :Personalizado
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Personalizado ({NUM}%)

-
 STR_DISASTER_NONE                                               :Nenhum
 STR_DISASTER_REDUCED                                            :Reduzido
 STR_DISASTER_NORMAL                                             :Normal
@@ -1185,7 +1183,7 @@ STR_CONFIG_SETTING_TREE_PLACER                                  :{LTBLUE}Algorí
 STR_CONFIG_SETTING_TREE_PLACER_NONE                             :Nenhum
 STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :Original
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Melhorado
-STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Rotação do mapa topográfico: {ORANGE}{STRING}
+STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Rotação do mapa em relevo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Sentido Anti-Horário
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Sentido Horário
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}A altitude de um mapa regular é de: {ORANGE}{STRING}
@@ -1377,7 +1375,7 @@ STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
 STR_INTRO_NEW_GAME                                              :{BLACK}Novo Jogo
 STR_INTRO_LOAD_GAME                                             :{BLACK}Abrir Jogo
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Jogar Cenário
-STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jogar num mapa topográfico
+STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jogar num mapa de relevo
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor de Cenário
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Multi-jogador

@@ -1391,7 +1389,7 @@ STR_INTRO_QUIT                                                  :{BLACK}Sair

 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Iniciar um novo jogo. Ctrl+Clique para pular a configuração do mapa
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Carregar um jogo salvado
-STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Inica um novo jogo, a partir de um mapa topográfico
+STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Inica um novo jogo, a partir de um mapa de relevo
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Iniciar um novo jogo, usando um cenário personalizado
 STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Criar um cenário de jogo personalizado
 STR_INTRO_TOOLTIP_MULTIPLAYER                                   :{BLACK}Iniciar um jogo de vários jogadores
@@ -1409,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Checar p
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Exibir configs. da IA
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair de 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Sair
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}?
@@ -1867,7 +1864,7 @@ STR_CONTENT_TYPE_NEWGRF                                         :NewGRF
 STR_CONTENT_TYPE_AI                                             :IA
 STR_CONTENT_TYPE_AI_LIBRARY                                     :IA's disponíveis
 STR_CONTENT_TYPE_SCENARIO                                       :Cenário
-STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa topográfico
+STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa de altitudes
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Sons padrão
 STR_CONTENT_TYPE_BASE_MUSIC                                     :Músicsas padrão

@@ -1925,7 +1922,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Construi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Construir depósito (para compra e manutenção de trens). Shift altera construção/estimação de custo
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Converter linha em ponto de controle. Ctrl permite a união de pontos de controle. Shift altera construção/estimação de custo
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Construir estação ferroviária. Ctrl permite a união de estações. Shift altera construção/estimação de custo
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construir sinais ferroviários. Ctrl alterna a construção de semáforos/sinais{}Clicar e arrastar constroi sinais até a próxima junção{}Ctrl+Clique alterna a janela de seleção de sinais. Shift altera construção/estimação de custo
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construir sinais ferroviários. Ctrl liga/desliga a constução de semáforos/sinais{}Clicar e arrastar constroi sinais até a próxima junção{}Ctrl+Clique liga/desliga a janela de seleção de sinais. Shift altera construção/estimação de custo
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Construir ponte ferroviária. Shift altera construção/estimação de custo
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construir túnel ferroviário. Shift altera construção/estimação de custo
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Alternar construir/remover ferrovias, sinais, pontos de controle e estações. Segure ctrl para remover os trilhos de estações e pontos de controle.
@@ -2294,7 +2291,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Salvar J
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Abrir Jogo
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Salvar Cenário
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Abrir Cenário
-STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carregar mapa topográfico
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carregar Relevo
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Clique aqui para selecionar o diretório padrão de jogos salvos
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} livres
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de unidades, diretórios e arquivos de jogos gravados
@@ -2346,8 +2343,8 @@ STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Randômi
 STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Randômico
 STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual

-STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotação do mapa topográfico:
-STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome do mapa topográfico:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotação do mapa em relevo:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome do mapa em relevo:
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Tamanho:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}

@@ -2407,8 +2404,8 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o N
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos NewGRF instalados. Clique em um deles para mudar seus parâmetros

 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
-STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna paleta
-STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Liga/Desliga paleta
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Liga/desliga a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar alterações

 STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Procurar o conteúdo on-line
@@ -2488,8 +2485,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém entradas múltiplas de Ação 8
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Continuar lendo após o fim do pseudo-sprite
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Estão faltando alguns sprites na base de gráficos em uso.{}Por favor atualize a base de gráficos
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF requisitados não estão dispon.
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} foi desativado por {4:STRING}

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!
@@ -2526,8 +2521,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <car
 STR_NEWGRF_INVALID_ENGINE                                       :<modelo de veíc. inválido>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<indústria inválida>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de Placas - {COMMA} Placa{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Diferenciar caixa alta
@@ -3195,8 +3188,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Parar
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Pular esta ordem a menos que necessite de manutenção

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Dados do veículo no qual se basear para pular ordem
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Percentual carregado
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Confiabilidade
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Velocidade máxima
@@ -3257,7 +3248,7 @@ STR_ORDER_STOP_ORDER                                            :(Parar)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implícito)
+STR_ORDER_AUTOMATIC                                             :(Automatico)

 STR_ORDER_FULL_LOAD                                             :(Carregar completamente)
 STR_ORDER_FULL_LOAD_ANY                                         :(Carregar completamente qualquer carga)
@@ -3413,8 +3404,8 @@ STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{U
 # Income 'floats'
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Custo: {CURRENCY}
 STR_INCOME_FLOAT_COST                                           :{RED}Custo: {CURRENCY}
-STR_INCOME_FLOAT_INCOME_SMALL                                   :{TINYFONT}{GREEN}Lucro: {CURRENCY}
-STR_INCOME_FLOAT_INCOME                                         :{GREEN}Lucro: {CURRENCY}
+STR_INCOME_FLOAT_INCOME_SMALL                                   :{TINYFONT}{GREEN}Renda: {CURRENCY}
+STR_INCOME_FLOAT_INCOME                                         :{GREEN}Renda: {CURRENCY}
 STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Transferir: {CURRENCY}
 STR_FEEDER                                                      :{YELLOW}Transferir: {CURRENCY}
 STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Custo Estimado: {CURRENCY}
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -3239,7 +3239,7 @@ STR_ORDER_STOP_ORDER                                            :(Спри)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :{G=n}(Автоматично)
+STR_ORDER_AUTOMATIC                                             :{G=n}(Автоматично)

 STR_ORDER_FULL_LOAD                                             :(Напълно натовари)
 STR_ORDER_FULL_LOAD_ANY                                         :(Напълно натовари какъвто и да е товар)
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ampliació en l
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Captura de pantalla de tot el mapa
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Quant a 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alineador d'sprite
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Commuta les caixes delimitadores
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -860,19 +859,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unitats
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecció d'unitats de moneda

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Lliura Esterlina (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dòlar Americà (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Ien Japonès (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Lliures (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dòlars ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Iens (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Shillings Austríacs (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Francs Belgues (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Francs Suïssos (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corones Txeques (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marcs Alemanys (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corones Daneses (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesseta Espanyola (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesseta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marcs Finesos (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc Francès (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracmes Gregues (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florí Hongarès (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corones Islandeses (ISK)
@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Alt
 STR_SEA_LEVEL_CUSTOM                                            :Personalitzat
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Personalitzat ({NUM}%)

-
 STR_DISASTER_NONE                                               :Cap
 STR_DISASTER_REDUCED                                            :Reduït
 STR_DISASTER_NORMAL                                             :Normal
@@ -1113,8 +1111,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realístic
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Model d'acceleració per als vehicles: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Original
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Realístic
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Inclinació de les pujades per als trens: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Inclinació de les pujades per als vehicles: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Inclinació de les pujades per als trens {ORANGE}{STRING}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Inclinació de les pujades per als vehicles {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Prohibeix fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Permet ajuntar estacions no annexes: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Utilitza algorisme millorat de càrrega: {ORANGE}{STRING}
@@ -1409,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Comprova
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Mostra els paràmetres IA
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Surt d'OpenTTD

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Surt
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
@@ -2526,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <cà
 STR_NEWGRF_INVALID_ENGINE                                       :<model de vehicle invàlid>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<indústria invàlida>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyal{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Coincideix Majúscules/Minúscules
@@ -3195,12 +3190,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Para
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Salta aquesta ordre si no és que es necessita una revisió

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Dades del vehicle on basar el salt a
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Percentatge de càrrega
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Fiabilitat
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Velocitat màxima
-STR_ORDER_CONDITIONAL_AGE                                       :Antiguitat (anys)
+STR_ORDER_CONDITIONAL_AGE                                       :Antiguitat del vehicle (anys)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Necessita revisió
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre

@@ -3257,7 +3250,7 @@ STR_ORDER_STOP_ORDER                                            :(Para)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implícit)
+STR_ORDER_AUTOMATIC                                             :(Automàtic)

 STR_ORDER_FULL_LOAD                                             :(Carrega del tot)
 STR_ORDER_FULL_LOAD_ANY                                         :(Carrega del tot qualsevol càrrega)
@@ -3448,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... algu
 STR_ERROR_BMPMAP                                                :{WHITE}Impossible carregar el terreny des del BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... no s'ha pogut convertir el tipus d'imatge

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... l'imatge és massa gran
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Alerta d'escala
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}No es recomana redimensionar massa el mapa d'origen. Vols continuar amb la generació?

--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -543,7 +543,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zumirano u slic
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Slika zaslona cijele mape
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :O 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Poravnjanje sprite-a
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Odaberi granične okvire
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -956,25 +955,25 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor no

 ############ start of currency region
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Funte (£)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Američki Dolar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japanski Jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolari ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euri (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jeni (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrijski šiling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgijski franak (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švicarski franak (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Češka kruna (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Njemačka marka (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danska kruna (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Španjolska Pezeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pezeta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finska marka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francuski Franak (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franak (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grčka drahma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Mađarski forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandska kruna (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Talijanska lira (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nizozemski gulden (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norveška kruna (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poljski Zloti (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poljski zloti (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunjski lev (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruske rublje (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenski tolar (SIT)
@@ -1153,7 +1152,6 @@ STR_SEA_LEVEL_HIGH                                              :Visoko
 STR_SEA_LEVEL_CUSTOM                                            :Proizvoljno
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Proizvoljno ({NUM}%)

-
 STR_DISASTER_NONE                                               :Ništa
 STR_DISASTER_REDUCED                                            :Smanjeno
 STR_DISASTER_NORMAL                                             :Normalno
@@ -1208,7 +1206,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistični
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Model ubrzavanja za cestovna vozila: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :{G=middle}Originalno
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :{G=middle}Stvarno
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Nagib padine za vlakove: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Strmost kosina za vlakove {ORANGE}{STRING}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Nagib padine za cestovna vozila {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Zabrani vlakovima i brodovima skretanja pod 90 stupnjeva: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Dopusti spajanje postaja koje nisu izravno jedna do druge {ORANGE}{STRING}
@@ -1504,7 +1502,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Provjeri
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Prikaži postavke umjetne inteligencije
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Završi 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Prekid
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
@@ -2621,8 +2618,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} od <pog
 STR_NEWGRF_INVALID_ENGINE                                       :<pogrešan model vozila>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<pogrešna industrija>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Popis znakova - {COMMA} znak{P "" a ova}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Velika i mala slova
@@ -3290,8 +3285,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stani
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Preskoči ovu narudžbu osim ako servis nije potreban

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Podaci vozila prema kojima se zasniva skok
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Postotak ukrcaja
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Pouzdanost
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maksimalna brzina
@@ -3352,7 +3345,7 @@ STR_ORDER_STOP_ORDER                                            :(Stani)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implicitno)
+STR_ORDER_AUTOMATIC                                             :(Automatsko)

 STR_ORDER_FULL_LOAD                                             :(Puni ukrcaj)
 STR_ORDER_FULL_LOAD_ANY                                         :(Puni ukrcaj bilo kojeg tereta)
@@ -3543,8 +3536,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... neš
 STR_ERROR_BMPMAP                                                :{WHITE}Nije moguće učitati krajolik iz BMP-a...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... ne mogu pretvoriti vrstu slike.

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... slika je prevelika
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Upozorenje o veličini
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Prekomjerna promjena veličine karte nije preporučena. Nastaviti sa kreiranjem?

--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -335,16 +335,16 @@ STR_SORT_BY_PRODUCTION                                          :produkce
 STR_SORT_BY_TYPE                                                :typu
 STR_SORT_BY_TRANSPORTED                                         :přepravy
 STR_SORT_BY_NUMBER                                              :čísla
-STR_SORT_BY_PROFIT_LAST_YEAR                                    :hrubého zisku minulý rok
-STR_SORT_BY_PROFIT_THIS_YEAR                                    :hrubého zisku za tento rok
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :hrubého zisku vloni
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :hrubého zisku letos
 STR_SORT_BY_AGE                                                 :stáří
 STR_SORT_BY_RELIABILITY                                         :spolehlivosti
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :celkové kapacity dle druhu nákladu
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :celkové kapacity podle druhu nákladu
 STR_SORT_BY_MAX_SPEED                                           :max. rychlosti
 STR_SORT_BY_MODEL                                               :modelu
 STR_SORT_BY_VALUE                                               :hodnoty
 STR_SORT_BY_LENGTH                                              :délky
-STR_SORT_BY_LIFE_TIME                                           :Zbývající životnost
+STR_SORT_BY_LIFE_TIME                                           :zbývající životnosti
 STR_SORT_BY_TIMETABLE_DELAY                                     :zpoždění
 STR_SORT_BY_FACILITY                                            :druhu stanice
 STR_SORT_BY_WAITING                                             :množství čekajícího nákladu
@@ -517,7 +517,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Přiblíženo n
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Screenshot celé mapy
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :O 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Zarovnávání spritů
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Přepnout ohraničení
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -941,10 +940,10 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Měna
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výběr jednotek měny

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japonský jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japonský jen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Rakouský šilink (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgický frank (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švýcarský frank (CHF)
@@ -1139,7 +1138,6 @@ STR_SEA_LEVEL_HIGH                                              :vysoká
 STR_SEA_LEVEL_CUSTOM                                            :Uživatelský
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Uživatelský ({NUM}%)

-
 STR_DISASTER_NONE                                               :žádné
 STR_DISASTER_REDUCED                                            :snížené
 STR_DISASTER_NORMAL                                             :běžné
@@ -1307,7 +1305,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :dlouhý (31. pr
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :krátký (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Zastavit automaticky hru při začínání nové hry: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}V pozastavené hře povolit: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :žádné akce
@@ -1490,7 +1487,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Ukázat,
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Ukázat nastavení AI
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ukončit 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Konec
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {STRING}?
@@ -1784,7 +1780,7 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Přijímání informací o hře...
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Přijímání informací o společnosti...
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" i ů} před vámi
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" i ů} před námi
 STR_NETWORK_CONNECTING_DOWNLOADING_1                            :{BLACK}{BYTES} staženo
 STR_NETWORK_CONNECTING_DOWNLOADING_2                            :{BLACK}{BYTES} / {BYTES} staženo

@@ -2575,8 +2571,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje víc GRF akcí 8
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čtení za koncem pseudo-spritu
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Právě používanému základnímu grafickému setu chybí obrázky.{}Prosím, updatujte ho
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Požadované zdroje grafiky nejsou k dispozici
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} byla vypnuta {4:STRING}

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varování!
@@ -2613,8 +2607,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} jednot{
 STR_NEWGRF_INVALID_ENGINE                                       :<neplatný druh vozidla>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<neplatný průmysl>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Seznam popisků - {COMMA} popis{P ek ky ků}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Shoda
@@ -3288,8 +3280,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Zastavit
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Vlastnost vozidla, podle které přeskakovat
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Procento naložení
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Spolehlivost
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximální rychlost
@@ -3350,7 +3340,7 @@ STR_ORDER_STOP_ORDER                                            :(Zastavit)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Automaticky)
+STR_ORDER_AUTOMATIC                                             :(automatický)

 STR_ORDER_FULL_LOAD                                             :(plně naložit)
 STR_ORDER_FULL_LOAD_ANY                                         :(plně naložit cokoli)
@@ -3541,8 +3531,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... něc
 STR_ERROR_BMPMAP                                                :{WHITE}Nebylo možné nahrát krajinu z BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... nelze převést formát obrázku

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... obrázek je příliš velký
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Varování kvůli velikosti
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Tak velká zmena velikosti zdrojové mapy není doporučena. Pokračovat s generováním?

@@ -3636,7 +3624,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... mů
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... může se postavit jedině ve městě
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... může se postavit jen v nížinách
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... může být umístěno pouze poblíž okrajů mapy
-STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... les lze vysadit pouze nad sněžnou čárou
+STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... lesy lze vysadit jen nad sněhovou čáru

 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Zde nelze postavit nádraží...
@@ -3916,7 +3904,7 @@ STR_TOWN_BUILDING_NAME_PARK_1                                   :Park
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_2                           :Kancelářský blok
 STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1                      :Obchody a kanceláře
 STR_TOWN_BUILDING_NAME_MODERN_OFFICE_BUILDING_1                 :Moderní kancelářský blok
-STR_TOWN_BUILDING_NAME_WAREHOUSE_1                              :Skladiště
+STR_TOWN_BUILDING_NAME_WAREHOUSE_1                              :Výrobní hala
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_3                           :Kancelářský blok
 STR_TOWN_BUILDING_NAME_STADIUM_1                                :Stadion
 STR_TOWN_BUILDING_NAME_OLD_HOUSES_1                             :Staré domy
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoomet skærmbi
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Kæmpe skærmbillede (Ctrl-G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Om 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Tilpas grafikelement
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Slå afgrænsningsrammerne til/fra
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -1224,7 +1223,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :langt (31. Dec
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :kort (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Sæt automatisk på pause når nyt spil startes: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Når pauset tillad: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :ingen handlinger
@@ -2485,8 +2483,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Indeholder flere "Action 8" poster.
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Læs forbi enden af pseudo-sprite
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det brugte basis graftik sæt mangler en række elementer.{}Updater venligst grafik sættet
-STR_NEWGRF_ERROR_GRM_FAILED                                     :De valgte GRF ressourcer er ikke tilgængelige
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} blev deaktiveret af {4:STRING}

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
@@ -3250,7 +3246,7 @@ STR_ORDER_STOP_ORDER                                            :(Stop)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Automatisk)
+STR_ORDER_AUTOMATIC                                             :(Automatisk)

 STR_ORDER_FULL_LOAD                                             :(Fuld last)
 STR_ORDER_FULL_LOAD_ANY                                         :(Fuld last vilkårlig type fragt)
@@ -4246,7 +4242,6 @@ STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLAC
 STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
-STR_TINY_BLACK_DECIMAL                                          :{TINYFONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ingezoomd scree
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Screenshot van hele kaart
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Over 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite uitlijner
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Schakel selectiekaders
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -620,7 +619,7 @@ STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Selectee
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Programmashuffle aan/uit
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Toon nummerkeuzescherm

-STR_ERROR_NO_SONGS                                              :{WHITE}Er is een muziek set zonder liedjes gekozen. Er zal geen muziek worden gespeeld
+STR_ERROR_NO_SONGS                                              :{WHITE}Een muziek set zonder leidjes is gekozen. Er zal geen muziek worden gespeeld

 # Playlist window
 STR_PLAYLIST_MUSIC_PROGRAM_SELECTION                            :{WHITE}Muziekprogrammakeuze
@@ -859,10 +858,10 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Kies valuta

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japanse Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pond (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Oostenrijkse Shilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgische Frank (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Zwitserse Frank (CHF)
@@ -948,7 +947,7 @@ STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Vink dit

 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Schermresolutie
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecteer de schermresolutie
-STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Anders
+STR_GAME_OPTIONS_RESOLUTION_OTHER                               :anders

 STR_GAME_OPTIONS_SCREENSHOT_FORMAT                              :{BLACK}Screenshotformaat
 STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Selecteer het bestandsformaat van screenshots
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :Hoog
 STR_SEA_LEVEL_CUSTOM                                            :Aangepast
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Aangepast ({NUM}%)

-
 STR_DISASTER_NONE                                               :Geen
 STR_DISASTER_REDUCED                                            :Verminderd
 STR_DISASTER_NORMAL                                             :Normaal
@@ -1251,7 +1249,7 @@ STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Toon ge
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Hou bouwgereedschappen actief na gebruik: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Groepeer uitgaven in bedrijfsfinanciënscherm: {ORANGE}{STRING}

-STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Bouwen van infrastructuur uitschakelen wanneer geen geschikt voertuig beschikbaar is: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Bouwen van infrstructuur uitschakelen wanneer geen geschikt voertuig beschikbaar is: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Maximaal aantal treinen per bedrijf: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Maximaal aantal wegvoertuigen per bedrijf: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Maximaal aantal vliegtuigen per bedrijf: {ORANGE}{STRING}
@@ -1408,7 +1406,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Zoeken n
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Toon AI-instellingen
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Verlaat 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Afsluiten
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Weet je zeker dat je OpenTTD wilt verlaten en terug wilt keren naar {STRING}?
@@ -1775,7 +1772,7 @@ STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}De serve
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Je bent verbannen van deze server
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Je bent van de server geschopt
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Valsspelen is niet toegestaan op deze server
-STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Je stuurde te veel commando's naar de server
+STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Je stuurde teveel commando's naar de server

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemene fout
@@ -1957,18 +1954,18 @@ STR_STATION_CLASS_WAYP                                          :Controleposten

 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Seinkeuze
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Bloksein (armsein){}Dit is het simpelste soort sein, dat slechts één trein tegelijk in hetzelfde blok toelaat
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Ingangssein (semafoor){}Groen zolang als er één of meer groene uitgangsseinen zijn volgend na dit sein. Anders is deze rood
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Bloksein (armsein){}Dit is het simpelste soort sein, dat slechts een trein tegelijk in hetzelfde blok toelaat
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Ingangssein (semafoor){}Groen zolang als er een of meer groene uitgangsseinen zijn volgend na dit sein. Anders is deze rood
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Uitgangssein (armsein){}Gedraagt zich hetzelfde als een gewoon bloksein, maar is nodig om ingangs- en combinatieseinen te sturen
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combinatiesein (armsein){}Het combinatiesein gedraagt zich als zowel ingangs- als uitgangssein. Zo kun je grote netwerken van beginseinen maken
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combinatiesein (armsein){}Het combinatiesein gedraagt zicht als zowel ingangs- als uitgangssein. Zo kun je grote netwerken van beginseinen maken
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Routesein (armsein){}Een routesein laat meer dan één trein tegelijk in een seinblok toe, als de trein een route kan reserveren naar een veilige stopplaats. Routeseinen kunnen van achteren worden gepasseerd
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Eenrichtingsrouteseinen (armsein){}Een routesein laat meer dan één trein tegelijk in een seinblok toe, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtingsrouteseinen kunnen niet van achteren worden gepasseerd
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standaard sein (elektrisch){}Seinen zijn nodig om te voorkomen dat treinen botsen bij netwerken met meer dan één trein
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standaard sein (elektrisch){}Seinen zijn nodig om te voorkomen dat treinen botsen bij netwerken met meer dan een trein
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Ingangssein (electrisch){}Groen als er meer dan één groen uitgangssein is in het volgende traject. Anders is deze rood
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Uitgangssein (elektrisch){}Gedraagt zich hetzelfde als een standaard sein, maar is nodig om ingangs- & combinatie-seinen aan te sturen
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combinatiesein (electric){}Het combinatiesein gedraagt zicht als zowel ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Routeseinen (elektrisch){}Een routesein laat meer dan één trein tegelijk op een seinblok toe, als de trein een route kan reserveren naar een veilige stopplaats. Routeseinen kunnen van achteren worden gepasseerd
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Eenrichtingsrouteseinen (elektrisch){}Een routesein laat meer dan één trein tegelijk op een seinblok toe, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtingsrouteseinen kunnen niet van achteren worden gepasseerd
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Routeseinen (elektrisch){}en routesein laat meer dan één trein tegelijk op een seinblok toe, als de trein een route kan reserveren naar een veilige stopplaats. Routeseinen kunnen van achteren worden gepasseerd
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Eenrichtingsrouteseinen (elektrisch){}en routesein laat meer dan één trein tegelijk op een seinblok toe, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtingsrouteseinen kunnen niet van achteren worden gepasseerd
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Sein ombouwen{}Indien geselecteerd, zal door te klikken op een bestaand sein deze worden omgebouwd naar het geselecteerde seintype en variant, Ctrl+klik verandert de bestaande variant (armsein/elektrisch). Shift+klik toont de geschatte ombouwkosten
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dichtheid van seinen bij het slepen
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Verklein dichtheid van seinen bij het slepen
@@ -2033,7 +2030,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Waterweg
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Bouw kanalen. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Bouw sluis. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Bouw dok (voor het kopen en onderhoud van schepen). Shift schakelt tussen bouwen/inschatting van de kosten
-STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bouw haven. Houd Ctrl ingedrukt om samen te voegen met ander station. Shift schakelt tussen bouwen/inschatting van de kosten
+STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bouw haven. Houd Ctrl ingedrukt om samen te voegen met ander station.Shift schakelt tussen bouwen/inschatting van de kosten
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plaats boei, deze kan gebruikt worden voor extra tussenstops. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bouw aquaduct. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definieer watergebied.{}Maak een kanaal, tenzij Ctrl wordt vastgehouden op zeeniveau, dan zal de omgeving overstromen
@@ -2077,11 +2074,11 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Geluidso
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreinvorming
 STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Verlaag een hoek van het land. Slepen verlaagt de eerste geselecteerde hoek en brengt het geselecteerde gebied naar de hoogte van die hoek. Ctrl selecteert het gebied diagonaal. Shift maakt een inschatting van de kosten
 STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Verhoog een hoek van het land. Slepen verhoogt de eerste geselecteerde hoek en brengt het geselecteerde gebied naar de hoogte van die hoek. Ctrl selecteert het gebied diagonaal. Shift maakt een inschatting van de kosten
-STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Egaliseer land naar de hoogte van de eerst geselecteerde hoek. Ctrl selecteert een diagonaal gebied. Shift+klik wisselt tussen bouwen/tonen verwachte kosten
-STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Koop land voor toekomstig gebruik. Shift+klik wisselt tussen bouwen/tonen verwachte kosten
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Egaliseer land naar de hoogte van de eerst geselecteerde hoek. Ctrl selecteerd een diagonaal gebied. Shift+Klik wisselt tussen bouwen/tonen verwachte kosten
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Koop land voor toekomstig gebruik. Shift+Klik wisselt tussen bouwen/tonen verwachte kosten

 # Object construction window
-STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Keuze van object
+STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Keuze van Object
 STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Kies het te bouwen object. Shift+Klik wisselt tussen bouwen/tonen verwachte kosten
 STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Kies klasse van het te bouwen object
 STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}Bekijk het object
@@ -2094,7 +2091,7 @@ STR_OBJECT_CLASS_TRNS                                           :Zender
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Bomen
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Kies een soort boom om te planten
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Willekeurige soorten bomen
-STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plant bomen van willekeurige soort. Shift+klik wisselt tussen bouwen/toont verwachte kosten
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plant bomen van willekeurige soort. Shift+Klik wisselt tussen bouwen/toont verwachte kosten
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Willekeurige bomen
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Verspreid bomen willekeurig over de kaart

@@ -2115,7 +2112,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Weet je
 # Town generation window (SE)
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Stadsontwikkeling
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nieuwe stad
-STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Sticht nieuwe stad. Shift+klik toont alleen de verwachte kosten
+STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Sticht nieuwe stad. Shift+Klik toont aleen de verwachte kosten
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Willekeurige stad
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Sticht stad op willekeurige locatie
 STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Veel willekeurige steden
@@ -2296,7 +2293,7 @@ STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Scenario
 STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Laad Hoogtekaart
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik hier om naar de standaard bewaar-/laadmap te gaan
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} vrij
-STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lijst van schijven, mappen en opgeslagen spellen
+STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lijst van schijven, mappen, en opgeslagen spellen
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Huidige gekozen naam voor opgeslagen spel
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Verwijderen
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Verwijder het momenteel geselecteerde opgeslagen spel
@@ -2387,7 +2384,7 @@ STR_NEWGRF_SETTINGS_ACTIVE_LIST                                 :{WHITE}Actieve
 STR_NEWGRF_SETTINGS_INACTIVE_LIST                               :{WHITE}Inactieve NewGRF bestanden
 STR_NEWGRF_SETTINGS_SELECT_PRESET                               :{ORANGE}Kies voorkeur:
 STR_NEWGRF_FILTER_TITLE                                         :{ORANGE}Filter tekst:
-STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Laad de geselecteerde voorkeursinstelling
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Laad de geselecteerd voorkeursinstelling
 STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Bewaar voorkeursinstelling
 STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Bewaar de huidige lijst als voorkeursinstelling
 STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Kies een naam voor deze voorkeursinstelling
@@ -2399,9 +2396,9 @@ STR_NEWGRF_SETTINGS_RESCAN_FILES                                :{BLACK}Bestande
 STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK}Werk de lijst van beschikbare NewGRF-bestanden bij
 STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Verwijderen
 STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Verwijder het geselecteerde NewGRF-bestand van de lijst
-STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Naar boven
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Naar Boven
 STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar boven in de lijst
-STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naar beneden
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naar Beneden
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar beneden in de lijst
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Een lijst van de NewGRF-bestanden die zijn geïnstalleerd. Klik op een bestand om de parameters te wijzigen

@@ -2424,7 +2421,7 @@ STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paramete
 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Geen informatie beschikbaar
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Bestand niet gevonden
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Uitgeschakeld
-STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Niet compatibel met deze versie van OpenTTD
+STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Niet compatible met deze versie van OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF-parameters ingeven

@@ -2453,7 +2450,7 @@ STR_SPRITE_ALIGNER_CAPTION                                      :{WHITE}Afbeeldi
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Volgende afbeelding
 STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Ga verder maar volgende normale afbeelding, sla alle pseudo/herkleur/lettertype afbeeldingen over en ga naar het begin bij het einde
 STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Ga naar afbeelding
-STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Ga naar de opgegeven afbeelding. Wanneer dit geen normale afbeelding is, ga verder naar de volgende normale afbeelding
+STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Ga naar de opgegeven afbeelding. Wanneer dit niet een normale afbeelding is, ga verder naar de volgende normale afbeelding
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Vorige afbeelding
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Ga naar vorige normale afbeelding, sla alle pseudo/herkleur/lettertype afbeeldingen over en ga naar het einde bij het begin
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Voorbeeld van de huidige afbeelding. De uitlijning wordt genegeerd bij het weergeven van de afbeelding
@@ -2505,7 +2502,7 @@ STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Het spel
 # NewGRF status
 STR_NEWGRF_LIST_NONE                                            :Geen
 STR_NEWGRF_LIST_ALL_FOUND                                       :Alle bestanden aanwezig
-STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Compatibele bestanden gevonden
+STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Compatibel bestanden gevonden
 STR_NEWGRF_LIST_MISSING                                         :{RED}Ontbrekende bestanden

 # NewGRF 'it's broken' warnings
@@ -2516,23 +2513,21 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Trein '{

 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' geeft onjuiste informatie
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Vracht-/ombouwinformatie voor '{1:ENGINE}' wijkt af van aanschaflijst na het bouwen. Dit kan resulteren in problemen bij ombouwen door automatisch vernieuwen/vervangen
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' heeft een eindeloze loop veroorzaakt in de productie-callback
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' Een eindeloze loop gevonden in de productie-callback

 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<ongeldige vracht>
 STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
 STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} van <ongeldige vracht>
-STR_NEWGRF_INVALID_ENGINE                                       :<ongeldig treinmodel>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<ongeldige industrie>
-
-# NewGRF scanning window
+STR_NEWGRF_INVALID_ENGINE                                       :<ongeldige treinmodel>
+STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<ongeldig bedrijf>

 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordenlijst - {COMMA} bord{P "" en}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Hoofdletter gevoelig
 STR_SIGN_LIST_CLEAR                                             :{BLACK}Verwijder filter
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Verwissel hoofdlettergevoeligheid bij het vergelijken van bordnamen met het filter
-STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Verwijder het filter
+STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Verwijderd het filter

 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Wijzig tekst van bord
@@ -2576,7 +2571,7 @@ STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}{TOWN}'s
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Reputatie van transportbedrijven:
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Mogelijkheden:
-STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Lijst met dingen die mogelijk zijn in deze gemeente - klik op een item voor meer details
+STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Lijst met dingen die mogelijk zijn in dit dorp - klik op een item voor meer details
 STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Doe het
 STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Voer de actie uit die in de bovenstaande lijst is geselecteerd

@@ -2595,8 +2590,8 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{YELLOW}Begin e
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION          :{YELLOW}Betaal een vernieuwing van het wegennetwerk. Veroorzaakt tot 6 maanden lang een aanzienlijke verstoring van het wegverkeer.{}Kosten: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY            :{YELLOW}Bouw een standbeeld ter ere van jouw bedrijf.{}Kosten: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW}Betaal de bouw van nieuwe commerciële gebouwen in de stad.{}Kosten: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW}Koop 1 jaar exclusieve transportrechten in deze plaats. De gemeenteraad staat passagiers en vracht alleen toe om jouw stations te gebruiken.{}Kosten: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Koop het plaatselijk gezag om om je reputatie te verhogen, met het gevaar van een strenge sanctie wanneer je gepakt wordt.{}Kosten: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW}Koop 1 jaar exclusieve transportrechten in deze plaats. De gemeenteraad staat passagiers en vracht aleeen toe om jouw stations te gebruiken.{}Kosten: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Koop het plaatselijk gezag om om je reputatie te verhogen, met het gevaar van een strenge sanctie, wanneer je gepakt wordt.{}Kosten: {CURRENCY}

 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsidies
@@ -2610,7 +2605,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik op
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stationsnamen - klik op naam om het scherm te centreren op het station. Ctrl+klik opent een nieuw venster op de locatie van het station
 STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Houd Ctrl ingedrukt om meer items te kiezen
-STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
+STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Stations
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Geen -
@@ -2685,7 +2680,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totaal:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Banksaldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lening
-STR_FINANCES_MAX_LOAN                                           :{WHITE}Max. lening: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max lening: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Leen {CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Vergroot lening. Ctrl+klik om zoveel als mogelijk te lenen
@@ -2712,7 +2707,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bouw bed
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Bekijk bedrijfshoofdkwartier
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Toon bedrijfshoofdkwartier
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Verplaats bedrijfshoofdkwartier
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Herbouw bedrijfshoofdkwartier ergens anders voor 1% van de bedrijfswaarde. Shift+klik toont verwachte kosten zonder HQ te verplaatsen
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Herbouw bedrijfshoofdkwartier ergens anders voor 1% van de bedrijfswaarde. Shift+Klik toont verwachte kosten zonder HQ te verplaatsen

 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nieuw gezicht
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Kies nieuw gezicht voor directeur
@@ -2725,13 +2720,13 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Verander

 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Koop 25% aandeel in bedrijf
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Verkoop 25% aandeel in bedrijf
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Koop een aandeel van 25% in dit bedrijf. Shift+klik toont verwachte kosten zonder te kopen
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Verkoop een aandeel van 25% in dit bedrijf. Shift+klik toont verwachte kosten zonder te kopen
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Koop een aandeel van 25% in dit bedrijf. Shift+Klik toont verwachte kosten zonder te kopen
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Verkoop een aandeel van 25% in dit bedrijf. Shift+Klik toont verwachte kosten zonder te kopen

 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Bedrijfsnaam
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Naam van directeur

-STR_BUY_COMPANY_MESSAGE                                         :{WHITE}We zoeken een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {COMPANY} kopen voor {CURRENCY}?
+STR_BUY_COMPANY_MESSAGE                                         :{WHITE}We zoeken voor een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {COMPANY} kopen voor {CURRENCY}?

 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrielijst
@@ -2838,7 +2833,7 @@ STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Onderhou
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capaciteit: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_REFITTABLE                                    :(ombouwbaar)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUM}{BLACK} Levensduur: {GOLD}{COMMA} jaar
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. betrouwbaarheid: {GOLD}{COMMA}%
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Betrouwbaarheid: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Snelheid: {GOLD}{VELOCITY}
@@ -2847,7 +2842,7 @@ STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedre
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Om te bouwen voor: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Alle vrachttypen
 STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalve {GOLD}
-STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. trekkracht: {GOLD}{FORCE}
+STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. Trekkracht: {GOLD}{FORCE}

 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Railvoertuigkeuzelijst - klik op een railvoertuig voor informatie
 STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Wegvoertuigkeuzelijst - klik op een wegvoertuig voor informatie
@@ -2859,10 +2854,10 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Koop weg
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Koop schip
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Koop vliegtuig

-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Koop het geselecteerde railvoertuig. Shift+klik toont verwachte kosten zonder te kopen
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Koop het geselecteerde wegvoertuig. Shift+klik toont verwachte kosten zonder te kopen
-STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Koop het geselecteerde schip. Shift+klik toont verwachte kosten zonder te kopen
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Koop het geselecteerde vliegtuig. Shift+klik toont verwachte kosten zonder te kopen
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Koop het geselecteerde railvoertuig. Shift+Klik toont verwachte kosten zonder te kopen
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Koop het geselecteerde wegvoertuig
+STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Koop het geselecteerde schip. Shift+Klik toont verwachte kosten zonder te kopen
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Koop het geselecteerde vliegtuig. Shift+Klik toont verwachte kosten zonder te kopen

 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Hernoem
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Hernoem
@@ -2890,7 +2885,7 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} voertuig{P "" en}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})

-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Treinen - klik op trein voor informatie, sleep voertuig voor toevoegen/verwijderen van trein, klik rechts voor trein informatie, Ctrl+klik voor samengestelde informatie
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Treinen - klik op trein voor informatie, sleep voertuig voor toevoegen/verwijderen van trein, klik rechts voor trein informatie, CTRL+klik voor samengestelde informatie
 STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wegvoertuigen - rechts-klik op wegvoertuig voor informatie
 STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Schepen - rechts-klik op schip voor informatie
 STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vliegtuig - rechts-klik op vliegtuig voor informatie
@@ -2927,10 +2922,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloon we
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloon schip
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloon vliegtuig

-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Hierdoor wordt een kopie gekocht van een trein inclusief wagons. Klik op deze knop en dan op een trein binnen of buiten het depot. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Hierdoor wordt een kopie gekocht van een wegvoertuig. Klik op deze knop en dan op een wegvoertuig binnen of buiten de garage. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Hierdoor wordt een kopie gekocht van een schip. Klik op deze knop en dan op een schip binnen of buiten het dok. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Hierdoor wordt een kopie gekocht van een vliegtuig. Klik op deze knop en dan op een vliegtuig binnen of buiten de hangar. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Hierdoor wordt een kopie gekocht van een trein inclusief wagons. Klik op deze knop en dan op een trein binnen of buiten het depot. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Hierdoor wordt een kopie gekocht van een wegvoertuig. Klik op deze knop en dan op een wegvoertuig binnen of buiten de garage. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Hierdoor wordt een kopie gekocht van een schip. Klik op deze knop en dan op een schip binnen of buiten het dok. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Hierdoor wordt een kopie gekocht van een vliegtuig. Klik op deze knop en dan op een vliegtuig binnen of buiten de hangar. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen

 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centreer het scherm op de locatie van het treindepot. Ctrl+klik opent een nieuw scherm op de locatie van het treindepot
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centreer het scherm op de locatie van de garage. Ctrl+klik opent een nieuw scherm op de locatie van de garage
@@ -2967,7 +2962,7 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :zweeflocomotief
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Prijs: {CURRENCY} Gewicht: {WEIGHT_S}{}Snelheid: {VELOCITY}  Kracht: {POWER}{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {CARGO}
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Prijs: {CURRENCY} Gewicht: {WEIGHT_S}{}Snelheid: {VELOCITY}  Kracht: {POWER}  Max. T.E.: {6:FORCE}{}Bedrijfskosten: {4:CURRENCY}/yr{}Capaciteit: {5:CARGO}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}, {CARGO}{}Gebruikskosten: {CURRENCY}/yr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}{}Gebruikskosten: {CURRENCY}/jaar
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}{}Gebruikeskosten: {CURRENCY}/yr

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vervang {STRING}
@@ -2977,14 +2972,14 @@ STR_REPLACE_VEHICLE_SHIP                                        :Schip
 STR_REPLACE_VEHICLE_AIRCRAFT                                    :Vliegtuig

 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Kies het type locomotief om te vervangen
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Kies een nieuw type locomotief die je wilt gebruiken om de links geselecteerde type locomotief te vervangen
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Kies een nieuw type locomotief die je wil gebruiken om de links geselecteerde type locomotief te vervangen

 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start het vervangen
-STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Klik op deze knop als je de aan de linkerkant geselecteerde locomotief wilt vervangen met die aan de rechterkant
+STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Klik op deze knop als je de aan de linkerkant geselecteerde locomotief wil vervangen met die aan de rechterkant
 STR_REPLACE_NOT_REPLACING                                       :{BLACK}Niet aan het vervangen
 STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Geen voertuig geselecteerd
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop het vervangen
-STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klik op deze knop als je de aan de linkerkant geselecteerde locomotief niet wilt vervangen
+STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klik op deze knop als je de aan de linkerkant geselecteerde locomotief niet wil vervangen

 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Aan het vervangen: {ORANGE}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Wissel tussen locomotief- en wagonvervangvensters
@@ -2992,7 +2987,7 @@ STR_REPLACE_ENGINES                                             :Motoren
 STR_REPLACE_WAGONS                                              :Wagons

 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecteer een spoortype waar je locomotieven voor wilt selecteren
-STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Dit geeft weer waarmee de aan de linkerkant geselecteerde locomotief vervangen wordt
+STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Dit geeft weer waarmee de aan de linkerkant geselecteerde locomotief mee vervangen wordt
 STR_REPLACE_RAIL_VEHICLES                                       :Railvoertuigen
 STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrische railvoertuigen
 STR_REPLACE_MONORAIL_VEHICLES                                   :Monorailvoertuigen
@@ -3007,19 +3002,19 @@ STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE
 STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centreer het scherm op de locatie van de trein. Ctrl+klik volgt de trein in het hoofdscherm
 STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centreer het scherm op de locatie van het wegvoertuig. Ctrl+klik volgt het voertuig in het hoofdscherm
 STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centreer het scherm op de locatie van het schip. Ctrl+klik volgt het schip op het hoofdscherm
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centreer het scherm op de locatie van het vliegtuig. Ctrl+klik volgt het vliegtuig op het hoofdscherm
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centreer het scherm op de locatie van het vliegtuig. Ctrl+klik volgt het vliegtuid op het hoofdscherm

 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Stuur trein naar depot. Ctrl+klik voor alleen onderhoud
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Stuur wegvoertuig naar garage. Ctrl+klik voor alleen onderhoud
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Stuur schip naar dok. Ctrl+klik voor alleen onderhoud
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Stuur vliegtuig naar hangar. Ctrl+klik voor alleen onderhoud

-STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Hierdoor wordt een kopie gekocht van deze trein inclusief wagons. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Hierdoor wordt een kopie gekocht van dit wegvoertuig. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Hierdoor wordt een kopie gekocht van dit schip. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Hierdoor wordt een kopie gekocht van dit vliegtuig. Ctrl+klik deelt de orders. Shift+klik toont verwachte kosten zonder te kopen
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Hierdoor wordt een kopie gekocht van deze trein inclusief wagons. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Hierdoor wordt een kopie gekocht van dit wegvoertuig. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Hierdoor wordt een kopie gekocht van dit schip. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Hierdoor wordt een kopie gekocht van dit vliegtuig. Ctrl+klik deelt de orders. Shift+Klik toont verwachte kosten zonder te kopen

-STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forceer trein verder te rijden zonder te wachten op een groen sein
+STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forceer trein verder te rijden zonder te wachten op een groen signaal

 STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Bouw trein om voor een ander goederentype
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bouw wegvoertuig om voor een ander goederentype
@@ -3030,7 +3025,7 @@ STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Keer tre
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Dwing het wegvoertuig om om te draaien

 STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Toon orders van trein. Ctrl+klik toont het tijdschema van de trein
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Toon orders van wegvoertuig. Ctrl+klik toont tijdschema van het voertuig
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Toon orders van wegvoertuig. Ctrl+klik toont tijdschma van het voertuig
 STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Toon orders van schip. Ctrl+klik toont tijdschema van het schip
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Toon orders van vliegtuig. Ctrl+klik toont het tijdschema van het vliegtuig

@@ -3085,7 +3080,7 @@ STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewicht:
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY} {BLACK}Max. T.K.: {LTBLUE}{FORCE}

 STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY} (vorig jaar: {CURRENCY})
-STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Aantal keren motorpech sinds laatste onderhoud: {LTBLUE}{COMMA}
+STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Aantal keren motorpech sinds vorig jaar: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capaciteit: {LTBLUE}Geen
@@ -3095,10 +3090,10 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacite

 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Geldoverdracht: {LTBLUE}{CURRENCY}

-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Onderhoudsinterval: {LTBLUE}{COMMA}dagen{BLACK}   Laatste onderhoud: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Onderhoudsinterval: {LTBLUE}{COMMA}%{BLACK}   Laatste onderhoud: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Vergroot onderhoudsinterval met 10. Ctrl+klik verhoogt interval met 5
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Verklein onderhoudsinterval met 10. Ctrl+klik verlaagt interval met 5
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval tussen onderhoud: {LTBLUE}{COMMA}dagen{BLACK}   Laatste onderhoud: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Service interval: {LTBLUE}{COMMA}%{BLACK}   Laatste service: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Vergroot interval tussen onderhoud met 10. Ctrl+klik verhoogd de interval met 5
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Verklein interval tussen onderhoud met 10. Ctrl+klik verlaagt de interval met 5

 STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Hernoem trein
 STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Hernoem wegvoertuig
@@ -3132,8 +3127,8 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacite
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ombouwen)
 STR_REFIT_TITLE                                                 :{GOLD}Selecteer goederentype om te vervoeren:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
-STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Kies het voertuig om om te bouwen. Slepen met de muis geeft de mogelijkheid om meerdere voertuigen te selecteren. Klikken op een lege ruimte selecteert het hele voertuig. Ctrl+klik selecteert een voertuig en de volgende keten
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}Kosten van ombouwen: {GOLD}{CURRENCY}
+STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Kies het voertuig om om te bouwen. Slepen met de muis geeft de mogelijkheid om meerdere voertuigen te selecteren. Klikken op een lege ruimte selecteerd het hele voertuig. Ctrl+klik selecteerd a voertuig en de volgende keten

 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Kies goederentype dat deze trein moet vervoeren
 STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecteer goederentype dat dit wegvoertuig moet vervoeren
@@ -3168,19 +3163,19 @@ STR_ORDER_GO_TO                                                 :Ga naar
 STR_ORDER_GO_NON_STOP_TO                                        :Ga non-stop naar
 STR_ORDER_GO_VIA                                                :Ga via
 STR_ORDER_GO_NON_STOP_VIA                                       :Ga non-stop via
-STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Verander het stopgedrag van de geselecteerde order
+STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Verander het stop-gedrag van de geselecteerde order

 STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Alle vracht volladen
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Laden indien beschikbaar
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Volledig laden
 STR_ORDER_DROP_FULL_LOAD_ANY                                    :Eén soort vracht volledig laden
 STR_ORDER_DROP_NO_LOADING                                       :Niet laden
-STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Verander het laadgedrag van de geselecteerde order
+STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Verander het laad-gedrag van de geselecteerde order

 STR_ORDER_TOGGLE_UNLOAD                                         :{BLACK}Alles lossen
 STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Lossen indien geaccepteerd
 STR_ORDER_DROP_UNLOAD                                           :Alles lossen
-STR_ORDER_DROP_TRANSFER                                         :Overladen
+STR_ORDER_DROP_TRANSFER                                         :Transfer
 STR_ORDER_DROP_NO_UNLOADING                                     :Niet lossen
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Verander het losgedrag van de geselecteerde order

@@ -3194,12 +3189,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stop
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sla deze order over tenzij onderhoud nodig is

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Voertuig info voor basisspringen wanneer
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Laad percentage
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Betrouwbaarheid
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximum snelheid
-STR_ORDER_CONDITIONAL_AGE                                       :Leeftijd (jaren)
+STR_ORDER_CONDITIONAL_AGE                                       :Voertuigleeftijd (jaren)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Heeft onderhoud nodig
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Altijd

@@ -3223,7 +3216,7 @@ STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Verwijde
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Verwijder de geselecteerde order
 STR_ORDERS_DELETE_ALL_TOOLTIP                                   :{BLACK}Verwijder alle orders
 STR_ORDERS_STOP_SHARING_BUTTON                                  :{BLACK}Stop met delen
-STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Stop met delen van de order lijst. Ctrl+klik verwijdert verder ook alle orders van dit voertuig
+STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Stop met delen van de order lijst. Ctrl+klik verwijderd verder ook alle order van dit voertuig

 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ga naar
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ga naar dichtstbijzijnde depot
@@ -3256,7 +3249,7 @@ STR_ORDER_STOP_ORDER                                            :(Stop)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Impliciet)
+STR_ORDER_AUTOMATIC                                             :(Automatisch)

 STR_ORDER_FULL_LOAD                                             :(Volledig laden)
 STR_ORDER_FULL_LOAD_ANY                                         :(Één soort vracht volledig laden)
@@ -3274,7 +3267,7 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Niet lossen en
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Niet lossen en één soort vracht volledig laden)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Niet lossen en niet laden)

-STR_ORDER_STOP_LOCATION_NEAR_END                                :[begin]
+STR_ORDER_STOP_LOCATION_NEAR_END                                :[vlak bij einde]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[midden]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[einde]

@@ -3352,7 +3345,7 @@ STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Verwijde
 STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Afbreken als een AI logbericht overeenstemt met de afbreektekst aan/uitschakelen
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Afbreken op:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Afbreken aan
-STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Als een AI logbericht overeenstemt met deze string wordt het spel gepauzeerd
+STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Als een AI logbericht overeenstemt met deze string wordt het spel gepauseerd
 STR_AI_DEBUG_MATCH_CASE                                         :{BLACK}Hoofdlettergevoelig
 STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Hoofdlettergevoeligheid bij vergelijken van AI logberichten t.o.v. de afbreekstring aan/uitzetten
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Doorgaan
@@ -3363,7 +3356,7 @@ STR_ERROR_NO_AI                                                 :{WHITE}OpenTTD
 STR_ERROR_NO_AI_SUB                                             :{WHITE}... geen AI's beschikbaar!

 STR_ERROR_AI_NO_AI_FOUND                                        :Geen geschikte AI gevonden. {} Deze AI is een 'dummy' en voert niets uit.{}Verschillende AI's kunnen worden gedownload via het 'Online Content' systeem
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Eén van de actieve AI's is vastgelopen. Meld dit a.u.b. bij de auteur van deze AI met een schermprint van het AI Debugscherm
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Een van de actieve AI's is vastgelopen. Meld dit a.u.b. bij de auteur van deze AI met een schermprint van het AI Debugscherm
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Computerspeler Debugvenster is alleen beschikbaar voor de server

 # AI configuration window
@@ -3447,8 +3440,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... er g
 STR_ERROR_BMPMAP                                                :{WHITE}Kan het landschap uit BMP niet laden...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kan dit type afbeelding niet omzetten

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... afbeelding is te groot
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Schaalwaarschuwing
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Het aanpassen van de grootte van een bronkaart is niet aan te bevelen. Toch doorgaan?

@@ -3472,7 +3463,7 @@ STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Landhell
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Kan dit niet uitvoeren...
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Gebouw moet eerst gesloopt worden
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kan dit gebied niet ontruimen...
-STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... locatie ongeschikt
+STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... lokatie ongeschikt
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... reeds gebouwd
 STR_ERROR_OWNED_BY                                              :{WHITE}... is eigendom van {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... gebied is van ander bedrijf
@@ -3486,7 +3477,7 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Niet toe
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}De gemeenteraad van {TOWN} staat bouwen van nog een vliegveld niet toe
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokale autoriteiten weigeren toestemming te geven voor vliegveld wegens zorgen om geluidsoverlast
-STR_ERROR_BRIBE_FAILED                                          :{WHITE}Je poging tot omkopen is
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Kan land hier niet ontgraven...
 STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}ontdekt door een regionale onderzoeker

 # Levelling errors
@@ -3506,7 +3497,7 @@ STR_ERROR_MAXIMUM_PERMITTED_LOAN                                :{WHITE}... maxi
 STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan geen geld meer lenen...
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... geen lening om af te betalen
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... {CURRENCY} benodigd
-STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan geen lening afbetalen...
+STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan geen lening afbetalen
 STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan geen geld weggeven dat van de bank geleend is...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Kan bedrijf niet kopen...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan bedrijfshoofdkantoor niet bouwen...
@@ -3529,7 +3520,7 @@ STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kan deze
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... er is geen geschikte plaats voor een standbeeld in het centrum van dit dorp

 # Industry related errors
-STR_ERROR_TOO_MANY_INDUSTRIES                                   :{WHITE}... te veel industrieën
+STR_ERROR_TOO_MANY_INDUSTRIES                                   :{WHITE}... teveel industrieën
 STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan geen industrieën genereren...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan {STRING} hier niet bouwen...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan dit type industrie hier niet bouwen...
@@ -3555,8 +3546,8 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan hier

 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Voegt meer dan één bestaand (laad)station samen
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... station te omvangrijk
-STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Te veel (laad)stations
-STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Te veel treinstationsdelen
+STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Teveel (laad)stations
+STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Teveel treinstationsdelen
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Te veel bushaltes
 STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel vrachtwagenlaadstations
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Te dicht bij een ander station
@@ -3582,7 +3573,7 @@ STR_ERROR_THERE_IS_NO_STATION                                   :{WHITE}...er is
 STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Verwijder eerst treinstation
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}Verwijder eerst bushalte
 STR_ERROR_MUST_DEMOLISH_TRUCK_STATION_FIRST                     :{WHITE}Verwijder eerst vrachtwagenlaadhal
-STR_ERROR_MUST_DEMOLISH_PASSENGER_TRAM_STATION_FIRST            :{WHITE}Verwijder eerst passagierstramstation
+STR_ERROR_MUST_DEMOLISH_PASSENGER_TRAM_STATION_FIRST            :{WHITE}Verwijder eerst passagiers tram station
 STR_ERROR_MUST_DEMOLISH_CARGO_TRAM_STATION_FIRST                :{WHITE}Verwijder eerst vrachttramhalte
 STR_ERROR_MUST_DEMOLISH_DOCK_FIRST                              :{WHITE}Verwijder eerst haven
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Verwijder eerst vliegveld
@@ -3715,7 +3706,7 @@ STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Schip in
 STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Vliegtuig in de weg

 STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan trein niet ombouwen...
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan wegvoertuig niet ombouwen...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan wegvoertuig niet ombouwen
 STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kan schip niet ombouwen...
 STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kan vliegtuig niet ombouwen...

@@ -3744,7 +3735,7 @@ STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan type
 STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan type van schip niet hernoemen...
 STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan type van vliegtuig niet hernoemen...

-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan railvoertuig niet verkopen...
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan railvoertuig niet verkopen
 STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan wegvoertuig niet verkopen...
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan schip niet verkopen...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet verkopen...
@@ -4195,7 +4186,7 @@ STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} Treindep
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} Garage
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{TOWN} Garage #{COMMA}
 STR_FORMAT_DEPOT_NAME_SHIP                                      :{TOWN} Dok
-STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} Dok #{COMMA}
+STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} Dok#{COMMA}
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{STATION} Hangar

 STR_UNKNOWN_STATION                                             :onbekend station
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED                                           :Maximum speed
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Value
 STR_SORT_BY_LENGTH                                              :Length
-STR_SORT_BY_LIFE_TIME                                           :Remaining lifetime
+STR_SORT_BY_LIFE_TIME                                           :Remaining life time
 STR_SORT_BY_TIMETABLE_DELAY                                     :Timetable delay
 STR_SORT_BY_FACILITY                                            :Station type
 STR_SORT_BY_WAITING                                             :Waiting cargo value
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoomed in scree
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Whole map screenshot
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :About 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite aligner
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Toggle bounding boxes
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -859,26 +858,26 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japanese Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pounds (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollars ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Zloty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubles (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar (SIT)
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :High
 STR_SEA_LEVEL_CUSTOM                                            :Custom
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Custom ({NUM}%)

-
 STR_DISASTER_NONE                                               :None
 STR_DISASTER_REDUCED                                            :Reduced
 STR_DISASTER_NORMAL                                             :Normal
@@ -1112,8 +1110,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistic
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Original
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Realistic
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Slope steepness for trains: {ORANGE}{STRING1}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Slope steepness for road vehicles: {ORANGE}{STRING1}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Slope steepness for trains {ORANGE}{STRING1}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Slope steepness for road vehicles {ORANGE}{STRING1}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships from making 90° turns: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Allow to join stations not directly adjacent: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1}
@@ -1408,7 +1406,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check fo
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Display AI settings
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quit 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Quit
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
@@ -2525,8 +2522,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} of <inv
 STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<invalid industry>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Sign{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Match case
@@ -3194,12 +3189,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stop
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Skip this order unless a service is needed

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Vehicle data to base jumping on
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Load percentage
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Reliability
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximum speed
-STR_ORDER_CONDITIONAL_AGE                                       :Age (years)
+STR_ORDER_CONDITIONAL_AGE                                       :Vehicle age (years)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Requires service
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Always

@@ -3256,7 +3249,7 @@ STR_ORDER_STOP_ORDER                                            :(Stop)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implicit)
+STR_ORDER_AUTOMATIC                                             :(Automatic)

 STR_ORDER_FULL_LOAD                                             :(Full load)
 STR_ORDER_FULL_LOAD_ANY                                         :(Full load any cargo)
@@ -3447,8 +3440,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... some
 STR_ERROR_BMPMAP                                                :{WHITE}Can't load landscape from BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... could not convert image type

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... image is too large
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Scale warning
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?

--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED                                           :Maximum speed
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Value
 STR_SORT_BY_LENGTH                                              :Length
-STR_SORT_BY_LIFE_TIME                                           :Remaining lifetime
+STR_SORT_BY_LIFE_TIME                                           :Remaining life time
 STR_SORT_BY_TIMETABLE_DELAY                                     :Timetable delay
 STR_SORT_BY_FACILITY                                            :Station type
 STR_SORT_BY_WAITING                                             :Waiting cargo value
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoomed in scree
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Whole map screenshot
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :About 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite aligner
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Toggle bounding boxes
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -859,26 +858,26 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japanese Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pounds (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollars ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Zloty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubel (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar (SIT)
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :High
 STR_SEA_LEVEL_CUSTOM                                            :Custom
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Custom ({NUM}%)

-
 STR_DISASTER_NONE                                               :None
 STR_DISASTER_REDUCED                                            :Reduced
 STR_DISASTER_NORMAL                                             :Normal
@@ -1112,8 +1110,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistic
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Original
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Realistic
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Slope steepness for trains: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Slope steepness for road vehicles: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Slope steepness for trains {ORANGE}{STRING}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Slope steepness for road vehicles {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Allow joining stations not directly adjacent: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING}
@@ -1408,7 +1406,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check fo
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Display AI settings
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quit 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Quit
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}?
@@ -2525,8 +2522,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} of <inv
 STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<invalid industry>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Sign{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Match case
@@ -3194,12 +3189,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stop
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Skip this order unless maintenance is needed

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Vehicle data to base jumping on
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Load percentage
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Reliability
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximum speed
-STR_ORDER_CONDITIONAL_AGE                                       :Age (years)
+STR_ORDER_CONDITIONAL_AGE                                       :Vehicle age (years)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Requires maintenance
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Always

@@ -3256,7 +3249,7 @@ STR_ORDER_STOP_ORDER                                            :(Stop)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implicit)
+STR_ORDER_AUTOMATIC                                             :(Automatic)

 STR_ORDER_FULL_LOAD                                             :(Full load)
 STR_ORDER_FULL_LOAD_ANY                                         :(Full load any cargo)
@@ -3447,8 +3440,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... some
 STR_ERROR_BMPMAP                                                :{WHITE}Can't load landscape from BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... could not convert image type

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... image is too large
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Scale warning
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?

--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -348,7 +348,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Fermu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Ludaj opcioj
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Malfacilec-agordoj
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Avancitaj agordoj
-STR_SETTINGS_MENU_AI_SETTINGS                                   :AI agordoj
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Agordoj de NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Ebloj por travidebleco
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Urbonomoj montriĝas
@@ -663,7 +662,6 @@ STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Montru i
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Montru transportstratojn sur la mapo
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Montru verdaĵojn sur la mapo
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Montru landposedantojn sur la mapo
-STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Klaku sur kompanion ŝalti montranta ĝia posedaĵoj. Stir+Klaku malaktivas ĉiujn kompaniojn escepte la elekta. Stir+Klaku sur ĝi aktivi ĉiujn la kompaniojn

 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINYFONT}{BLACK}Stratoj
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINYFONT}{BLACK}Fervojoj
@@ -697,7 +695,6 @@ STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLAC
 STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Vidu aŭ ne vidu urbonomojn sur la mapo
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrigi la mapeton al la nuna loko
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
-STR_SMALLMAP_COMPANY                                            :{TINYFONT}{COMPANY}
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Malaktivigu ĉiujn
 STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Aktivigu ĉiujn
@@ -705,8 +702,6 @@ STR_SMALLMAP_SHOW_HEIGHT                                        :{BLACK}Montru a
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES                     :{BLACK}Ne montri industriojn sur la mapo.
 STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES                      :{BLACK}Montri ĉiujn industriojn sur la mapo.
 STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT                                :{BLACK}Ŝaltu montro de altecmapo
-STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES                      :{BLACK}Montru ne kompanian posedaĵon en la mapo
-STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES                       :{BLACK}Montru ĉiujn kompanian posedaĵon en la mapo

 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Montru lastan mesaĝon aŭ novaĵon
@@ -856,9 +851,9 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Monunuoj
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elekto de monunuoj

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Brita Pundo (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerika Dolaro (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eŭro (EUR)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pundoj (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolaroj ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eŭroj (€)
 STR_GAME_OPTIONS_CURRENCY_YEN                                   :Enoj (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Aŭstriaj Ŝilingoj (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgaj Frankoj (BEF)
@@ -1051,7 +1046,6 @@ STR_SEA_LEVEL_HIGH                                              :Alte
 STR_SEA_LEVEL_CUSTOM                                            :Alia
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Alia ({NUM}%)

-
 STR_DISASTER_NONE                                               :Neniu
 STR_DISASTER_REDUCED                                            :Malpli
 STR_DISASTER_NORMAL                                             :Normale
@@ -1218,7 +1212,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :longa (31st Dec
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :mallonga (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Aŭtomate paŭzu startante novan ludon: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Permesu dum paŭza: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :senagoj
@@ -1244,7 +1237,6 @@ STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Montru
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Lasu aktivaj la konstruilojn post uzado: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Grupigu elspezojn en kompania financfenestro: {ORANGE}{STRING}

-STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Malaktivu fondan konstruon kiam decaj veturiloj ne estas disponebla: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Trajna maksimumo por ĉiu ludanto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Stratveturila maksimumo por ĉiu ludanto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Aviadila maksimumo por ĉiu ludanto: {ORANGE}{STRING}
@@ -1400,7 +1392,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Serĉi p
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Montri AI-agordojn.
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Fermu 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Fermi
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {STRING}?
@@ -1950,7 +1941,6 @@ STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Elektu R
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Elektu Vojan Ponton
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Pontelekto - klaku vian preferatan ponton por konstrui ĝin
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
-STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Ŝtala pendanta
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Ŝtala ebena
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Ŝtala luksa
@@ -2050,7 +2040,6 @@ STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Aĉetu l
 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Elekto de Objekto
 STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Eletku objekton por konstrui
-STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Elektu klason de la objekto konstrui
 STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}Antaŭvido de la objekto
 STR_OBJECT_BUILD_SIZE                                           :{BLACK}Grandeco: {GOLD}{NUM} x {NUM} kaheloj

@@ -2390,7 +2379,6 @@ STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametr
 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ne haveblas informoj
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ne trovis apartenan dosieron
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Malaktiva
-STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Malkongrua ĉe ĉi tio versio de OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enigu NewGRF-parametrojn

@@ -2443,8 +2431,6 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Atenco uzi neva
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} enhavas rompitan bildeton. Ĉiuj rompitaj bildetoj aspektos kiel ruĝaj demandsignoj (?).
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Legis ekster limo de pseŭdobildeto.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}La nuntempe uza baza grafikaĵaro estas manka nombro da bildetoj.{} Bonvolu renovigu la baza grafikaĵaro.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Peta GRF provizoj ne haveblas
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} estis malaktivata per {4:STRING}

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Atentu!
@@ -2474,8 +2460,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <mal
 STR_NEWGRF_INVALID_ENGINE                                       :<malvalida modelo de veturilo>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<malvalida industrio>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Signolisto - {COMMA} Signo{P "" j}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Parigu kazon
@@ -3140,8 +3124,6 @@ STR_ORDER_DROP_SERVICE_DEPOT                                    :Prizorgu se nec
 STR_ORDER_DROP_HALT_DEPOT                                       :Haltu.
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Transsalti ordonon escepte de prizorgo necesas

-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Ŝarĝu procenton
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Fidindo
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maksimuma rapido.
@@ -3200,7 +3182,7 @@ STR_ORDER_STOP_ORDER                                            :(Haltu)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Aŭtomata)
+STR_ORDER_AUTOMATIC                                             :(Aŭtomata)

 STR_ORDER_FULL_LOAD                                             :(Plena Ŝarĝo)
 STR_ORDER_FULL_LOAD_ANY                                         :(Ŝarĝu ĝis plena ajnan kargon)
@@ -3286,7 +3268,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Elekti j
 STR_AI_DEBUG                                                    :{WHITE}Sencimigo de la AI
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nomo de la AI
-STR_AI_DEBUG_SETTINGS                                           :{BLACK}AI Agordoj
+STR_AI_DEBUG_SETTINGS                                           :{BLACK}Agordoj de la AI
 STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Ŝanĝi agordojn de la AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Reŝarĝi AI-on
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Mortigi la AI-on, reŝarĝi la skripton, kaj restarti la AI-on
@@ -3382,8 +3364,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... io s
 STR_ERROR_BMPMAP                                                :{WHITE}Ne povas ŝarĝi landaspekton el BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... ne povis transigi bildotipon.

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... bildo estas tro granda
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skala averto
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ne rekomendindas tro ŝanĝi la grandecon de la mapo. Ĉu daŭrigi la generadon?

@@ -3410,8 +3390,6 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... neta
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... jam konstruita
 STR_ERROR_OWNED_BY                                              :{WHITE}... posedata de {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... regiono estas posedata de alia kompanio
-STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... landaspektan limigon plenumis
-STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... kahelan forigantan limigon plenumis
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nomo devas esti ununura
 STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRING} okupas la lokon
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Ne permesa dum paŭzo
@@ -4187,7 +4165,6 @@ STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLAC
 STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
-STR_TINY_BLACK_DECIMAL                                          :{TINYFONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
@@ -4203,7 +4180,6 @@ STR_TINY_BLACK_STATION                                          :{TINYFONT}{BLAC
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
-STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINYFONT}{BLACK}{HEIGHT}
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -504,7 +504,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Suumitud ekraan
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Terve kaardi ekraanitõmmis
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD' kohta
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite aligner
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Kontuuride kuvamine
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -916,19 +915,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuuta valimine

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Suurbritannia nael (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :USA dollar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jaapani jeen (¥)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Naelad (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollarid ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jeen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austria ðilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgia frank (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sveitði frank (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tðehhi kroon (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Saksamargad (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Taani kroon (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Hispaania peseeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseeta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Soome mark (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Prantsuse frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frank (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Kreeka drahm (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungari Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandi kroon (ISK)
@@ -1114,7 +1113,6 @@ STR_SEA_LEVEL_HIGH                                              :Kõrge
 STR_SEA_LEVEL_CUSTOM                                            :Kohandatud
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Kohandatud ({NUM}%)

-
 STR_DISASTER_NONE                                               :Puudub
 STR_DISASTER_REDUCED                                            :Vähendatud
 STR_DISASTER_NORMAL                                             :Harilik
@@ -1282,7 +1280,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :pikk (31. dets
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :lühike (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Mängu seiskamine alguses: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Lubatud seisaku ajal: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :mitte ükski toiming
@@ -1465,7 +1462,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Otsi all
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Näita tehismõistuse seadeid
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Välju 'OpenTTD'st

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Mängust väljumine
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}?
@@ -2544,8 +2540,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisaldab mitmeid Action 8 kirjeid
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Loeti pseudo-sprite'i lõpust kaugemale
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Hetkel kasutatavast alus graafikapaketist puuduvad mõned spraidid.{}Palun uuenda alus graafikapaketti
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Soovitud GRF ressurss ei ole saadaval
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} blokeeriti {4:STRING} poolt

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Ettevaatust!
@@ -2582,8 +2576,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} <vale v
 STR_NEWGRF_INVALID_ENGINE                                       :<sobimatu mootorimudel>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<vigane tööstus>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Tõstutundlik
@@ -3251,12 +3243,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Peatu
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Sõiduki andmed, millel sihtpunkti vahetamine põhineb
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Koorem prontsentides
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Tehnoseisund
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Tippkiirus
-STR_ORDER_CONDITIONAL_AGE                                       :Vanus (aastates)
+STR_ORDER_CONDITIONAL_AGE                                       :Sõiduki vanus (aastates)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Vajab hooldust
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Alati

@@ -3313,7 +3303,7 @@ STR_ORDER_STOP_ORDER                                            :(Peatu)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Automaatne)
+STR_ORDER_AUTOMATIC                                             :(Automaatne)

 STR_ORDER_FULL_LOAD                                             :(Laaditakse täis)
 STR_ORDER_FULL_LOAD_ANY                                         :(Ühte kaupa laaditakse täis)
@@ -3504,8 +3494,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... mida
 STR_ERROR_BMPMAP                                                :{WHITE}Ei suuda laadida maastikku BMP failist...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... ei suutnud muuta pildi tüüpi

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... pilt on liiga suur
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skaala hoiatus
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Kaardi suuruse liigne muutmine pole soovitatav. Jätka?

--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Lähennetty kuv
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Koko kartan kuvakaappaus
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Tietoja 'OpenTTD':stä
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite-kohdistaja
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Reunat päälle/pois
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -859,26 +858,26 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Rahayksi
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Rahayksikön valinta.

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Englannin punta (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Yhdysvaltain dollari (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japanin jeni (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Punta (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollari ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jeni (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Itävallan shillinki (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian frangi (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sveitsin frangi (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tsekin koruna (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Saksan markka (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Tanskan kruunu (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Espanjan peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Suomen markka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Ranskan frangi (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frangi (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Kreikan drakma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Unkarin forintti (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islannin kruunu (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian liira (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Hollannin guldeni (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norjan kruunu (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Puolan złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Puolan zloty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian leu (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Venjän rupla (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian tolari (SIT)
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :Korkea
 STR_SEA_LEVEL_CUSTOM                                            :Oma
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Oma ({NUM}%)

-
 STR_DISASTER_NONE                                               :Ei mitään
 STR_DISASTER_REDUCED                                            :Vähennetty
 STR_DISASTER_NORMAL                                             :Tavallinen
@@ -1112,8 +1110,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistinen
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Ajoneuvojen kiihdytysmalli: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Alkuperäinen
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Realistinen
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Mäkien jyrkkyys junille: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Mäkien jyrkkyys ajoneuvoille: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Mäkien jyrkkyys junille {ORANGE}{STRING}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Mäkien jyrkkyys ajoneuvoille {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}90 asteen käännökset kielletty junilta ja laivoilta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Salli ei-vierekkäisten asemien yhdistäminen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Käytä kehittyneempää lastausalgoritmia: {ORANGE}{STRING}
@@ -1408,7 +1406,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tarkista
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Näytä tekoälyasetukset
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sulje OpenTTD.

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Sulje
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Lopetetaanko peli ja palataan {STRING}-järjestelmään?
@@ -2525,8 +2522,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} <virhee
 STR_NEWGRF_INVALID_ENGINE                                       :<virheellinen kulkuneuvo>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<virheellinen teollisuus>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Kylttilista - {COMMA} kylttiä
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Kirjainkoon täsmäys
@@ -3194,12 +3189,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Pysähdy
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Ohita tämä käsky, ellei palvelua tarvita.

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Kulkuneuvon tiedot, joiden perusteella hypätään
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Lastin prosentuaalinen määrä
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Luotettavuus
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Huippunopeus
-STR_ORDER_CONDITIONAL_AGE                                       :Ikä (vuotta)
+STR_ORDER_CONDITIONAL_AGE                                       :Kulkuneuvon ikä (vuotta)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Vaatii huoltoa
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Aina

@@ -3256,7 +3249,7 @@ STR_ORDER_STOP_ORDER                                            :(Pysähdy)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Ehdoton)
+STR_ORDER_AUTOMATIC                                             :(Automaattinen)

 STR_ORDER_FULL_LOAD                                             :(Täysi lastaus)
 STR_ORDER_FULL_LOAD_ANY                                         :(Lastaa täyteen mitä tahansa rahtia)
@@ -3447,8 +3440,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... tapa
 STR_ERROR_BMPMAP                                                :{WHITE}Maastoa ei voida ladata BMP-tiedostosta...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kuvan tyyppiä ei voitu muuntaa

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... kuva on liian suuri
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Mittakaava-varoitus
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Lähdekartan koon liiallinen muuttaminen ei ole suositeltavaa. Haluatko jatkaa?

--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Copie d'écran
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Copie d'écran de la carte entière
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :À Propos de 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alignement de sprite
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Afficher/cacher les boites de dimensions maximum
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -618,7 +617,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}Choisir
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Sélectionner programme de musique 'Ezy Street'
 STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Choisir le programme personnalisé 'Personnalisé 1'
 STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Choisir le programme personnalisé 'Personnalisé 2'
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Active/désactive le mode aléatoire
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Active/Désactive le mode aléatoire
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Afficher la fenêtre de sélection de pistes

 STR_ERROR_NO_SONGS                                              :{WHITE}Un ensemble de musique vide a été choisis. Aucune musique ne sera jouée
@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Élevé
 STR_SEA_LEVEL_CUSTOM                                            :Personnalisé
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Personnalisé ({NUM}%)

-
 STR_DISASTER_NONE                                               :Aucune
 STR_DISASTER_REDUCED                                            :Réduites
 STR_DISASTER_NORMAL                                             :Normales
@@ -1409,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Vérifie
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Afficher la configuration des IA
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quitter 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Quitter
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Êtes vous sur de vouloir quitter OpenTTD et retourner à {STRING}{NBSP}?
@@ -2526,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <mar
 STR_NEWGRF_INVALID_ENGINE                                       :<véhicule invalide>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industrie invalide>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste des panneaux - {COMMA} panneau{P "" x}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Respecter la casse
@@ -3195,8 +3190,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Arrêt
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Données du véhicule servant de base au saut
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Pourcentage de chargement
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Fiabilité
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Vitesse maximum
@@ -3257,7 +3250,7 @@ STR_ORDER_STOP_ORDER                                            :(Arrêt)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implicite)
+STR_ORDER_AUTOMATIC                                             :(Automatique)

 STR_ORDER_FULL_LOAD                                             :(Charger complètement)
 STR_ORDER_FULL_LOAD_ANY                                         :(Charger complètement par un seul type)
@@ -3448,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... quel
 STR_ERROR_BMPMAP                                                :{WHITE}Chargement du paysage depuis BMP impossible...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... n'a pas pu convertir le type d'image

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... image trop grande
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Avertissement de redimensionnement
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Trop redimensionner la carte source n'est pas recommandé. Continuer la génération{NBSP}?

--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Hereingezoomter
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Riesiger Screenshot (Standard: Strg+G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Über 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite-Ausrichtung
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Hüllquader anzeigen/ausblenden
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -860,24 +859,24 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Währung
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währung auswählen

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Englische Pfund (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Engl. Pfund (GBP)
 STR_GAME_OPTIONS_CURRENCY_USD                                   :US-Dollar (USD)
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japanische Yen (JPY)
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Österreichische Schilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jap. Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Österreich. Schilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgische Francs (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Schweizer Franken (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tschechische Kronen (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutsche Mark (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Dänische Kronen (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanische Peseten (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Span. Peseten (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnische Mark(FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Französische Francs (FRF)
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Griechische Drachmen (GRD)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frz. Francs (FRF)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Griech. Drachmen (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungarische Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Isländische Kronen (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italienische Lire (ITL)
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Niederländische Gulden (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Niederländ. Gulden (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegische Kronen (NOK)
 STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polnische Zloty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumänische Lei (RON)
@@ -887,7 +886,7 @@ STR_GAME_OPTIONS_CURRENCY_SEK                                   :Schwedische Kro
 STR_GAME_OPTIONS_CURRENCY_TRY                                   :Türkische Lire (TRY)
 STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slowakische Kronen (SKK)
 STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasilianische Reais (BRL)
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estnische Kronen (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estnische Krone (EEK)
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Eigene...
 ############ end of currency region

@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Hoch
 STR_SEA_LEVEL_CUSTOM                                            :Individuell
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Individuell ({NUM}%)

-
 STR_DISASTER_NONE                                               :Keine
 STR_DISASTER_REDUCED                                            :Verringert
 STR_DISASTER_NORMAL                                             :Normal
@@ -1409,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Prüfe a
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Einstellungen für KI anzeigen und / oder ändern
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD' beenden

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Verlassen
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}OpenTTD wirklich beenden und zu {}{STRING} zurückkehren?
@@ -2526,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} of <ung
 STR_NEWGRF_INVALID_ENGINE                                       :<ungültiger Fahrzeugtyp>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<ungültige Industrie>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Schilderliste ({COMMA} Schild{P "" er})
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Groß/Klein beachten
@@ -3195,8 +3190,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stopp
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Überspringe diesen Auftrag, sofern keine Wartung benötigt wird

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Fahrzeuginformation, welche für den Sprung ausgewertet wird
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Ladezustand (Prozent)
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Zuverlässigkeit
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Höchstgeschwindigkeit
@@ -3257,7 +3250,7 @@ STR_ORDER_STOP_ORDER                                            :(Stopp)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implizit)
+STR_ORDER_AUTOMATIC                                             :(Automatisch)

 STR_ORDER_FULL_LOAD                                             :(Voll beladen)
 STR_ORDER_FULL_LOAD_ANY                                         :(Mit einer Fracht voll beladen)
@@ -3448,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... irge
 STR_ERROR_BMPMAP                                                :{WHITE}Landschaft kann nicht aus BMP-Datei geladen werden...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... Bildtyp kann nicht umgewandelt werden

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... Bild ist zu groß
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalierungswarnung
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Zu starke Skalierung des Spielfeldes wird nicht empfohlen. Generierung dennoch fortsetzen?

--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -350,7 +350,7 @@ STR_SORT_BY_POWER                                               :Δύναμη
 STR_SORT_BY_TRACTIVE_EFFORT                                     :Δύναμη έλξης
 STR_SORT_BY_INTRO_DATE                                          :Ημερομηνία Παρουσιάσης
 STR_SORT_BY_RUNNING_COST                                        :Κόστος Συντήρησης
-STR_SORT_BY_POWER_VS_RUNNING_COST                               :Ενέργεια/Κόστος Συντήρησης
+STR_SORT_BY_POWER_VS_RUNNING_COST                               :Δύναμη/Κόστος Συντήρησης
 STR_SORT_BY_CARGO_CAPACITY                                      :Χωρητικότητα Φορτίου

 # Tooltips for the main toolbar
@@ -928,8 +928,8 @@ STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}Ο στ
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}Ο σταθμός {STATION} τώρα δέχεται {STRING}
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}Ο σταθμός {STATION} τώρα δέχεται {STRING} και {STRING}

-STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Έληξε η προσφορά επιδότησης:{}{}{STRING} από {G το τη το} {STRING} πρός {G το τη το} {STRING} δεν θα επιδοτείται πλέον.
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Η επιδότηση αποσύρθηκε:{}{}Η υπηρεσια για {STRING.subs} απο το {STRING} προς το {STRING} δεν επιδοτείται πλέον.
+STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Έληξε η προσφορά χρηματοδότησης:{}{}{STRING} από {G το τη το} {STRING} πρός {G το τη το} {STRING} δεν θα χρηματοδοτείται πια.
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Η χρηματοδότηση αποσύρθηκε:{}{}Η υπηρεσια για {STRING.subs} απο το στάθμο {STRING} προς το στάθμο {STRING} δεν χρηματοδοτείται πια.
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Προσφορά χρηματοδότησης υπηρεσίας:{}{}Η πρώτη υπηρεσία για {STRING.subs} από {G το τη το} {STRING} προς {G το τη το} {STRING} επιχορηγείται για ένα έτος από την τοπική αρχή!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Η χρηματοδότηση της υπηρεσίας απονεμήθη στην εταιρία {STRING}!{}{}Η υπηρεσία για {STRING.subs} από το σταθμό {STRING} προς το σταθμό {STRING} θα χρεώνεται 50% παραπάνω για ένα έτος!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Η επιχορήγηση υπηρεσίας απονεμήθη στην εταιρία {STRING}!{}{}Η υπηρεσία για {STRING.subs} από το σταθμό {STRING} προς το σταθμό {STRING} θα χρεώνεται διπλά για το επόμενο έτος!
@@ -941,9 +941,9 @@ STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK
 # Extra view window
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Εμφάνιση {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Αντιγραφή στην εμφάνιση
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Αντιγραφή της τοποθεσίας της κύριας προβολής σε αυτό το παράθυρο εμφάνισης
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Αντιγραφή της περιοχής της παγκόσμιας προβολής σε αυτή την εμφάνιση
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Επικόλληση από εμφάνιση
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Επικόλληση της τοποθεσίας αυτού του παραθύρου εμφάνισης στην κύρια προβολή
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Επικόλληση της περιοχής αυτής της εμφάνισης στην παγκόσμια προβολή

 # Game options window
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Επιλογές Παιχνιδιού
@@ -952,25 +952,25 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Επιλ

 ############ start of currency region
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Αγγλική Λίρα (£)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Δολλάριο Η.Π.Α. ($)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Δολλάρια ($)
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Ευρώ (€)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Ιαπωνικό Γιεν (¥)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Γιεν (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Αυστραικό Σελίνι (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Βελγικό Φράγκο (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Ελβετικό Φράγκο (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Τσέχικη Κορώνα (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Γερμανικό Μάρκο (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Δανέζικη Κορώνα (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Ισπανική Πεσέτα (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Πεσέτα (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Φινλανδικό Μάρκο (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Γαλλικό Φράγκο (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Φράγκο (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Δραχμή(δρχ.)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ουγγρικό Φλουρί (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Ισλανδική Κορώνα (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Ιταλική Λίρα (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Ολλανδικό Φιορίνι (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Νορβηγική Κορώνα (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Πολωνικό Ζλότυ (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Πολωνικό Zloty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Ρουμάνικο Λευ (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ρώσσικες Ρούβλες (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Σλοβένικο Tolar (SIT)
@@ -1149,7 +1149,6 @@ STR_SEA_LEVEL_HIGH                                              :Υψηλό
 STR_SEA_LEVEL_CUSTOM                                            :Προσαρμόσμενο
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Προσαρμόσμενο ({NUM}%)

-
 STR_DISASTER_NONE                                               :Κανένα
 STR_DISASTER_REDUCED                                            :Μειωμένο
 STR_DISASTER_NORMAL                                             :Κανονικό
@@ -1194,7 +1193,6 @@ STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Να ε
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Επιτρέπονται πιο ρεαλιστικά ταξινομημένες περιοχές συλλογής : {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Επιτρέπεται η αφαίρεση περισσότερων ιδιοκτησιών πόλεων: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Μέγιστο μήκος τρένων: {ORANGE}{STRING} πλακιδι{P 0:1 ο α}
-STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Ποσότητα καπνού/σπινθύρων οχήματος: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMOKE_AMOUNT_NONE                            :Κανένα
 STR_CONFIG_SETTING_SMOKE_AMOUNT_ORIGINAL                        :Γνήσιο
 STR_CONFIG_SETTING_SMOKE_AMOUNT_REALISTIC                       :Ρεαλιστικό
@@ -1204,8 +1202,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Ρεαλιστ
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Μοντέλο επιτάχυνσης οχημάτων δρόμου: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Αρχικό
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Ρεαλιστικό
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Κλίση γραμμης για τρένων: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Κλίση για οχήματα δρόμου: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Υπερβολική κλίση γραμμης τρένων κατά {ORANGE}{STRING}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Υπερβολική κλίση για τα οχήματα δρόμου {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Απαγόρευση στα τρένα και πλοια να κάνουν στροφες 90°: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Να επιτρέπεται η συνένωση μη παρακείμενων σταθμών: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Χρησιμοποίηση βελτιωμένου αλγόριθμου φόρτωσης: {ORANGE}{STRING}
@@ -1218,7 +1216,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Χει
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :κανένα
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :όπως σε άλλες βιομηχανίες
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :επικείμενη
-STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :{LTBLUE}Έπιπεδη περιοχή γύρω από βιομηχανίες: {ORANGE}{STRING} τετράγωνα
+STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :{LTBLUE}Έπιπεδη περιοχή γύρω από τις βιομηχανίες: {ORANGE}{STRING} tile{P 0:1 "" s}
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Επιτρέπονται πολλαπλές όμοιες βιομηχανίες ανα πόλη: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Εμφάνιση σήμανσης στην πλευρά οδήγησης: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Εμφάνιση παράθυρου οικονομικών στο τέλος του έτους: {ORANGE}{STRING}
@@ -1255,7 +1253,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :από όλα
 STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Ειδοποίηση όταν τα έσοδα ενός οχήματος είναι αρνητικά: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Τα οχήματα δεν λήγουν ποτέ: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Αυτόματη Ανανέωση όταν ένα όχημα παλιώνει: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Αυτόματη ανανέωση όταν ένα όχημα είναι {ORANGE}{STRING}{LTBLUE} μήνες πρίν/μετά την μέγιστη ηλικία
+STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Αυτόματη Ανανέωση όταν ένα όχημα είναι {ORANGE}{STRING}{LTBLUE} μήνες πρίν/μετά την μέγιστη ηληκία
 STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Αυτόματη Ανανέωση με τα ελάχιστα απαιτούμενα χρήματα: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Διάρκεια μηνύματος σφάλματος: {ORANGE}Αναδυση για {STRING} δευτερολεπτ {P ο α}
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Καθυστέρηση για αναδυόμενα γεγονότα: {ORANGE}Αναδυση για {STRING} δευτερολεπτ{P ο α}
@@ -1265,7 +1263,7 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Εμφ
 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}Γεννήτρια Γης: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Αυθεντικό
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :ΤεραΓένεση
-STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Μέγιστη απόσταση από την άκρη για τα Διυλιστήρια {ORANGE}{STRING} τετράγωνα
+STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Μέγιστη απόσταση από την άκρη για τα Διυλιστήρια {ORANGE}{STRING}
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}Κορυφογραμμή χιονιού: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Σκληρότητα επιφάνειας (ΤεραΓέννεση μόνο) : {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Πολύ απαλή
@@ -1284,7 +1282,7 @@ STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Να ε
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Ένα ή περισσότερα τετράγωνα στην βόρεια άκρη δεν είναι κενά
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}Ένα ή περισσότερα τετράγωνα σε μια από τις άκρες δεν είναι στο νερό

-STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Μέγιστη διασπορά σταθμών: {ORANGE}{STRING} τετράγωνα {RED} Προσοχή: Υψηλή τιμή καθυστερεί το παιχνίδι
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Μέγιστη διασπορά σταθμών: {ORANGE}{STRING} {RED}Προσοχή: Η υψηλή ρύθμιση καθυστερεί το παιχνίδι
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Αυτόματη επισκευή ελικοπτέρων στα ελικοδρόμια: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Σύνδεση γραμμής εργαλείων τοπίου με γραμμή εργαλείων σιδηροτροχιάς/δρόμου/νερού/αεροδρομίου: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Χρώμα εδάφους που χρησιμοποιείται στον μικροχάρτη: {ORANGE}{STRING}
@@ -1312,12 +1310,11 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :όχι

 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Μετάβαση με αριστερό κλικ: {ORANGE}{STRING}

-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Χρήση της {ORANGE}{STRING}{LTBLUE} ημερολογιακής μορφής στα ονόματα αποθηκευμένων παιχνίδιών.
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Χρήση της {ORANGE}{STRING}{LTBLUE} ημερολογιακής μορφής στα αποθηκευμένα παιχνίδια.
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :μεγάλη (31 Δεκ 2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :σύντομη (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Αυτόματη παύση κατά την εκκίνηση ενός νέου παιχνιδιού: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Όταν το παιχνίδι είναι σε παύση επιτρέπονται: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :καμία ενέργεια
@@ -1358,13 +1355,13 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Επι
 STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes πριν το AI διακοπεί: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Τα διαστήματα μεταξύ συντήρησης είναι σε ποσοστά: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για τρένα: {ORANGE}{STRING} ημέρες/%
+STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για τρένα: {ORANGE}{STRING} μέρες/%
 STR_CONFIG_SETTING_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για τρένα: {ORANGE}απενεργοποιημένο
-STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για οχήματα: {ORANGE}{STRING} ημέρες/%
+STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για οχήματα: {ORANGE}{STRING} μέρες/%
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_DISABLED               :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για οχήματα:: {ORANGE}απενεργοποιημένο
-STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για αεροπλάνα: {ORANGE}{STRING} ημέρες/%
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για αεροπλάνα: {ORANGE}{STRING} μέρες/%
 STR_CONFIG_SETTING_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για αεροπλάνα: {ORANGE}απενεργοποιημένο
-STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για πλοία: {ORANGE}{STRING} ημέρες/%
+STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για πλοία: {ORANGE}{STRING} μέρες/%
 STR_CONFIG_SETTING_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για πλοία: {ORANGE}απενεργοποιημένο
 STR_CONFIG_SETTING_NOSERVICE                                    :{LTBLUE}Απενεργοποίηση επισκευών όταν οι βλάβες είναι απενεργοποιημένες: {ORANGE}{STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}Ενεργοποίηση ορίων ταχύτητας βαγονιών: {ORANGE}{STRING}
@@ -1500,7 +1497,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Έλεγ
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Εμφάνιση ρυθμίσεων AI
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Έξοδος από το 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Έξοδος
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Είστε σίγουρος/η ότι θέλετε να εγκαταλείψετε το OpenTTD και να επιστρέψετε στο {STRING};
@@ -1530,7 +1526,7 @@ STR_CHEATS_TOOLTIP                                              :{BLACK}Τα κ
 STR_CHEATS_WARNING                                              :{BLACK}Προσοχή! Είστε έτοιμος να προδώσετε τους φίλους ανταγωνιστές σας. Θυμηθείτε ότι αυτή η ντροπή θα μείνει για πάντα.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Αύξηση χρημάτων κατά {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Παίζετε με την εταιρία: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Μαγική μπουλντόζα (αφαιρεί βιομηχανίες, αμετακίνητα αντικείμενα): {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Μαγική μπουλντόζα (αφαιρεί βιομηχανίες, αμετακίνητα): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Τα τούνελ μπορούν να διασταυρώνονται: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Τα Jet δεν θα συγκρούονται (συχνά) σε μικρά αεροδρόμια: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Αλλαγή κλίματος: {ORANGE}{STRING}
@@ -1590,17 +1586,17 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Επιλ
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Νέο Πρόσωπο
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Δημιουργία τυχαίου προσώπου
 STR_FACE_ADVANCED                                               :{BLACK}Προχωρημένη
-STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Προχωρημένη επιλογή προσώπου
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Προχωρημένη επιλογή προσώπου.
 STR_FACE_SIMPLE                                                 :{BLACK}Απλή
-STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Απλή επιλογή προσώπου
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Απλή επιλογή προσώπου.
 STR_FACE_LOAD                                                   :{BLACK}Φόρτωση
 STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Φόρτωση αγαπημένου προσώπου
 STR_FACE_LOAD_DONE                                              :{WHITE}Το αγαπημένο πρόσωπο έχει φορτωθεί από το αρχείο ρυθμίσεων του OpenTTD
 STR_FACE_FACECODE                                               :{BLACK}Αρ. προσώπου παίκτη
-STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Εμφάνιση και/ή επιλογή του αριθμού του προσώπου του παίκτη
-STR_FACE_FACECODE_CAPTION                                       :{WHITE}Προβολη και/ή ορισμός του αριθμού του προσώπου του παίκτη
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Εμφάνιση και/ή επιλογή του αριθμου προσωπου του παίκτη
+STR_FACE_FACECODE_CAPTION                                       :{WHITE}Προβολη και/ή ορισμός αριθμού προσώπου παίκτη
 STR_FACE_FACECODE_SET                                           :{WHITE}Ο νέος αριθμός προσώπου έχει οριστεί
-STR_FACE_FACECODE_ERR                                           :{WHITE}Δεν μπορεί να οριστεί ο αριθμός προσώπου του παίκτη - πρέπει να είναι αριθμητικός μεταξύ του 0 και του 4.294.967.295!
+STR_FACE_FACECODE_ERR                                           :{WHITE}Δεν μπορεί να οριστεί ο αριθμός προσώπου του παίκτη - πρέπει να είναι αριθμητικός μεταξύ του 0 και του 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Αποθήκευση
 STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Αποθήκευση αγαπημένου προσώπου
 STR_FACE_SAVE_DONE                                              :{WHITE}Αυτό το πρόσωπο θα αποθηκεύτει ως αγαπημένο στο αρχείο ρυθμίσεων του OpenTTD
@@ -1684,7 +1680,7 @@ STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Αναν
 STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Βρείτε το διακομιστή
 STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Ψάξτε το δίκτυο για ένα διακομιστή
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Προσθέστε ένα διακομιστή
-STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Προσθέτει ένα διακομιστή στην λίστα ο οποίος θα ελέγχεται κάθε φορά για ενεργά παιχνίδια.
+STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Προσθέστε ένα διακομιστή στην λίστα ο οποίος θα ελέγχεται κάθε φορά για παιχνίδια.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Εκκίνηση διακομιστή
 STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Ξεκινήστε το δικό σας διακομιστή

@@ -2019,7 +2015,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Κατα
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Κατασκευή σηματοδοτών. Ctrl εναλλάσει σηματοφόρους/σηματοδότες. {}Σύροντας κατασκευάζει σηματοδότες σε μια ευθεία σιδηροδρόμου. Ctrl κατασκευάζει μέχρι την επομένη διαστάυρωση {}Ctrl+κλικ εναλλάσει το άνοιγμα του παραθύρου επιλογής σηματοδοτών. Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Κατασκευή γέφυρας σιδηρόδρομου. Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Κατασκευή τούνελ σιδηρόδρομου. Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Εναλλαγή κατασκευής/αφαίρεσης για σιδηρόδρομους, σηματοδότες, σημείων καθοδήγησης και σταθμών. Κρατώντας το Ctrl αφαιρεί και το σιδηρόδρομο απο τα σημεία καθοδήγησης και σταθμούς
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Εναλλαγή κατασκευής/αφαίρεσης για σιδηρόδρομους, σηματοδότες, σημείων καθοδήγησης και σταθμών. Κρατώντας το Ctrl αφαιρεί επίσης σιδηρόδρομο απο σημεία καθοδήγησης και σταθμούς
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Μετατροπή/Αλλαγή τύπου γραμμής. Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος

 # Rail depot construction window
@@ -2049,19 +2045,19 @@ STR_STATION_CLASS_WAYP                                          :Σημείο κ

 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Επιλογή σηματοδότη
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Σηματοδότες τμήματος (σηματοφόρος){}Αυτός είναι ο πιο βασικός τύπος σηματοδότη, επιτρέποντας μόνο ένα τρένο να βρίσκεται σε κάθε τμήμα κάθε φορά
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Σηματοδότης-Εισόδου (σηματοφόρος){}Πράσινο όσο υπάρχει ένας ή περισσότεροι πράσινοι σηματοδότες-εξόδου στο επόμενο τμήμα γράμμης. Αλλιώς δείχνει κόκκινο
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Σηματοδότες τμήματος (σηματοφόρος){}Αυτός είναι ο πιο βασικός τύπος σηματοδότη, επιτρέποντας μόνο ένα τρένο να είναι στο ίδιο τμήμα την ίδια στιγμή
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Σηματοδότης-Εισόδου (σηματοφόρος){}Πράσινο όσο υπάρχει ένας ή περισσότεροι πράσινοι σηματοδότες-εξόδου από επόμενο τομέα γράμμης. Αλλιώς δείχνει κόκκινο.
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Σηματοδότης-Εξόδου (σηματοφόρος){}Συμπεριφέρεται με τον ίδιο τρόπο οπως οι σηματοδότες τμήματος αλλά είναι απαραίτητο να θέσει το σωστό χρώμα στην είσοδο στους συνδιασμένους προ-σηματοδότες.
 STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Συνδιασμένος Σηματοδότης (σηματοφόρος){}Ο συνδιασμένος σηματοδότης δουλεύει απλά ως σηματοδότης εισόδου και εξόδου. Αυτό επιτρέπει το χτήσιμο μεγάλυτερων "δέντρων" με προ-σηματοδότες.
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Σηματοδότης τροχιάς (σηματοφόρος){}Ένας σηματοδότης τροχιάς επιτρέπει σε περισσότερα του ενός τρένου να είναι σε ένα κομματι ελεγχόυ την ίδια στίγμη, εάν το τρένο μπόρει να δεσμεύσει την τρόχια σε ένα ασφαλές σημείο στάσης. Κανονίκοι σηματοδότες τροχιάς μπόρουν να περαστούν από την άλλη πλεύρα.
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Μονόδρομος Σηματοδότης Τροχιάς (σηματοφόρος){}Ένας σηματοδότης τροχιάς επιτρέπει σε περισσότερα του ενός τρένου να είναι σε ένα κομματι ελεγχόυ την ίδια στίγμη, εάν το τρένο μπόρει να δεσμεύσει την τρόχια σε ένα ασφαλές σημείο στάσης. Μονόδρομοι σηματοδότες τροχιάς δεν μπόρουν να περαστούν από την άλλη πλεύρα.
 STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Σηματοδότης τμήματος (ηλεκτρικός){}Αυτός είναι ο πιο βασικός τύπος σηματοδότη, επιτρέποντας μόνο ένα τρένο να είναι στο ίδιο τμήμα την ίδια στιγμή.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Σηματοδότηςεισόδου (ηλεκτρικός){}Πράσινο όσο υπάρχει ένας ή περισσότεροι πράσινοι σηματοδότες εξόδου από το επόμενο τμήμα γράμμης. Αλλιώς είναι κόκκινο.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Σηματοδότης εξόδου (ηλεκτρικός){}Συμπεριφέρεται με τον ίδιο τρόπο οπως οι σηματοδότες τμήματος αλλά είναι απαραίτητο να θέσει το σωστό χρώμα στους προ-σηματοδότες εισόδου και συνδιασμένους
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Συνδιασμένος σηματοδότης (ηλεκτρικός){}Ο συνδιασμένος σηματοδότης δουλεύει απλά ως σηματοδότης εισόδου και εξόδου. Αυτό σας επιτρέπει το χτήσιμο μεγάλυτερων "δέντρων" με προ-σηματοδότες
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Σηματοδότης-Εισόδου (ηλεκτρικός){}Πράσινο όσο υπάρχει ένας ή περισσότεροι πράσινοι σηματοδότες-εξόδου από επόμενο τομέα γράμμης. Αλλιώς δείχνει κόκκινο.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Σηματοδότης-Εξόδου (ηλεκτρικός){}Συμπεριφέρεται με τον ίδιο τρόπο οπως οι σηματοδότες τμήματος αλλά είναι απαραίτητο να θέσει το σωστό χρώμα στην είσοδο στους συνδιασμένους προ-σηματοδότες.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Συνδιασμένος Σηματοδότης (ηλεκτρικός){}Ο συνδιασμένος σηματοδότης δουλεύει απλά ως σηματοδότης εισόδου και εξόδου. Αυτό επιτρέπει το χτήσιμο μεγάλυτερων "δέντρων" με προ-σηματοδότες.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Σηματοδότης τροχιάς (ηλεκτρικός){}Ένας σηματοδότης τροχιάς επιτρέπει σε περισσότερα του ενός τρένου να είναι σε ένα κομματι ελεγχόυ την ίδια στίγμη, εάν το τρένο μπόρει να δεσμεύσει την τρόχια σε ένα ασφαλές σημείο στάσης. Κανονίκοι σηματοδότες τροχιάς μπόρουν να περαστούν από την άλλη πλεύρα.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Μονόδρομος Σηματοδότης Τροχιάς (ηλεκτρικός){}Ένας σηματοδότης τροχιάς επιτρέπει σε περισσότερα του ενός τρένου να είναι σε ένα κομματι ελεγχόυ την ίδια στίγμη, εάν το τρένο μπόρει να δεσμεύσει την τρόχια σε ένα ασφαλές σημείο στάσης. Μονόδρομοι σηματοδότες τροχιάς δεν μπόρουν να περαστούν από την άλλη πλεύρα.
-STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Μετατροπέας σηματοδότη{}Όταν επιλεγεί, πατώντας σε έναν υπάρχον σηματοδότη θα τον μετατρέψει στον επιλεγμένο τύπο σηματοδότη και παραλλαγή, με Ctrl+κλικ εναλλάσεται με την υπάρχουσα παραλλαγή, με Shift+κλικ εμφανίζεται το εκιμώμενο κόστος μετατροπής
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Μετατροπέας σηματοδότη{}Όταν επιλεκτεί, κάνοντας κλικ σε ένα υπάρχον σηματοδότη θα το μετατρέψει στο επιλεγμένο τύπο σηματοδότη και παραλλαγή, Ctrl+κλικ θα εναλλάσει την τρέχουσα παραλλαγή.
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Πυκνότητα σηματοδοτών με σύρσιμο
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Μείωση πυκνότητας σηματοδοτών με σύρσιμο
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Αύξηση πυκνότητας σηματοδοτών με σύρσιμο
@@ -2122,7 +2118,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Επιλ
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Κατασκευή καναλιού νερού
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Κανάλια νερού
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Χτίσιμο καναλιών. Το Shift εναλλάσει το κτίριο/εμφάνιση εκτίμησης κόστους
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Δημιουργία καναλιών.
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Κατασκευή υδατοφράκτη. Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Κατασκευάστε ναπήγειο πλοίων (για αγορά και επισκευή πλοίων). Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Κατασκευή λιμένα πλοίων. Ctrl ενεργοποιεί συνένωση λιμένων. Shift εναλλάσει χτίσιμο/εμφάνιση εκτίμησης κόστος
@@ -2193,7 +2189,7 @@ STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Φύτε
 # Land generation window (SE)
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Δημιουργία Γης
 STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Τοποθέτηση πετρώδεις επιφανειών στο τοπίο
-STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Ορίστε περιοχή ερήμου.{}Κρατήστε παητημένο το CTRL για να την αφαιρέσετε
+STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Ορίστε περιοχή ερήμου.{}Πατήστε και κρατήστε το CTRL για αφαίρεση
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Αύξηση περιοχής για χαμήλωμα/ανύψωση γης
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Μείωση περιοχής για χαμήλωμα/ανύψωση γης
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Δημιουργία τυχαίου εδάφους
@@ -2207,7 +2203,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Είστ
 # Town generation window (SE)
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Δημιουργία Πόλης
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Νέα Πόλη
-STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Ίδρυση νέας πόλης. Με Shift+κλικ εμφανίζει μόνο το εκτιμώμενο κόστος
+STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Ίδρυση νέας πόλης
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Τυχαία Πόλη
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Ίδρυση πόλης σε τυχαία τοποθεσία
 STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Πολλές τυχαίες πόλεις
@@ -2271,7 +2267,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Ιδιο
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Ιδιοκτήτης του σιδηροδρόμου: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Τοπική αρχή: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Καμιά
-STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Συντεταγμένες: {LTBLUE}{NUM} x {NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Συντεταγμένες: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Κατασκευή: {LTBLUE}{DATE_LONG}
 STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Κλάση στάθμου: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Τύπος σταθμού: {LTBLUE}{STRING}
@@ -2562,24 +2558,22 @@ STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Προει
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Λάθος: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Καταστροφικό: {SILVER}{STRING}
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ένα καταστροφικό λάθος για τα NewGRF έχει συμβεί: {}{STRING}
-STR_NEWGRF_ERROR_VERSION_NUMBER                                 :Το {1:STRING} δεν θα δουλέψει με την έκδοση του TTDPatch οπώς αναφέρεται από το OpenTTD
-STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :Το {1:STRING} είναι για την έκδοση {STRING} του TTD.
+STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} δεν θα δουλέψει με την έκδοση του TTDPatch οπώς αναφέρει το OpenTTD.
+STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} είναι για την έκδοση {STRING} του TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} είναι σχεδιασμένο να δουλέψει με το {STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Λάθος παράμετρος για το {1:STRING}: Παράμετρος {STRING} ({NUM})
-STR_NEWGRF_ERROR_LOAD_BEFORE                                    :Το {1:STRING} πρέπει να φόρτωθει πριν από το {STRING}.
-STR_NEWGRF_ERROR_LOAD_AFTER                                     :Το {1:STRING} πρέπει να φόρτωθει μετά από το {STRING}.
-STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :Το {1:STRING} απαιτεί έκδοση OpenTTD {STRING} ή καλύτερη
+STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING} πρέπει να φόρτωθει πριν από το {STRING}.
+STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} πρέπει να φόρτωθει μετά από το {STRING}.
+STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} απαιτεί έκδοση OpenTTD {STRING} ή μεγαλύτερη.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :Το αρχείο GRF είναι σχεδιασμένο για να μεταφράζει
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Έχουν φορτωθεί πολλά NewGRF.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Η φόρτωση του {2:STRING} ως στατικό NewGRF με {4:STRING} μπόρει να προκαλέσει αποσυγχρονισμούς
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Η φόρτωση του {2:STRING} ως στατικό NewGRF με {4:STRING} μπόρει να προκαλέσει αποσυγχρονισμούς.
 STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Αναπάντεχο sprite
 STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Άγνωστη ιδιότητα Action 0
 STR_NEWGRF_ERROR_INVALID_ID                                     :Προσπάθεια να χρησιμοποιήθει λάθος ID
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} περιέχει ένα κατεστραμμένο sprite. Όλα τα κατεστραμμένα sprites θα εμφανίζονται ως ένα κόκκινο ερωματικό (?)
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Περιέχει πολλαπλές Action 8
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Διάβασμα τέλους του ψεύδο-sprite
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Δεν είναι διαθέσιμοι οι πόροι του GRF που ζητήσατε
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :Το {2:STRING} απενεργοποιήθηκε από το {4:STRING}

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Προσοχή!
@@ -2595,31 +2589,28 @@ STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Συνέ

 # NewGRF status
 STR_NEWGRF_LIST_NONE                                            :Κανένα
-STR_NEWGRF_LIST_ALL_FOUND                                       :Όλα τα αρχεία είναι παρόντα
+STR_NEWGRF_LIST_ALL_FOUND                                       :Όλα τα αρχεία είναι παρώντα
 STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Βρέθηκαν συμβατά αρχεία
 STR_NEWGRF_LIST_MISSING                                         :{RED}Λείπουν αρχεία

 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Η συμπεριφορά του NewGRF '{0:STRING}' είναι πιθάνο να προκαλέσει αποσυγχρονισμούς και/ή κρασαρίσματα.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Άλλαξε το μήκος του οχήματος '{1:ENGINE}' ενώ δεν βρισκόταν μέσα σε αμαξοστάσιο
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Αλλάζει το μέγεθος του οχήματος για την μηχανή '{1:ENGINE}' όταν δεν είναι μέσα σε αμαξοστάσιο.
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Το τρενο'{VEHICLE}' που ανήκει στην εταιρία '{COMPANY}' έχει μη έγκυρο μήκος. Πιθανόν να προέρχεται από πρόβλημα του NewGRFs. Το παιχνίδι μπορεί να αποσυγχρονιστεί ή να κρασάρει.

 STR_NEWGRF_BUGGY                                                :{WHITE}Το NewGRF '{0:STRING}' δίνει λάθος πληροφορίες
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Η πληροφορία εμπορεύματος/ανακατασκευής για το '{1:ENGINE}' διαφέρει από την λίστα αγοράς μετά την κατασκευή. Αυτό μπορεί να προκαλέσει την αυτόματη ανανέωση/αντικατάσταση να αποτύχει στην σωστή ανακατασκευή
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Η πληροφορία εμπορεύματος/ανακατασκευή για την μηχανή '{1:ENGINE}' διαφέρει από την λίστα αγοράς μετά την κατασκευή. Αυτό μπορεί να προκαλέσει την αυτόματη ανανέωση/αντικατάσταση να αποτύχει να ανακατασκευάσει σώστα
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' προκάλεσε ένα ατέρμονο βρόγχο στην ανακοίνωση παραγωγής.

 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<μη έγκυρο φορτίο>
 STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
 STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} <μη έγκυρου φορτίου>
-STR_NEWGRF_INVALID_ENGINE                                       :<μη έγκυρο μοντέλο μηχανής>
+STR_NEWGRF_INVALID_ENGINE                                       :<μη έγκυρη μηχανή>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<μη έγκυρη βιομηχανία>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Λίστα πινακίδων - {COMMA} Πινακίδ{P α ες}
-STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Αντιστοίχιση πεζών/κεφαλαίων
 STR_SIGN_LIST_CLEAR                                             :{BLACK}Καθαρισμός φίλτρου
 STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Καθαρισμός κειμένου φίλτρου

@@ -2634,7 +2625,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Δώστ
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Πόλεις
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Τίποτα -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Ονόματα πόλεων - πατήστε στο όνομα για να κεντράρετε την εικόνα στην πόλη. Με Ctrl-κλικ ανοίγει ένα νεο παράθυρο προβολής στην τοποθεσία της πόλης
+STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Ονόματα πόλεων - κλικ στο όνομα για να κεντράρετε την εικόνα στην πόλη. Ctrl-κλικ ανοίγει ένα νεο παράθυρο προβολής στην τοποθεσία της βιομηχανίας
 STR_TOWN_POPULATION                                             :{BLACK}Παγκόσμιος πληθυσμός: {COMMA}

 # Town view window
@@ -2694,7 +2685,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}- Καμία -
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Υπηρεσίες που έχουν χρηματοδοτηθεί:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} από το σταθμό {STRING} προς το σταθμό {STRING}{YELLOW} ({COMPANY}{YELLOW}, έως {DATE_SHORT})
-STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Πατήστε στην υπηρεσία για κεντράρισμα στην βιομηχανία/πόλη. Με Ctrl-κλικ ανοίγει ένα νεο παράθυρο προβολής στην τοποθεσία της βιομηχανίας/πόλης
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Κάντε κλίκ στην υπηρεσία για κεντράρισμα στην βιομηχανία/πόλη. Ctrl-κλικ ανοίγει ένα νεο παράθυρο προβολής στην τοποθεσία της βιομηχανίας/πόλης

 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Ονόματα σταθμών - Κλικ στο όνομα για κεντράρισμα στο σταθμό. Ctrl-κλικ ανοίγει ένα νεο παράθυρο προβολής στην τοποθεσία του σταθμού
@@ -2801,7 +2792,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Χτίσ
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Προβολή Αρχηγείου
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Προβολή αρχηγείου εταιρίας
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Ανοικοδόμηση Αρχηγείου
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Επανοικοδόμηση της έδρας της εταιρίας σε άλλο μέρος, με κόστος το 1% της αξίας της εταιρίας. Με Shift+κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς επανατοποθέτηση της έδρας.
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ανοικοδόμηση του αρχηγείου της εταιρίας σε άλλο μέρος, με κόστος το 1% της αξίας της εταιρίας

 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Νέο Πρόσωπο
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Επιλογή νέου προσώπου διευθυντή
@@ -2814,8 +2805,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Αλλα

 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Αγορά μεριδίου 25% στην εταιρία
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Πώληση μεριδίου 25% της εταιρίας
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Αγορά μεριδίου 25% σε αυτή την εταιρεία. Με Shift+κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς την αγορά μετοχών
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Πώληση μεριδίου 25% της εταιρίας. Με Shift+κλικ εμφναίζεται το κόστος χωρίς την πώληση μετοχών
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Αγορά μεριδίου 25% της εταιρίας
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Πώληση μεριδίου 25% της εταιρίας

 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Όνομα Εταιρίας
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Όνομα Διευθυντή
@@ -2870,7 +2861,7 @@ STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :Διαθέσι
 STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :Διαθέσιμα Οχήματα
 STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :Διαθέσιμα Πλοία
 STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :Διαθέσιμα Αεροπλάνα
-STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Προβολή λίστας διαθέσιμων σχεδίων μηχανών για αυτον τύπο οχήματος
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Προβολή λίστας διαθέσιμων σχεδίων μηχανών για τον τύπο οχήματος.

 STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Διαχείριση λίστας
 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
@@ -2948,10 +2939,10 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Αγορ
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Αγορά Πλοίου
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Αγορά Αεροπλάνου

-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Αγοράστε το επιλεγμένο οχήμα τρένου. Με Shift+κλικ εμφναίζεται το εκτιμώμενο κόστος χωρίς την αγορά
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Αγοράστε το επιλεγμένο οχήμα δρόμου. Με Shift+κλικ εμφναίζεται το εκτιμώμενο κόστος χωρίς την αγορά
-STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Αγοράστε το επιλεγμένο πλοίο. Με Shift+κλικ εμφναίζεται το εκτιμώμενο κόστος χωρίς την αγορά
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Αγοράστε το επιλεγμένο αεροπλάνο. Με Shift+κλικ εμφναίζεται το εκτιμώμενο κόστος χωρίς την αγορά
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Αγοράστε το επιλεγμένο οχήμα τρένου
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Αγοράστε το επιλεγμένο οχήμα δρόμου
+STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Αγοράστε το επιλεγμένο πλοίο
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Αγοράστε το επιλεγμένο αεροπλάνο

 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Μετανομασία
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Μετανομασία
@@ -3016,10 +3007,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Κλων
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Κλωνοποίηση πλοίου
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Κλωνοποίηση αεροπλάνου

-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του τραίνου μαζί με τα όλα τα βαγόνια. Πατήστε αυτό το κουμπί και μετά σε κάποιο τραίνο μέσα ή έξω από το αμαξοστάσιο. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του οχήματος. Πατήστε αυτό το κουμπί και μετά σε κάποιο όχημα μέσα ή έξω από το αμαξοστάσιο. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του πλοίου. Πατήστε αυτό το κουμπί και μετά σε κάποιο πλοίο μέσα ή έξω από το ναυπηγείο. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του αεροπλάνου. Πατήστε αυτό το κουμπί και μετά σε κάποιο αεροπλάνο μέσα στο ή έξω από το υπόστεγο. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του τρένου μαζί με τα όλα τα βαγόνια. Κάντε κλικ σε αυτό το κουμπί και στο τρένο μέσα ή έξω από το αμαξοστάσιο. Ctrl+κλικ για μοιραστεί τις εντολές
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του οχήματος δρόμου. Κάντε κλικ σε αυτό το κουμπί και στο όχημα μέσα ή έξω από το αμαξοστάσιο. Ctrl+κλικ για μοιραστεί τις εντολές
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του πλοίου. Κάντε κλικ σε αυτό το κουμπί και στο πλοίο μέσα ή έξω από το ναυπηγείο. Ctrl+κλικ για μοιραστεί τις εντολές
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του αεροπλάνου. Κάντε κλικ σε αυτό το κουμπί και στο αεροπλάνο μέσα ή έξω από το υπόστεγο. Ctrl+κλικ για μοιραστεί τις εντολές

 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Κεντράρισμα της εικόνας στην τοποθεσία του αμαξοστάσιου. Ctrl+κλικ ανοίγει ένα νεο παράθυρο εμφάνισης στην τοποθεσία του αμαξοστάσιου
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Κεντράρισμα της εικόνας στην τοποθεσία του αμαξοστάσιου. Ctrl+κλικ ανοίγει ένα νεο παράθυρο εμφάνισης στην τοποθεσία του αμαξοστάσιου
@@ -3109,10 +3100,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Στέλ
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Στέλνει το πλοίο στο ναυπηγείο. Ctrl+κλικ για να κάνει μόνο επισκευή
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Στέλνει το αεροπλάνο στο υπόστεγο. Ctrl+κλικ για να κάνει μόνο επισκευή

-STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του τρένου μαζί με όλα τα βαγόνια. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift+κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να αγοράζεται.
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του οχήματος. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του πλοίου. Με Ctrl+κλικ θα έχει τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του αεροπλάνου. Με Ctrl+κλικ θα έχιε τις ίδιες εντολές. Με Shift + κλικ εμφανίζεται το εκτιμώμενο κόστος χωρίς να γίνει η αγορά.
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του τρένου μαζί με όλα τα βαγόνια. Ctrl+κλικ θα μοιράστει τις εντολές
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του οχήματος δρόμου. Ctrl+κλικ θα μοιράστει τις εντολές
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του πλοίου. Ctrl+κλικ θα μοιράστει τις εντολές
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Αυτό θα αγοράσει ένα αντίγραφο του αεροπλάνου. Ctrl+κλικ θα μοιράστει τις εντολές

 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Αναγκάστε το τρένο να προχωρήσει χώρις να περιμένει το σηματοδότη να το επιτρέψει

@@ -3289,12 +3280,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Στάση
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Παράλειψη αυτής της εντολής εκτός αν χρειάζεται επισκευή

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Δεδομένα οχήματος για να γίνει άλμα
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :{G=n}Ποσοστό φόρτωσης
 STR_ORDER_CONDITIONAL_RELIABILITY                               :{G=f}Αξιοπιστία
-STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Μέγιστη ταχύτητα
-STR_ORDER_CONDITIONAL_AGE                                       :{G=f}Ηλικία (χρόνια)
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :{G=f}Μέγιστη ταχύτητα
+STR_ORDER_CONDITIONAL_AGE                                       :{G=f}Ηλικία οχήματος (χρόνια)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Απαιτεί επισκευή
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Πάντα

@@ -3325,7 +3314,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Πήγαινε
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Πήγαινε στο κοντινότερο υπόστεγο
 STR_ORDER_CONDITIONAL                                           :Εκτέλεση εντόλης υπο προυπόθεση
 STR_ORDER_SHARE                                                 :Μοίρασμα εντολών
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Εισάγετε μια νέα εντολή πριν την επιλεγμένη ή προσθέστε στο τέλος της λίστας. Με Ctrl οι εντολές του σταθμού γίνονται 'πληρής φόρτωση οποιοδήποτε εμπορεύματος', οι εντολές σημείου καθοδήγησης 'χωρίς στάση' και οι εντολές αμαξοστασίου 'επισκευή'. Με 'Ίδιες ενοτλές' ή με Ctrl το όχημα θα έχει τις ίδιες εντολές με το επιλεγμένο. Πατώντας πάνω σε κάποιο όχημα αντιγράφονται οι εντολές από αυτό.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Εισάγετε μια νέα εντολή πριν την επιλεγμένη, ή να προστεθεί στο τέλος της λίστας. Ctrl κάνει τις εντολές του σταθμού 'πληρής φόρτωση οποιοδήποτε εμπορεύματος', εντολές σημείου καθοδήγησης 'χωρίς στάση' and εντολές αμαξοστασίου 'επισκευή'
 STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Εισαγώγη μιας προχωρημένης εντολής

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Εμφάνιση όλων των οχήματων που μοιράζονται αυτό το δρομολόγιο
@@ -3351,7 +3340,7 @@ STR_ORDER_STOP_ORDER                                            :(Στάση)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Σιωπηρή)
+STR_ORDER_AUTOMATIC                                             :(Αυτόματο)

 STR_ORDER_FULL_LOAD                                             :(Πλήρης φόρτωση)
 STR_ORDER_FULL_LOAD_ANY                                         :(Πλήρης φόρτωση οποιουδήποτε εμπορεύματος)
@@ -3457,7 +3446,7 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Εμφά
 STR_ERROR_NO_AI                                                 :{WHITE}Στο OpenTTD δεν ενσωματώθηκε υποστήριξη ΤΝ...
 STR_ERROR_NO_AI_SUB                                             :{WHITE}... καμία ΤΝ δεν είναι διαθέσιμη!

-STR_ERROR_AI_NO_AI_FOUND                                        :Δεν βρέθηκε κατάλληλο AI για φόρτωση.{}Αυτό το AI είναι ένα ψεύτικο AI και δεν θα κάνει τίποτα.{}Μπορείτε να κατεβάσετε διάφορα AΙ από το σύστημα 'Online περιεχομένου'
+STR_ERROR_AI_NO_AI_FOUND                                        :Δεν βρέθηκε κατάλληλο AI για φόρτωση.{}Αυτό το AI είναι ένα ψεύτικο AI και δεν θα κάνει τίποτα.{}Μπορείτε να κατεβάσετε διάφορα AΙ από το σύστημα 'Online περιεχομένου"
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ένα από τα AI που εκτελούνται κράσαρε. Παρακαλώ ενημερώστε τον συγγραφέα του AI με ένα στιγμιότυπο οθόνης από το παράθυρο αποσφαλμάτωσης AI
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Το παράθυρο αποσφαλμάτωσης AI είναι διαθέσιμο μόνο για τον διακομιστή

@@ -3657,8 +3646,6 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Πολύ
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Δεν μπορεί να μετονομαστεί ο σταθμός...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... αυτός είναι δρόμος ιδιόκτητος από την πόλη
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... ο δρόμος βλέπει σε λάθος κατεύθυνση
-STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... οι μη τερματικοί σταθμοί δε μπορούν να έχουν στροφές
-STR_ERROR_DRIVE_THROUGH_JUNCTION                                :{WHITE}... οι μη τερματικοί σταθμοί δε μπορούν να έχουν διασταυρώσεις

 # Station destruction related errors
 STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Δεν μπορεί να αφαιρεθεί μέρος του σταθμού...
@@ -3851,29 +3838,29 @@ STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Δεν
 STR_ERROR_VEHICLE_IS_DESTROYED                                  :{WHITE}... το όχημα καταστράφηκε

 # Specific vehicle errors
-STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Δεν μπορεί το τρένο να περάσει σήμα με κίνδυνο...
+STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Δεν μπορεί το τρένο να περάσει σήμα κινδύνου...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Δεν αντιστρέφεται η κατεύθυνση του τρένου...
 STR_ERROR_TRAIN_START_NO_CATENARY                               :Αυτό το τρένο στερείται σύνδεσης, έτσι το τρένο δεν μπορεί να ξεκινήσει

 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Δεν γίνεται το όχημα να αλάξει πορεία...

-STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Το αεροπλάνο είναι σε πτήση
+STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Αεροπλάνο είναι σε πτήση

 # Order related errors
-STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Δεν υπάρχει άλλος χώρος για εντολές
+STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Δεν υπάρχει χώρος για εντολές
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Πάρα πολλές εντολές
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Δεν μπορεί να γίνει εισαγώγη νέας εντολής...
 STR_ERROR_CAN_T_DELETE_THIS_ORDER                               :{WHITE}Δεν μπόρει να διαγραφεί η εντολή...
-STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}Δεν μπορεί να τροποποιηθεί η εντολή...
+STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}Δεν μπορεί να τροποποιηθεί η εντολή..
 STR_ERROR_CAN_T_MOVE_THIS_ORDER                                 :{WHITE}Δεν μπορεί να μετακινηθεί η εντολή...
 STR_ERROR_CAN_T_SKIP_ORDER                                      :{WHITE}Δεν μπορεί να παραληφθεί η τρέχουσα εντολή...
 STR_ERROR_CAN_T_SKIP_TO_ORDER                                   :{WHITE}Δεν μπορεί να παραληφθεί για τη επιλεγμένη εντολή...
-STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... το όχημα δεν μπορεί να πάει σε όλους τους σταθμούς
-STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... το όχημα δεν μπορεί να πάει σε αυτό τον σταθμό
-STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... ένα όχημα που μοιράζεται αυτή την εντολή δεν μπορεί να πάει σε εκείνο τον σταθμό
+STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... το όχημα δε μπορεί να πάει σε όλους τους σταθμούς
+STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... Το όχημα δεν μπορεί να πάει σε αυτό τον σταθμό
+STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... ένα όχημα που μοιράζεται αυτή την εντολή δεν μπορεί να πάει σε αυτό τον σταθμό

 STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Αδύνατο να μοιραστεί η λίστα εντολών...
-STR_ERROR_CAN_T_STOP_SHARING_ORDER_LIST                         :{WHITE}Δεν μπορεί να σταματήσει να μοιράζεται η λίστα εντολών...
+STR_ERROR_CAN_T_STOP_SHARING_ORDER_LIST                         :{WHITE}Δεν μπορεί να σταματήσει η λίστα κοινόχρηστων εντολών
 STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Αδύνατο να αντιγραφεί η λίστα εντολών...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... πολύ μακριά από τον προηγούμενο προορισμό

@@ -3883,13 +3870,13 @@ STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Τα ο
 STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Αυτό το όχημα δεν σταματάει σε αυτό το σταθμό

 # Sign related errors
-STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... πάρα πολλά σήματα
-STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Δεν γίνεται να τοποθετηθεί σήμα εδώ...
-STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Δεν γίνεται να αλλαχθεί το όνομα της πινακίδας...
-STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Δεν μπορεί να διαγραφεί η πινακίδα...
+STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... πάρα πολλοί σηματοδότες
+STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Δεν γίνεται να τοποθετηθεί σηματοδότης εδώ...
+STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Δεν γίνεται να αλλαχθεί το κείμενο της πινακίδας...
+STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Δεν μπορεί να διαγραφεί η πινακίδα

 # Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Ένα παιχνίδι εξομοίωσης βασισμένο στο Transport Tycoon Deluxe
+STR_DESKTOP_SHORTCUT_COMMENT                                    :Ένας παιχνίδι εξομοίωσης βασισμένο στο Transport Tycoon Deluxe

 ##id 0x2000
 # Town building names
@@ -3994,7 +3981,7 @@ STR_SV_STNAME_HEIGHTS                                           :Λόφοι {STR
 STR_SV_STNAME_WOODS                                             :Δάσος {STRING}
 STR_SV_STNAME_LAKESIDE                                          :Λίμνη {STRING}
 STR_SV_STNAME_EXCHANGE                                          :{STRING} Ανταλλαγής
-STR_SV_STNAME_AIRPORT                                           :Αεροδρόμιο {STRING}
+STR_SV_STNAME_AIRPORT                                           :αεροδρόμιο {STRING}
 STR_SV_STNAME_OILFIELD                                          :{G=m}Πετρελαιοπηγές {STRING}
 STR_SV_STNAME_MINES                                             :{G=n}Ορυχεία {STRING}
 STR_SV_STNAME_DOCKS                                             :{G=n}Λιμάνι {STRING}
@@ -4349,7 +4336,6 @@ STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLAC
 STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
-STR_TINY_BLACK_DECIMAL                                          :{TINYFONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -179,7 +179,7 @@ STR_ABBREV_NONE                                                 :{TINYFONT}כל
 STR_ABBREV_ALL                                                  :{TINYFONT}הכל

 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} נוסע{P "" ים}
+STR_PASSENGERS                                                  :{COMMA} נוסעים
 STR_BAGS                                                        :{COMMA} שקים
 STR_TONS                                                        :{COMMA} טונות
 STR_LITERS                                                      :{COMMA} ליטרים
@@ -1214,7 +1214,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :ארוך (31 ב
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :קצר (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}עצור משחק אוטומטית אחרי התחלת משחק חדש: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}השתמש ברשימת כלי הרכב המתקדמת: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF                   :כבוי
@@ -3187,8 +3186,7 @@ STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(העבר מט
 STR_ORDER_TRANSFER_NO_LOAD                                      :(העבר מטען קיים ועזוב ריק)
 STR_ORDER_NO_UNLOAD                                             :(אל תפרוק, העמס מטען זמין)
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(אל תפרוק והמתן להעמסה מלאה)
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(אל תפרוק, המתן עד להעמסה כוללת ומלאה)
-STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(אל תפרוק ואל תעמיס)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(אל תפרוק והמתן עד להעמסה מלאה של כל סוג מטען)

 STR_ORDER_STOP_LOCATION_NEAR_END                                :[קצה קרוב]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[אמצע]
@@ -3519,7 +3517,7 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... חי
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}ניתן לשנות את הרכבת בעת עצירה במוסך בלבד
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}רכבת ארוכה מידי
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}לא ניתן להפוך כיוון כלי הרכב...
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}מורכבים ממספר יחידות...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}לא ניתן לסובב כלי רכב המורכבים ממספר יחידות...
 STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :סוג הפסים אינו מתאים

 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}לא ניתן להזיז את כלי הרכב...
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -510,7 +510,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Kinagyított k
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Képmentés teljes térképről
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Az 'OpenTTD'-ről
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite elhelyező
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Befoglaló doboz ki/bekapcsolása
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -923,26 +922,26 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Pénznem
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}A használt pénznem kiválasztása

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Angol Font (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikai Dollár (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euró (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japán Jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Font (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollár ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euró (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Osztrák Shilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belga Frank (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Svájci Frank (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Cseh Korona (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Német Márka (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Dán Korona (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanyol Pezeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pezeta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finn Márka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Svájci Frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frank (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Görög Drachma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Magyar Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Izlandi Korona (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Olasz Líra (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Holland Gulden (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norvég Korona (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Lengyel Zlotyi (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Legyel Zlotyi (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Román Lej (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Orosz Rubel (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Szlovén Tolár (SIT)
@@ -1121,7 +1120,6 @@ STR_SEA_LEVEL_HIGH                                              :Magas
 STR_SEA_LEVEL_CUSTOM                                            :Egyedi
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Egyedi ({NUM}%)

-
 STR_DISASTER_NONE                                               :Nincs
 STR_DISASTER_REDUCED                                            :Ritka
 STR_DISASTER_NORMAL                                             :Normál
@@ -1230,7 +1228,7 @@ STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Automat
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Automatikus járműfelújítás {ORANGE}{STRING}{LTBLUE} hónappal a max. életkora előtt/után
 STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Automatikus járműfelújításhoz szükséges min. pénz: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Hibaüzenetek megjelenítési ideje: {ORANGE}{STRING} másodperc
-STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Eszközinformációk megjelenítése: {ORANGE}Késleltetés {STRING} másodperccel
+STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Eszközinformációk megjelnítése: {ORANGE}Késleltetés {STRING} másodperccel
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}Eszközinformációk megjelenítése: {ORANGE}Jobb egérgombbal
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Mutassa a település lakosságát a feliratban: {ORANGE}{STRING}

@@ -1289,7 +1287,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :hosszú (31st D
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :rövid (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Automatikus szünettel kezdés új játék esetén: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Szünetben engedélyezett: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :semmilyen cselekvés
@@ -1472,7 +1469,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Új és
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}A gépi ellenfelek beállításainak megjelenítése
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Kilépés az OpenTTD-ből

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Kilépés
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Biztosan bezárod ezt a programot és kilépsz a {STRING}ba?
@@ -1991,7 +1987,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Vasútá
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Vasúti jelzők építése. Ctrl gombbal váltás az alak- és fényjelzők között{}Húzással a sínek mentén végig jelzők épülnek. Húzva Ctrl gombbal a következő pályakiágazásig épít jelzőket{}Ctrl+Kattintással válthatod a megnyitandó jelzőépítés-kezelő ablakot. Shift lenyomásával megmutatja a becsült költséget
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Vasúti híd építése. Shift lenyomásával megmutatja a becsült költséget
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Vasúti alagút építése. Shift lenyomásával megmutatja a becsült költséget
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Váltás építés/feleszedés között vasúti pályák, jelzők, ellenőrző pontok és vasútállomások esetében. Ctrl nyomvatartásával az ellenőrző pontokon és állomásokon a vasúti pályát is eltávolítja
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Váltás fépítés/feleszedés között vasúti pályák, jelzők, ellenőrző pontok és vasútállomások esetében. Ctrl nyomvatartásával az ellenőrző pontokon és állomásokon a vasúti pályát is eltávolítja
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Sínek átalakítása a kiválasztott típusra. Shift lenyomásával megmutatja a becsült költséget

 # Rail depot construction window
@@ -2551,8 +2547,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Többszörös Action 8 bejegyzést tartalmaz
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Ál-sprite távoli végének olvasása
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}A jelenleg használt grafikus alapcsomagból hiányzik számos sprite.{}Kérlek frissítsd a grafikus alapcsomagot
-STR_NEWGRF_ERROR_GRM_FAILED                                     :A kívánt GRF források nem elérhetőek
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} kikapcsolva {4:STRING} által

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Figyelem!
@@ -2589,8 +2583,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} of <ér
 STR_NEWGRF_INVALID_ENGINE                                       :<érvénytelen jármű modell>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<érvénytelen gazdasági épület>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Feliratok listája ({COMMA} db)
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Egyezés
@@ -3258,12 +3250,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Maradj ott
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Utasítás kihagyása, ha javítás szükséges

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}A jármű adata ami alapján ugrani szeretnénk a parancssorban
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Rakomány százaléka
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Megbízhatóság
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximális sebesség
-STR_ORDER_CONDITIONAL_AGE                                       :Kor (év)
+STR_ORDER_CONDITIONAL_AGE                                       :Életkor (év)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Javításra szorul
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Mindig

@@ -3300,8 +3290,8 @@ STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Fejlett
 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Megmutatja az összes járművet, amik megosztják ezt a menetrendet

 # String parts to build the order string
-STR_ORDER_GO_TO_WAYPOINT                                        :Menj át {WAYPOINT}
-STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Megállás nélkül menj át {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Menj át a(z) {WAYPOINT}on
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Megállás nélkül menj a(z) {WAYPOINT}hoz

 STR_ORDER_SERVICE_AT                                            :Javításra menj
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Javításra megállás nélkül menj
@@ -3320,7 +3310,7 @@ STR_ORDER_STOP_ORDER                                            :(megáll)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Automata)
+STR_ORDER_AUTOMATIC                                             :(Automata)

 STR_ORDER_FULL_LOAD                                             :(Mindenből teljes berakodás)
 STR_ORDER_FULL_LOAD_ANY                                         :(Bármiből teljes berakodás)
@@ -3511,8 +3501,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... vala
 STR_ERROR_BMPMAP                                                :{WHITE}Nem sikerült a térkép betöltése a BMP-ből...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... nem sikerült a képtípust konvertálni

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... túl nagy a kép
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Átméretezési figyelmeztetés
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}A forrás térkép túlságosan nagy mértékű átméretezése nem javasolt. Folytatod mégis?

@@ -4284,16 +4272,12 @@ STR_FORMAT_DATE_LONG                                            :{STRING} {STRIN
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}

 STR_FORMAT_BUOY_NAME                                            :{TOWN} Bója
-STR_FORMAT_BUOY_NAME.ba                                         :{TOWN} Bóján
 STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} {COMMA}. sz. Bója
-STR_FORMAT_BUOY_NAME_SERIAL.ba                                  :{TOWN} {COMMA}. sz. Bóján
 STR_FORMAT_COMPANY_NUM                                          :({COMMA}. vállalat)
 STR_FORMAT_GROUP_NAME                                           :{COMMA} csoport
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN}i {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Ellenőrző pont
-STR_FORMAT_WAYPOINT_NAME.ba                                     :{TOWN} Ellenőrző ponton
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} {COMMA}. sz. Ellenőrző pont
-STR_FORMAT_WAYPOINT_NAME_SERIAL.ba                              :{TOWN} {COMMA}. sz. Ellenőrző ponton

 STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Vasúti járműtelep
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. Vasúti Járműtelep
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -1223,7 +1223,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :panjang (31st D
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :pendek (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Selalu hentikan sementara permainan saat memulai : {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Saat berhenti, ijinkan: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :tidak ada tindakan
@@ -3247,7 +3246,7 @@ STR_ORDER_STOP_ORDER                                            :(Berhenti)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Terkandung)
+STR_ORDER_AUTOMATIC                                             :(Otomatis)

 STR_ORDER_FULL_LOAD                                             :(Penuhi Semua)
 STR_ORDER_FULL_LOAD_ANY                                         :(Penuhi salah satu)
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -3244,7 +3244,7 @@ STR_ORDER_STOP_ORDER                                            :(Stop)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Uathoibríoch)
+STR_ORDER_AUTOMATIC                                             :(Uathoibríoch)

 STR_ORDER_FULL_LOAD                                             :(Lasta iomlán)
 STR_ORDER_FULL_LOAD_ANY                                         :(Lasta iomlán de lastas ar bith)
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -285,7 +285,7 @@ STR_SORT_BY_RATING_MIN                                          :Valutazione min
 STR_SORT_BY_ENGINE_ID                                           :EngineID (ordine classico)
 STR_SORT_BY_COST                                                :Costo
 STR_SORT_BY_POWER                                               :Potenza
-STR_SORT_BY_TRACTIVE_EFFORT                                     :Sforzo di trazione
+STR_SORT_BY_TRACTIVE_EFFORT                                     :Forza di trazione
 STR_SORT_BY_INTRO_DATE                                          :Data introduzione
 STR_SORT_BY_RUNNING_COST                                        :Costo d'esercizio
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potenza / Costo d'esercizio
@@ -449,7 +449,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Screenshot zoom
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Screenshot intera mappa
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Informazioni su 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Strumento allineamento sprite
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Attiva/disattiva bounding box
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -826,7 +825,7 @@ STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} si è perso
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}Il profitto di {VEHICLE} per l'anno scorso è stato {CURRENCY}

-STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} è stato fermato perché un ordine di riadattamento non è riuscito
+STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} è stato fermato a causa del fallimento di un ordine di riadattamento
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Rinnovo automatico di {VEHICLE}{}{STRING} non riuscito

 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nuov{G o o a} {STRING} disponibile!
@@ -861,34 +860,34 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selezione della valuta

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Sterlina britannica (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollaro americano (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen giapponese (JPY)
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Scellino austriaco (ATS)
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco belga (BEF)
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco svizzero (CHF)
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corona ceca (CZK)
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco tedesco (DEM)
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corona danese (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta spagnola (ESP)
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marco finlandese (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco francese (FRF)
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma greca (GRD)
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Forint ungherese (HUF)
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corona islandese (ISK)
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira italiana (ITL)
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Fiorino olandese (NLG)
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Corona norvegese (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty polacco (PLN)
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu rumeno (RON)
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rublo russo (RUR)
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar sloveno (SIT)
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Corona svedese (SEK)
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira turca (TRY)
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Corona slovacca (SKK)
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real brasiliano (BRL)
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Corona éstone (EEK)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Sterlina (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollaro ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen (¥)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Scellino Austriaco (ATS)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco Belga (BEF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco Svizzero (CHF)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corona Ceca (CZK)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco Tedesco (DEM)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corona Danese (DKK)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marco Finlandese (FIM)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco Francese (FRF)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma Greca (GRD)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Forint Ungherese (HUF)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corona Islandese (ISK)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiana (ITL)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Fiorino Olandese (NLG)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Corona Norvegese (NOK)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty Polacco (PLN)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu Rumeno (RON)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rublo Russo (RUR)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar Sloveno (SIT)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Corona Svedese (SEK)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira Turca (TRY)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Corona Slovacca (SKK)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real Brasiliano (BRL)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Corona Èstone (EEK)
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalizzata...
 ############ end of currency region

@@ -1059,7 +1058,6 @@ STR_SEA_LEVEL_HIGH                                              :Alto
 STR_SEA_LEVEL_CUSTOM                                            :Personalizzato
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Personalizzato ({NUM}%)

-
 STR_DISASTER_NONE                                               :Nessuno
 STR_DISASTER_REDUCED                                            :Ridotti
 STR_DISASTER_NORMAL                                             :Normali
@@ -1422,7 +1420,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Controll
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Mostra le impostazioni dell'intelligenza artificiale
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Esci da 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Esci
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Si è sicuri di voler uscire da OpenTTD e tornare a {STRING}?
@@ -2539,8 +2536,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} di <car
 STR_NEWGRF_INVALID_ENGINE                                       :<modello di veicolo non valido>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industria non valida>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Elenco cartelli - {COMMA} cartell{P o i}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Maiuscole/minuscole
@@ -2861,7 +2856,7 @@ STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagoni a
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Riadattabile per: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Tutti i tipi di carico
 STR_PURCHASE_INFO_ALL_BUT                                       :Tutto tranne {GOLD}
-STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Sforzo di trazione massimo: {GOLD}{FORCE}
+STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Forza di trazione massima: {GOLD}{FORCE}

 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Elenco di selezione dei veicoli ferroviari - fare clic su un veicolo per informazioni
 STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Elenco selezione automezzi - fare clic su un veicolo per informazioni
@@ -2979,7 +2974,7 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=f}motrice mo
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}motrice maglev

 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità: {VELOCITY}  Potenza: {POWER}{}Costo d'esercizio: {CURRENCY}/anno{}Capacità: {CARGO}
-STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità: {VELOCITY}  Potenza: {POWER}{}  S.T. max.: {6:FORCE}{}Costo d'esercizio: {4:CURRENCY}/anno{}Capacità: {5:CARGO}
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità: {VELOCITY}  Potenza: {POWER}{}  F.T. max.: {6:FORCE}{}Costo d'esercizio: {4:CURRENCY}/anno{}Capacità: {5:CARGO}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Costo: {CURRENCY} Velocità max.: {VELOCITY}{}Capacità: {CARGO}, {CARGO}{}Costo d'esercizio: {CURRENCY}/anno
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Costo: {CURRENCY} Velocità max.: {VELOCITY}{}Capacità: {CARGO}{}Costo d'esercizio: {CURRENCY}/anno

@@ -3096,7 +3091,7 @@ STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} an

 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Velocità max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità max.: {LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità max.: {LTBLUE}{VELOCITY} {BLACK}S.T. max.: {LTBLUE}{FORCE}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità max.: {LTBLUE}{VELOCITY} {BLACK}F.T. max.: {LTBLUE}{FORCE}

 STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY} (anno scorso: {CURRENCY})
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
@@ -3208,12 +3203,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Ferma in deposi
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Ignora quest'ordine a meno che non sia necessaria una manutenzione

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Dato del veicolo sul quale basare il salto
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Percentuale di carico
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Affidabilità
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Velocità massima
-STR_ORDER_CONDITIONAL_AGE                                       :Età (anni)
+STR_ORDER_CONDITIONAL_AGE                                       :Età del veicolo (anni)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Manutenzione richiesta
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre

@@ -3270,7 +3263,7 @@ STR_ORDER_STOP_ORDER                                            :(Ferma)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(Implicito)
+STR_ORDER_AUTOMATIC                                             :(Automatico)

 STR_ORDER_FULL_LOAD                                             :(Attendi pieno carico)
 STR_ORDER_FULL_LOAD_ANY                                         :(Attendi carico)
@@ -3461,8 +3454,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... qual
 STR_ERROR_BMPMAP                                                :{WHITE}Impossibile caricare il terreno dal file BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... impossibile convertire il tipo di immagine

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... l'immagine è troppo ampia
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Avviso scala
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ridimensionare di molto l'heightmap sorgente non è consigliabile. Continuare con la generazione?

@@ -3556,7 +3547,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... può
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... può essere costruito solo in città
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... può essere costruito solo a basse quote
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... può essere posizionata solo vicino ai bordi della mappa
-STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... una foresta può essere piantata solo al di sopra della linea delle nevi perenni
+STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... una foresta può essere piantata solo in una zona innevata

 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Impossibile costruire la stazione qui...
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -3246,7 +3246,7 @@ STR_ORDER_STOP_ORDER                                            :（停止）

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :（自動的）
+STR_ORDER_AUTOMATIC                                             :（自動的）

 STR_ORDER_FULL_LOAD                                             :(全積載)
 STR_ORDER_FULL_LOAD_ANY                                         :(いずれか一種の貨物を全積載するまで待つ)
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :확대된 스
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :맵 전체 스크린샷
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD'에 대해서
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :스프라이트 정렬도구
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :박스 경계선 토글
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :높음
 STR_SEA_LEVEL_CUSTOM                                            :사용자 설정
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :사용자 설정 ({NUM}%)

-
 STR_DISASTER_NONE                                               :고장 안남
 STR_DISASTER_REDUCED                                            :적음
 STR_DISASTER_NORMAL                                             :일반
@@ -1226,7 +1224,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :긴 (2008년 12
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :짧은 (2008.12.31)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}새 게임을 시작할 때 자동으로 일시정지: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}일시정지시 가능한 행동: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :아무 것도 못함
@@ -1409,7 +1406,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}새로
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}인공지능 설정 보기
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}OpenTTD를 종료합니다

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}종료
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}정말 이 게임을 끝내고 {STRING}{G 0 "으" ""}로 돌아가시겠습니까?
@@ -2488,8 +2484,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Action 8 엔트리가 여러 개 존재합니다.
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :객체의 읽기 범위를 초과했습니다.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}최근에 이용한 기본 그래픽 세트에 객체가 많이 손실되었습니다.{}기본 그래픽 세트를 업데이트 하십시오.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :요청한 GRF 제원을 사용할 수 없습니다
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}(은)는 {4:STRING} 때문에 사용할 수 없습니다

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}경고!
@@ -2526,8 +2520,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA}<인식
 STR_NEWGRF_INVALID_ENGINE                                       :<인식오류 차량모델>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<인식오류 산업시설>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}팻말 목록 - 팻말 {COMMA}개
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}대소문자 매치
@@ -3195,8 +3187,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :멈춤
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}점검이 필요하면 이 경로를 건너뜁니다.

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}경로를 건너뛰기 위한 차량값
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :적재율
 STR_ORDER_CONDITIONAL_RELIABILITY                               :신뢰도
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :최고 속력
@@ -3257,7 +3247,7 @@ STR_ORDER_STOP_ORDER                                            :(멈춤)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

-STR_ORDER_IMPLICIT                                              :(자동)
+STR_ORDER_AUTOMATIC                                             :(자동)

 STR_ORDER_FULL_LOAD                                             :(모든 화물을 가득 실음)
 STR_ORDER_FULL_LOAD_ANY                                         :(아무 화물이나 가득 싣기)
@@ -3448,8 +3438,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... 뭔
 STR_ERROR_BMPMAP                                                :{WHITE}BMP파일로부터 지형을 불러올 수 없습니다...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... 이미지 타입을 변경할 수 없습니다.

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... 이미지가 너무 큽니다.
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}맵 크기 경고
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}원본 맵의 크기를 많이 조정하는 것은 좋지 않습니다. 만들기를 계속하시겠습니까?

--- a/Show More
+++ b/Show More